summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-03-25 23:09:42 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-03-25 23:09:42 +0000
commitf365c4d88b2110300e6f4b050c69f4ebea935e66 (patch)
tree11ffa699170abab3d2c818a13f133e0a636f144c /src
parentc5a6f1cd5b1fa705a485b99ad0b2c84357f4ca73 (diff)
downloadxine-lib-f365c4d88b2110300e6f4b050c69f4ebea935e66.tar.gz
xine-lib-f365c4d88b2110300e6f4b050c69f4ebea935e66.tar.bz2
Fix amp muting when level is still at 100. Patch by Reinhard Nissl.
CVS patchset: 8747 CVS date: 2007/03/25 23:09:42
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/audio_out.c6
1 files changed, 4 insertions, 2 deletions
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: