[vlc-commits] aout: correct test before applying volume

Rémi Denis-Courmont git at videolan.org
Thu Aug 4 18:38:21 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug  4 19:34:24 2011 +0300| [434b57e00bfd46602501fa7eccba49ce9e924fb9] | committer: Rémi Denis-Courmont

aout: correct test before applying volume

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=434b57e00bfd46602501fa7eccba49ce9e924fb9
---

 src/audio_output/intf.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 8d9190b..bb4c4ed 100644
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -90,8 +90,7 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
         float vol = volume / (float)AOUT_VOLUME_DEFAULT;
 
         aout_lock (aout);
-#warning FIXME: wrong test. Need to check that aout_output is ready.
-        if (owner->volume.mixer != NULL)
+        if (owner->module != NULL)
             ret = aout->pf_volume_set (aout, vol, mute);
         aout_unlock (aout);
 



More information about the vlc-commits mailing list