[Mplayer-cvslog] CVS: main/libmpdemux cue_read.h,NONE,1.1 Makefile,1.46,1.47 cue_read.c,1.1,1.2 open.c,1.67,1.68 stream.c,1.48,1.49 vcd_read_bincue.h,1.1,NONE

[Arpi of Ize]

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

Modified Files:
	Makefile cue_read.c open.c stream.c 
Added Files:
	cue_read.h 
Removed Files:
	vcd_read_bincue.h 
Log Message:
vcd_read_cue.h -> cue_read.c+h


--- NEW FILE ---

int cue_read_cue (char *in_cue_filename);
int cue_vcd_seek_to_track (int track);
int cue_vcd_get_track_end (int track);
void cue_vcd_read_toc ();
int cue_vcd_read(char *mem);
inline void cue_set_msf(unsigned int sect);

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile	28 Dec 2002 14:03:30 -0000	1.46
+++ Makefile	5 Jan 2003 23:51:05 -0000	1.47
@@ -3,7 +3,7 @@
 
 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 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 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 cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c cue_read.c
 ifeq ($(XMMS_PLUGINS),yes)
 SRCS += demux_xmms.c
 endif 

Index: cue_read.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cue_read.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cue_read.c	4 Jan 2003 20:11:06 -0000	1.1
+++ cue_read.c	5 Jan 2003 23:51:05 -0000	1.2
@@ -7,8 +7,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <libgen.h>
 
+#include "config.h"
+#include "mp_msg.h"
+//#include "help_mp.h"
+
+#include "stream.h"
+
+#include "cue_read.h"
 
 #define byte    unsigned char
 #define SIZERAW 2352
@@ -241,7 +249,7 @@
                            cue_current_pos.frame);
 }
 
-static inline void cue_set_msf(unsigned int sect){
+inline void cue_set_msf(unsigned int sect){
   cue_current_pos.frame=sect%75;
   sect=sect/75;
   cue_current_pos.second=sect%60;
@@ -486,7 +494,7 @@
 
 static char vcd_buf[VCD_SECTOR_SIZE];
 
-static int cue_vcd_read(char *mem){
+int cue_vcd_read(char *mem){
 
   if (cue_read_raw(vcd_buf)==-1) return 0; // EOF?
 

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- open.c	4 Jan 2003 20:11:06 -0000	1.67
+++ open.c	5 Jan 2003 23:51:05 -0000	1.68
@@ -67,10 +67,8 @@
 #endif
 
 extern int vcd_get_track_end(int fd,int track);
-extern int cue_read_cue (const char *);
-extern int cue_vcd_seek_to_track (int track);
-extern int cue_vcd_get_track_end (int track);
-extern void cue_vcd_read_toc ();
+
+#include "cue_read.h"
 
 #ifdef USE_TV
 #include "tv.h"

Index: stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- stream.c	4 Jan 2003 20:11:06 -0000	1.48
+++ stream.c	5 Jan 2003 23:51:05 -0000	1.49
@@ -20,6 +20,8 @@
 
 extern int verbose; // defined in mplayer.c
 
+#include "cue_read.h"
+
 #ifdef HAVE_VCD
 
 #ifdef __FreeBSD__
@@ -32,7 +34,7 @@
 
 #endif
 
-#include "vcd_read_bincue.h"
+//#include "vcd_read_bincue.h"
 
 #ifdef USE_DVDREAD
 int dvd_read_sector(dvd_priv_t *d,unsigned char* data);

--- vcd_read_bincue.h DELETED ---