diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.c | 6 |
2 files changed, 5 insertions, 2 deletions
@@ -43,6 +43,7 @@ xine-lib (1.1.5) (Unreleased) Kretz for the original patch. * Portability fixes for Mac OS X, in particular Mac OS X on the new Intel Macs. Thanks to Martin Aumueller and Emanuele Giaquinta. + * Fix amp muting when level is still at 100. Patch by Reinhard Nissl. xine-lib (1.1.4) * Mark string-type configuration items according to whether they're plain diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 90a139010..a3cf4d8ea 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.208 2006/12/25 15:07:52 dgp85 Exp $ + * $Id: audio_out.c,v 1.209 2007/03/25 23:09:42 dgp85 Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -1760,13 +1760,15 @@ static int ao_set_property (xine_audio_port_t *this_gen, int property, int value this->amp_factor = (double) value / 100.0; - this->do_amp = (this->amp_factor != 1.0); + this->do_amp = (this->amp_factor != 1.0 || this->amp_mute); ret = this->amp_factor*100; break; case AO_PROP_AMP_MUTE: ret = this->amp_mute = value; + + this->do_amp = (this->amp_factor != 1.0 || this->amp_mute); break; case AO_PROP_EQ_30HZ: |