diff options
| author | Siggi Langauf <siggi@users.sourceforge.net> | 2002-01-28 06:20:17 +0000 |
|---|---|---|
| committer | Siggi Langauf <siggi@users.sourceforge.net> | 2002-01-28 06:20:17 +0000 |
| commit | 36226a2d139141325c254f3af56f0d0477695c46 (patch) | |
| tree | 4741cea3874dee2469c44f2f88e8767f2038fa9d | |
| parent | 727269e6eeed6d20e2532f55a4c27ef4c32ae532 (diff) | |
| download | xine-lib-36226a2d139141325c254f3af56f0d0477695c46.tar.gz xine-lib-36226a2d139141325c254f3af56f0d0477695c46.tar.bz2 | |
make restoring volume settings at start optional (and disabled by default)
CVS patchset: 1456
CVS date: 2002/01/28 06:20:17
| -rw-r--r-- | src/audio_out/audio_oss_out.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index 98f18fa97..00b60e826 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_oss_out.c,v 1.55 2002/01/15 12:23:05 siggi Exp $ + * $Id: audio_oss_out.c,v 1.56 2002/01/28 06:20:17 siggi Exp $ * * 20-8-2001 First implementation of Audio sync and Audio driver separation. * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -806,11 +806,18 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { this->mixer.mute = 0; this->mixer.volume = ao_oss_get_property (&this->ao_driver, this->mixer.prop); - this->mixer.volume = config->register_range (config, "audio.oss_mixer_volume", 50, - 0, 100, "Audio volume", NULL, NULL, NULL); - - (void) ao_oss_set_property(&this->ao_driver, this->mixer.prop, this->mixer.volume); - + if (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)) { + this->mixer.volume = config->register_range (config, + "audio.oss_mixer_volume", + 50, 0, 100, "Audio volume", + NULL, NULL, NULL); + (void) ao_oss_set_property(&this->ao_driver, + this->mixer.prop, this->mixer.volume); + + } } close (audio_fd); |