[MPlayer-cvslog] r19952 - trunk/mplayer.c

[diego]

Author: diego
Date: Sat Sep 23 15:06:55 2006
New Revision: 19952

Modified:
   trunk/mplayer.c

Log:
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


Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Sat Sep 23 15:06:55 2006
@@ -3875,17 +3875,6 @@
 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 @@
   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