[Mplayer-cvslog] CVS: main/Gui/mplayer mw.c,1.103,1.104

[Zoltan Ponekker]

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

Modified Files:
	mw.c 
Log Message:


add DVD and CDRom device entry's, and fix two 10l bug


Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mw.c	11 Jan 2003 01:30:07 -0000	1.103
+++ mw.c	12 Jan 2003 23:38:53 -0000	1.104
@@ -238,9 +238,7 @@
 }
 
 extern void exit_player(char* how);
-extern char * dvd_device;
 extern int vcd_track;
-extern char * cdrom_device;
 extern int osd_visible;
 
 void mplEventHandling( int msg,float param )
@@ -314,7 +312,7 @@
 #ifdef HAVE_VCD
           case STREAMTYPE_VCD:
 	       gtkSet( gtkClearStruct,0,(void *)(guiALL - guiVCD - guiFilenames) );
-	       if ( !cdrom_device ) cdrom_device=DEFAULT_CDROM_DEVICE;
+	       if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
 	       mplSetFileName( NULL,cdrom_device,STREAMTYPE_VCD );
 	       if ( guiIntfStruct.Playing != 2 )
 	        {
@@ -330,7 +328,7 @@
 #ifdef USE_DVDREAD
           case STREAMTYPE_DVD:
 	       gtkSet( gtkClearStruct,0,(void *)(guiALL - guiDVD - guiFilenames) );
-	       if ( !dvd_device ) dvd_device=DEFAULT_DVD_DEVICE;
+	       if ( !dvd_device ) dvd_device=gstrdup( DEFAULT_DVD_DEVICE );
 	       mplSetFileName( NULL,dvd_device,STREAMTYPE_DVD );
 	       if ( guiIntfStruct.Playing != 2 )
 	        {