diff options
Diffstat (limited to 'src/audio_out/audio_alsa_out.c')
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 67931e77b..86309986c 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -26,7 +26,7 @@ * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk> * * - * $Id: audio_alsa_out.c,v 1.53 2002/06/03 07:53:11 f1rmb Exp $ + * $Id: audio_alsa_out.c,v 1.54 2002/06/03 09:45:12 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -505,18 +505,6 @@ static void ao_alsa_exit(ao_driver_t *this_gen) alsa_driver_t *this = (alsa_driver_t *) this_gen; void *p; - config_values_t *config = this->config; - - if(this->mixer.remember_volume) { - config->update_num (config, "audio.alsa_mixer_volume", - (((ao_alsa_get_percent_from_volume(this->mixer.left_vol, - this->mixer.min, this->mixer.max)) + - (ao_alsa_get_percent_from_volume(this->mixer.right_vol, - this->mixer.min, this->mixer.max))) /2)); - } - - config->save(config); - pthread_mutex_destroy(&this->mixer.mutex); /* * Destroy the mixer thread and cleanup the mixer, so that @@ -1050,27 +1038,6 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { pthread_mutex_init(&this->mixer.mutex, NULL); ao_alsa_mixer_init(&this->ao_driver); - /* Restore volume from last used level */ - if((this->mixer.remember_volume = - config->register_bool (config, "audio.remember_volume", 0, - "restore volume level at startup", - "if this not set, xine will not touch any mixer settings at startup", - NULL, NULL)) == 1) { - int vol; - int prop; - - vol = config->register_range (config, "audio.alsa_mixer_volume", - 50, 0, 100, "Audio volume", - NULL, NULL, NULL); - - if(this->capabilities |= AO_CAP_MIXER_VOL) - prop = AO_PROP_MIXER_VOL; - else if(this->capabilities |= AO_CAP_PCM_VOL) - prop = AO_PROP_PCM_VOL; - - (void) ao_alsa_set_property(&this->ao_driver, prop, vol); - } - this->ao_driver.get_capabilities = ao_alsa_get_capabilities; this->ao_driver.get_property = ao_alsa_get_property; this->ao_driver.set_property = ao_alsa_set_property; |