diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-12 23:38:55 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-12 23:38:55 +0000 |
commit | 906ad7fdb943551b9139b27503ff5ed333fe7f58 (patch) | |
tree | 72cc8f2fa202a92aec39ae0ad17de836524233d2 /Gui/mplayer/mw.c | |
parent | 7b00975227addb551282134ea490e1e881805f5d (diff) | |
download | mpv-906ad7fdb943551b9139b27503ff5ed333fe7f58.tar.bz2 mpv-906ad7fdb943551b9139b27503ff5ed333fe7f58.tar.xz |
add DVD and CDRom device entry's, and fix two 10l bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8934 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer/mw.c')
-rw-r--r-- | Gui/mplayer/mw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index 56627a80fe..b653ff7721 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -238,9 +238,7 @@ void mplMainDraw( void ) } 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 @@ play: #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 @@ play: #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 ) { |