Mercurial > mplayer.hg

comparison mplayer.c @ 21802:fa9422a466e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
restore volume if muted at exit
author ben
date Thu, 04 Jan 2007 16:30:06 +0000
parents 309992959801
children b0bc0d81f91b
comparison
equal deleted inserted replaced
21801:f4c52a9738c1 21802:fa9422a466e5
591 } 591 }
592 592
593 return meta; 593 return meta;
594 } 594 }
595 595
596 #include "mixer.h"
597 mixer_t mixer;
598 /// step size of mixer changes
599 int volstep = 3;
600
596 static void uninit_player(unsigned int mask){ 601 static void uninit_player(unsigned int mask){
597 mask=inited_flags&mask; 602 mask=inited_flags&mask;
598 603
599 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n*** uninit(0x%X)\n",mask); 604 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n*** uninit(0x%X)\n",mask);
600 605
667 } 672 }
668 673
669 if(mask&INITED_AO){ 674 if(mask&INITED_AO){
670 inited_flags&=~INITED_AO; 675 inited_flags&=~INITED_AO;
671 current_module="uninit_ao"; 676 current_module="uninit_ao";
677 if (user_muted | edl_muted) mixer_mute(&mixer);
672 audio_out->uninit(eof?0:1); audio_out=NULL; 678 audio_out->uninit(eof?0:1); audio_out=NULL;
673 } 679 }
674 680
675 #ifdef HAVE_NEW_GUI 681 #ifdef HAVE_NEW_GUI
676 if(mask&INITED_GUI){ 682 if(mask&INITED_GUI){
812 } 818 }
813 exit_player(NULL); 819 exit_player(NULL);
814 } 820 }
815 821
816 extern void mp_input_register_options(m_config_t* cfg); 822 extern void mp_input_register_options(m_config_t* cfg);
817
818 #include "mixer.h"
819 mixer_t mixer;
820 /// step size of mixer changes
821 int volstep = 3;
822 823
823 #include "cfg-mplayer.h" 824 #include "cfg-mplayer.h"
824 825
825 static void parse_cfgfiles( m_config_t* conf ) 826 static void parse_cfgfiles( m_config_t* conf )
826 { 827 {