alsabar: rename flag 'mute' to 'playback' in order to avoid confusion; fixes #345

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index fe0b52f764ac0a66d4f5a5d69019e184880852de..fb9c2e489301cbb48fd729ac2c82b96dce8734fa 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -29,7 +29,7 @@ local function factory(args)
         },
 
         _current_level = 0,
-        _mute          = "off"
+        _playback      = "off"
     }
 
     local args       = args or {}
@@ -75,26 +75,26 @@ local function factory(args)
 
     function alsabar.update(callback)
         helpers.async(format_cmd, function(mixer)
-            local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+            local vol, playback = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
-            if not volu or not mute then return end
+            if not vol or not playback then return end
 
-            if volu ~= alsabar._current_level or mute ~= alsabar._mute then
-                alsabar._current_level = tonumber(volu)
+            if vol ~= alsabar._current_level or playback ~= alsabar._playback then
+                alsabar._current_level = tonumber(vol)
                 alsabar.bar:set_value(alsabar._current_level / 100)
-                if alsabar._current_level == 0 or mute == "off" then
-                    alsabar._mute = mute
+                if alsabar._current_level == 0 or playback == "off" then
+                    alsabar._playback = playback
                     alsabar.tooltip:set_text("[Muted]")
                     alsabar.bar.color = alsabar.colors.mute
                 else
-                    alsabar._mute = "on"
-                    alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, volu))
+                    alsabar._playback = "on"
+                    alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, vol))
                     alsabar.bar.color = alsabar.colors.unmute
                 end
 
                 volume_now = {
                     level  = alsabar._current_level,
-                    status = alsabar._mute
+                    status = alsabar._playback
                 }
 
                 settings()
@@ -108,7 +108,7 @@ local function factory(args)
         alsabar.update(function()
             local preset = alsabar.notification_preset
 
-            if alsabar._mute == "on" then
+            if alsabar._playback == "off" then
                 preset.title = string.format("%s - Muted", alsabar.channel)
             else
                 preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)

diff --git a/wiki b/wiki
index d92165bdd8782e1c076c26e7d86f99759f2d5bfd..15bc8513bed9cad33cc1d38e4d49a1f4f6008be0 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit d92165bdd8782e1c076c26e7d86f99759f2d5bfd
+Subproject commit 15bc8513bed9cad33cc1d38e4d49a1f4f6008be0