[Mplayer-cvslog] CVS: main mplayer.c,1.327,1.328 spudec.c,1.7,1.8 spudec.h,1.4,1.5

[pl]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv25260

Modified Files:
	mplayer.c spudec.c spudec.h 
Log Message:
spudec_new has a dvd_priv_t as an argument, which is defined in
libmpdemux/stream.h only if USE_DVDREAD is defined. (Arpi)


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- mplayer.c	27 Nov 2001 20:16:45 -0000	1.327
+++ mplayer.c	28 Nov 2001 12:44:38 -0000	1.328
@@ -53,7 +53,9 @@
 #include "codec-cfg.h"
 
 #include "dvdauth.h"
+#ifdef USE_DVDREAD
 #include "spudec.h"
+#endif
 
 #include "linux/getch2.h"
 #include "linux/keycodes.h"
@@ -256,11 +258,13 @@
 
 void uninit_player(unsigned int mask){
   mask=inited_flags&mask;
+#ifdef USE_DVDREAD
   if (mask&INITED_SPUDEC){
     inited_flags&=~INITED_SPUDEC;
     current_module="uninit_spudec";
     spudec_free(vo_spudec);
   }
+#endif
   if(mask&INITED_VO){
     inited_flags&=~INITED_VO;
     current_module="uninit_vo";
@@ -779,10 +783,12 @@
   inited_flags|=INITED_STREAM;
   stream->start_pos+=seek_to_byte;
 
+#ifdef USE_DVDREAD
   current_module="spudec";
   vo_spudec=spudec_new(stream->priv);
   if (vo_spudec!=NULL)
     inited_flags|=INITED_SPUDEC;
+#endif
   current_module=NULL;
 
   if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024);
@@ -2039,6 +2045,8 @@
   }
 #endif
   
+
+#ifdef USE_DVDREAD
   // DVD sub:
   if(vo_spudec){
     unsigned char* packet=NULL;
@@ -2056,6 +2064,7 @@
     }
     current_module=NULL;
   }
+#endif
   
 } // while(!eof)
 

Index: spudec.c
===================================================================
RCS file: /cvsroot/mplayer/main/spudec.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- spudec.c	28 Nov 2001 08:08:03 -0000	1.7
+++ spudec.c	28 Nov 2001 12:44:38 -0000	1.8
@@ -11,6 +11,8 @@
 
  */
 
+#ifdef USE_DVDREAD
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -318,3 +320,6 @@
     free(spu);
   }
 }
+
+#endif /* USE_DVDREAD */
+

Index: spudec.h
===================================================================
RCS file: /cvsroot/mplayer/main/spudec.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spudec.h	27 Nov 2001 20:16:45 -0000	1.4
+++ spudec.h	28 Nov 2001 12:44:38 -0000	1.5
@@ -1,3 +1,4 @@
+#ifdef USE_DVDREAD
 #ifndef _MPLAYER_SPUDEC_H
 #define _MPLAYER_SPUDEC_H
 
@@ -9,4 +10,5 @@
 void *spudec_new(dvd_priv_t *dvd_info);
 void spudec_free(void *this);
 
+#endif
 #endif