Mercurial > mplayer.hg

comparison mplayer.c @ 19946:ef94dfe93fe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author diego
date Sat, 23 Sep 2006 13:06:55 +0000
parents 15ae9558e41e
children 02a18c52a42a
comparison
equal deleted inserted replaced
19945:15ae9558e41e 19946:ef94dfe93fe8
3873 3873
3874 // Disable the term OSD in verbose mode 3874 // Disable the term OSD in verbose mode
3875 if(verbose) term_osd = 0; 3875 if(verbose) term_osd = 0;
3876 fflush(stdout); 3876 fflush(stdout);
3877 3877
3878 #ifdef HAVE_NEW_GUI
3879 if ( use_gui )
3880 {
3881 if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0;
3882 if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 );
3883 guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format );
3884 if ( guiGetEvent( guiSetValues,(char *)sh_video ) ) goto goto_next_file;
3885 guiGetEvent( guiSetDemuxer,(char *)demuxer );
3886 }
3887 #endif
3888
3889 { 3878 {
3890 //int frame_corr_num=0; // 3879 //int frame_corr_num=0; //
3891 //float v_frame=0; // Video 3880 //float v_frame=0; // Video
3892 float time_frame=0; // Timer 3881 float time_frame=0; // Timer
3893 //float num_frames=0; // number of frames played 3882 //float num_frames=0; // number of frames played
3955 if(force_fps && sh_video){ 3944 if(force_fps && sh_video){
3956 vo_fps = sh_video->fps=force_fps; 3945 vo_fps = sh_video->fps=force_fps;
3957 sh_video->frametime=1.0f/sh_video->fps; 3946 sh_video->frametime=1.0f/sh_video->fps;
3958 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime); 3947 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime);
3959 } 3948 }
3949
3950 #ifdef HAVE_NEW_GUI
3951 if ( use_gui ) {
3952 if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0;
3953 if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 );
3954 guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format );
3955 if ( guiGetEvent( guiSetValues,(char *)sh_video ) ) goto goto_next_file;
3956 guiGetEvent( guiSetDemuxer,(char *)demuxer );
3957 }
3958 #endif
3960 3959
3961 //==================== START PLAYING ======================= 3960 //==================== START PLAYING =======================
3962 3961
3963 if(loop_times>1) loop_times--; else 3962 if(loop_times>1) loop_times--; else
3964 if(loop_times==1) loop_times = -1; 3963 if(loop_times==1) loop_times = -1;