diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-16 22:25:17 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-16 22:25:17 +0000 |
| commit | fcea588a18214b13cf3635a50e295ba389dded31 (patch) | |
| tree | 3cba07250cf1bb876d8161fd11d756dc2f805068 /Gui/mplayer | |
| parent | 0e14c382cf0e41bf29de1b5a973c56b9754782b8 (diff) | |
| download | mpv-fcea588a18214b13cf3635a50e295ba389dded31.tar.bz2 mpv-fcea588a18214b13cf3635a50e295ba389dded31.tar.xz | |
- fix (?) "mixer bug"
- fix audio_id/video_id changing
- fix some other bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8485 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
| -rw-r--r-- | Gui/mplayer/gtk/opts.c | 2 | ||||
| -rw-r--r-- | Gui/mplayer/mw.c | 6 | ||||
| -rw-r--r-- | Gui/mplayer/play.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index ccf084bc86..0a5648258d 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -175,6 +175,7 @@ void ShowPreferences( void ) int i = 0; char * tmp[3]; tmp[2]=""; old_audio_driver=-1; + if ( CLADrivers ) gtk_clist_clear( GTK_CLIST( CLADrivers ) ); while ( audio_out_drivers[i] ) { const ao_info_t *info = audio_out_drivers[i++]->info; @@ -220,6 +221,7 @@ void ShowPreferences( void ) int i = 0, c = 0; char * tmp[3]; tmp[2]=""; old_video_driver=0; + if ( CLVDrivers ) gtk_clist_clear( GTK_CLIST( CLVDrivers ) ); while ( video_out_drivers[i] ) if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) { diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index 646e74dcb6..52d721a09f 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -273,14 +273,12 @@ void mplEventHandling( int msg,float param ) case evSetAudio: if ( !guiIntfStruct.demuxer || audio_id == iparam ) break; audio_id=iparam; - guiIntfStruct.NewPlay=1; - break; + goto play; case evSetVideo: if ( !guiIntfStruct.demuxer || video_id == iparam ) break; video_id=iparam; - guiIntfStruct.NewPlay=1; - break; + goto play; #ifdef HAVE_VCD case evSetVCDTrack: diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 62ad3e2e90..66b96f11dd 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -106,7 +106,7 @@ void mplEnd( void ) } else { - if ( guiIntfStruct.FilenameChanged ) return; + if ( guiIntfStruct.FilenameChanged || guiIntfStruct.NewPlay ) return; guiIntfStruct.TimeSec=0; guiIntfStruct.Position=0; |