comparison mplayer.c @ 12672:9709ce101949

New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables

12671:c1fc3d58f66e

//extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);

extern void mp_input_register_options(m_config_t* cfg);

#include "mixer.h"
#include "cfg-mplayer.h"

void parse_cfgfiles( m_config_t* conf )
{
char *conffile;

//      uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao
//      sh_audio=d_audio->sh=NULL; // -> nosound
    }
#endif
  }
}

current_module="av_init";

if(sh_video) sh_video->timer=0;

       printf( "\nEDL_SKIP: start [%f], stop [%f], length [%f]\n", next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec );
#endif
       edl_decision = 1;
       next_edl_record = next_edl_record->next;
     } else if( next_edl_record->action == EDL_MUTE ) {
       mixer_mute();
#ifdef DEBUG_EDL
       printf( "\nEDL_MUTE: [%f]\n", next_edl_record->start_sec );
#endif
       edl_decision = 1;
       next_edl_record = next_edl_record->next;

		// start change for absolute volume value
		int abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
		
		if( abs )
		{
			mixer_setvolume( (float)v, (float)v );
		} else {
      if(v > 0)
	mixer_incvolume();
      else
	mixer_decvolume();
		}
	  
#ifdef USE_OSD
      if(osd_level && sh_video){
	osd_visible=sh_video->fps; // 1 sec
	vo_osd_progbar_type=OSD_VOLUME;
	vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0;
	vo_osd_changed(OSDTYPE_PROGBAR);
      }
#endif
    } break;
    case MP_CMD_MUTE:
      mixer_mute();
      break;
    case MP_CMD_LOADFILE : {
      play_tree_t* e = play_tree_new();
      play_tree_add_file(e,cmd->args[0].v.s);

12672:9709ce101949

//extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);

extern void mp_input_register_options(m_config_t* cfg);

#include "mixer.h"
static mixer_t mixer;

#include "cfg-mplayer.h"

void parse_cfgfiles( m_config_t* conf )
{
char *conffile;

//      uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao
//      sh_audio=d_audio->sh=NULL; // -> nosound
    }
#endif
  }
  mixer.audio_out = audio_out;
  mixer.afilter = sh_audio->afilter;
  mixer.volstep = 3;
}

current_module="av_init";

if(sh_video) sh_video->timer=0;

       printf( "\nEDL_SKIP: start [%f], stop [%f], length [%f]\n", next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec );
#endif
       edl_decision = 1;
       next_edl_record = next_edl_record->next;
     } else if( next_edl_record->action == EDL_MUTE ) {
       mixer_mute(&mixer);
#ifdef DEBUG_EDL
       printf( "\nEDL_MUTE: [%f]\n", next_edl_record->start_sec );
#endif
       edl_decision = 1;
       next_edl_record = next_edl_record->next;

		// start change for absolute volume value
		int abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
		
		if( abs )
		{
			mixer_setvolume(&mixer, (float)v, (float)v );
		} else {
      if(v > 0)
	mixer_incvolume(&mixer);
      else
	mixer_decvolume(&mixer);
		}
	  
#ifdef USE_OSD
      if(osd_level && sh_video){
        float vol;
	osd_visible=sh_video->fps; // 1 sec
	vo_osd_progbar_type=OSD_VOLUME;
	mixer_getbothvolume(&mixer, &vol);
	vo_osd_progbar_value=(vol*256.0)/100.0;
	vo_osd_changed(OSDTYPE_PROGBAR);
      }
#endif
    } break;
    case MP_CMD_MUTE:
      mixer_mute(&mixer);
      break;
    case MP_CMD_LOADFILE : {
      play_tree_t* e = play_tree_new();
      play_tree_add_file(e,cmd->args[0].v.s);