Update of /cvsroot/freevo/freevo/WIP/Thomas/mplayer-patches
In directory sc8-pr-cvs1:/tmp/cvs-serv19634
Modified Files:
libmpdemux_timeshift.patch
Log Message:
Updating the patch to work against latest mplayer cvs.
Index: libmpdemux_timeshift.patch
===================================================================
RCS file:
/cvsroot/freevo/freevo/WIP/Thomas/mplayer-patches/libmpdemux_timeshift.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** libmpdemux_timeshift.patch 15 Feb 2003 05:57:39 -0000 1.1
--- libmpdemux_timeshift.patch 25 Mar 2003 00:14:07 -0000 1.2
***************
*** 1,39 ****
- ? libmpdemux_timeshift.patch
- ? timeshift
- ? timeshift.c
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
! retrieving revision 1.51
! diff -u -r1.51 Makefile
! --- Makefile 3 Feb 2003 10:27:50 -0000 1.51
! +++ Makefile 8 Feb 2003 13:46:01 -0000
! @@ -2,7 +2,6 @@
! LIBNAME = libmpdemux.a
- include ../config.mak
-
- SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c
muxer.c muxer_avi.c muxer_mpeg.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 demux_ogg.c
demux_bmp.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c
ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c cue_read.c extension.c demux_gif.c
- ifeq ($(XMMS_PLUGINS),yes)
- SRCS += demux_xmms.c
- @@ -19,6 +18,8 @@
- SRCS += rtp.c
- endif
- endif
- +
+SRCS += timeshift.c
OBJS = $(SRCS:.c=.o)
- OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
! retrieving revision 1.68
! diff -u -r1.68 open.c
! --- open.c 5 Jan 2003 23:51:05 -0000 1.68
! +++ open.c 8 Feb 2003 13:46:03 -0000
! @@ -76,6 +76,10 @@
! extern int stream_open_tv(stream_t *stream, tvi_handle_t *tvh);
! #endif
+#ifdef HAVE_TIMESHIFT
--- 1,28 ----
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
! retrieving revision 1.53
! diff -u -r1.53 Makefile
! --- Makefile 17 Mar 2003 11:37:28 -0000 1.53
! +++ Makefile 25 Mar 2003 00:26:07 -0000
! @@ -25,7 +25,7 @@
! SRCS += dvb_tune.c
! endif
-
+SRCS += timeshift.c
+
OBJS = $(SRCS:.c=.o)
Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
! retrieving revision 1.70
! diff -u -r1.70 open.c
! --- open.c 16 Mar 2003 20:13:28 -0000 1.70
! +++ open.c 25 Mar 2003 00:26:08 -0000
! @@ -84,6 +84,10 @@
!
!
+#ifdef HAVE_TIMESHIFT
***************
*** 44,48 ****
stream_t* open_cdda(char* dev,char* track);
#ifdef STREAMING
! @@ -139,6 +143,9 @@
return cddb_open(cdrom_device ? cdrom_device : DEFAULT_CDROM_DEVICE,filename+7);
#endif
--- 33,37 ----
stream_t* open_cdda(char* dev,char* track);
#ifdef STREAMING
! @@ -147,6 +151,9 @@
return cddb_open(cdrom_device ? cdrom_device : DEFAULT_CDROM_DEVICE,filename+7);
#endif
***************
*** 57,64 ****
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
! retrieving revision 1.50
! diff -u -r1.50 stream.c
! --- stream.c 12 Jan 2003 20:16:28 -0000 1.50
! +++ stream.c 8 Feb 2003 13:46:03 -0000
@@ -48,6 +48,12 @@
void close_cdda(stream_t* s);
--- 46,53 ----
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
! retrieving revision 1.52
! diff -u -r1.52 stream.c
! --- stream.c 16 Mar 2003 20:13:28 -0000 1.52
! +++ stream.c 25 Mar 2003 00:26:08 -0000
@@ -48,6 +48,12 @@
void close_cdda(stream_t* s);
***************
*** 86,90 ****
case STREAMTYPE_SMB:
len=smbc_read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
! @@ -125,6 +136,7 @@
switch(s->type){
--- 75,79 ----
case STREAMTYPE_SMB:
len=smbc_read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
! @@ -134,6 +145,7 @@
switch(s->type){
***************
*** 94,98 ****
case STREAMTYPE_STREAM:
#ifdef _LARGEFILE_SOURCE
! @@ -158,6 +170,15 @@
if(newpos==0 || newpos!=s->pos){
--- 83,87 ----
case STREAMTYPE_STREAM:
#ifdef _LARGEFILE_SOURCE
! @@ -167,6 +179,15 @@
if(newpos==0 || newpos!=s->pos){
***************
*** 110,114 ****
s->pos=newpos; // real seek
if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1;
! @@ -299,6 +320,11 @@
}
if(s->fd>0) close(s->fd);
--- 99,103 ----
s->pos=newpos; // real seek
if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1;
! @@ -308,6 +329,11 @@
}
if(s->fd>0) close(s->fd);
***************
*** 125,136 ****
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
! retrieving revision 1.55
! diff -u -r1.55 stream.h
! --- stream.h 4 Jan 2003 20:11:06 -0000 1.55
! +++ stream.h 8 Feb 2003 13:46:04 -0000
! @@ -18,12 +18,16 @@
! #define STREAMTYPE_CDDA 10 // raw audio CD reader
#define STREAMTYPE_SMB 11 // smb:// url, using libsmbclient (samba)
#define STREAMTYPE_VCDBINCUE 12 // vcd directly from bin/cue files
+#define STREAMTYPE_TIMESHIFT 42 // Timeshift for Freevo
--- 114,125 ----
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
! retrieving revision 1.57
! diff -u -r1.57 stream.h
! --- stream.h 16 Mar 2003 22:59:16 -0000 1.57
! +++ stream.h 25 Mar 2003 00:26:08 -0000
! @@ -19,12 +19,15 @@
#define STREAMTYPE_SMB 11 // smb:// url, using libsmbclient (samba)
#define STREAMTYPE_VCDBINCUE 12 // vcd directly from bin/cue files
+ #define STREAMTYPE_DVB 13
+#define STREAMTYPE_TIMESHIFT 42 // Timeshift for Freevo
***************
*** 142,146 ****
+
+#define HAVE_TIMESHIFT
- +
#ifdef STREAMING
--- 131,134 ----
-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
