[vlc-commits] Revert "aout: remove what should be an unneeded update of "mute""

Erwan Tulou git at videolan.org
Thu Mar 21 18:41:23 CET 2013


vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Thu Mar 21 18:07:52 2013 +0100| [60ac0e3170e7c4c98f0750436e7bc7cb0a9ffa63] | committer: Erwan Tulou

Revert "aout: remove what should be an unneeded update of "mute""

This reverts commit 2ad2e671b814ebcee2a4724baf5a8606a5938554.

After full analysis of all audio output drivers, a bunch of them still
don't use aout_MuteReport at all. So the hack is still useful for those drivers.

Not that this hack may hide other tricky issues, since the mute states may then
differ at the playlist and aout levels, possibly leading functions like
'playlist_MuteToggle' to work erratically.

For drivers that use aout_MuteReport as expected, this hack just updates the
variable with the same value, which should be harmless.

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

 src/playlist/aout.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/playlist/aout.c b/src/playlist/aout.c
index 5a45515..72c7f0f 100644
--- a/src/playlist/aout.c
+++ b/src/playlist/aout.c
@@ -120,6 +120,8 @@ int playlist_MuteSet (playlist_t *pl, bool mute)
     {
         ret = aout_MuteSet (aout, mute);
         vlc_object_release (aout);
+        if (ret == 0)
+            var_SetBool (pl, "mute", mute);
     }
     return ret;
 }



More information about the vlc-commits mailing list