[Mplayer-cvslog] CVS: main/libmpdemux Makefile,1.39,1.40 cache2.c,1.17,1.18 network.c,1.60,1.61 test.c,1.7,1.8 mpdemux.c,1.3,NONE mpdemux.h,1.1,NONE

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv8341/libmpdemux

Modified Files:
	Makefile cache2.c network.c test.c 
Removed Files:
	mpdemux.c mpdemux.h 
Log Message:
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile	23 Oct 2002 13:59:05 -0000	1.39
+++ Makefile	23 Oct 2002 14:46:20 -0000	1.40
@@ -3,7 +3,7 @@
 
 include ../config.mak
 
-SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c mpdemux.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c
+SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c
 ifeq ($(STREAMING),yes)
 SRCS += asf_streaming.c url.c http.c network.c asf_mmst_streaming.c
 ifeq ($(STREAMING_LIVE_DOT_COM),yes)

Index: cache2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cache2.c	22 Sep 2002 02:33:25 -0000	1.17
+++ cache2.c	23 Oct 2002 14:46:20 -0000	1.18
@@ -26,6 +26,7 @@
 int stream_fill_buffer(stream_t *s);
 int stream_seek_long(stream_t *s,off_t pos);
 
+extern int mp_input_check_interrupt(int time);
 
 typedef struct {
   // constats:
@@ -221,7 +222,7 @@
 	    s->max_filepos-s->read_filepos
 	);
 	if(s->eof) break; // file is smaller than prefill size
-	if(mpdemux_check_interrupt(PREFILL_SLEEP_TIME))
+	if(mp_input_check_interrupt(PREFILL_SLEEP_TIME))
 	  return 0;
     }
     return 1; // parent exits

Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- network.c	27 Sep 2002 19:20:20 -0000	1.60
+++ network.c	23 Oct 2002 14:46:20 -0000	1.61
@@ -19,7 +19,6 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "../cfgparser.h"
-#include "mpdemux.h"
 
 #include "network.h"
 #include "http.h"
@@ -34,6 +33,8 @@
 extern int verbose;
 extern m_config_t *mconfig;
 
+extern int mp_input_check_interrupt(int time);
+
 /* Variables for the command line option -user, -passwd & -bandwidth */
 char *network_username;
 char *network_password;
@@ -193,7 +194,7 @@
 	while((ret = select(socket_server_fd+1, NULL, &set, NULL, &tv)) == 0) {
 	      if( ret<0 ) mp_msg(MSGT_NETWORK,MSGL_ERR,"select failed\n");
 	      else if(ret > 0) break;
-	      else if(count > 30 || mpdemux_check_interrupt(500)) {
+	      else if(count > 30 || mp_input_check_interrupt(500)) {
 		if(count > 30)
 		  mp_msg(MSGT_NETWORK,MSGL_ERR,"Connection timeout\n");
 		else

Index: test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- test.c	23 Oct 2002 13:59:05 -0000	1.7
+++ test.c	23 Oct 2002 14:46:20 -0000	1.8
@@ -19,6 +19,11 @@
 void resync_audio_stream(sh_audio_t *sh_audio){
 }
 
+int mp_input_check_interrupt(int time){
+    if(time) usec_sleep(time);
+    return 0;
+}
+
 // for libmpdvdkit2:
 #include "../get_path.c"
 

--- mpdemux.c DELETED ---

--- mpdemux.h DELETED ---