diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-23 13:06:55 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-23 13:06:55 +0000 |
commit | 0a612539ea198da2eb92b108806d850ef2977fd3 (patch) | |
tree | deddb516544d11515de626ffe3dd6c8ecf44822d /mplayer.c | |
parent | a32e00516f59993a90dc52dc470d027bb7f491d8 (diff) | |
download | mpv-0a612539ea198da2eb92b108806d850ef2977fd3.tar.bz2 mpv-0a612539ea198da2eb92b108806d850ef2977fd3.tar.xz |
Fix the sound mute switch in the GUI menu by moving the corresponding
piece of GUI code after audio initialization.
patch by Stanislav Maslovski, stanislav.maslovski gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19952 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -3875,17 +3875,6 @@ current_module="main"; if(verbose) term_osd = 0; fflush(stdout); -#ifdef HAVE_NEW_GUI - if ( use_gui ) - { - if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0; - if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 ); - guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format ); - if ( guiGetEvent( guiSetValues,(char *)sh_video ) ) goto goto_next_file; - guiGetEvent( guiSetDemuxer,(char *)demuxer ); - } -#endif - { //int frame_corr_num=0; // //float v_frame=0; // Video @@ -3958,6 +3947,16 @@ if(force_fps && sh_video){ mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime); } +#ifdef HAVE_NEW_GUI +if ( use_gui ) { + if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0; + if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 ); + guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format ); + if ( guiGetEvent( guiSetValues,(char *)sh_video ) ) goto goto_next_file; + guiGetEvent( guiSetDemuxer,(char *)demuxer ); +} +#endif + //==================== START PLAYING ======================= if(loop_times>1) loop_times--; else |