aboutsummaryrefslogtreecommitdiff
path: root/volume.lua
diff options
context:
space:
mode:
authorAdrian C. (anrxc) <anrxc@sysphere.org>2009-10-02 21:48:05 +0200
committerAdrian C. (anrxc) <anrxc@sysphere.org>2009-10-02 21:59:06 +0200
commit3b170a24fff0fa90bda5ac5c317946cfe864e795 (patch)
treea62540afcdfe410c0cf25c19b51d6cdd0e728c43 /volume.lua
parent73e50e95946788357dcfc8e7b75fa3ef482ce8d9 (diff)
downloadvicious-legacy-3b170a24fff0fa90bda5ac5c317946cfe864e795.tar.xz
volume: added mute support
If a channel is muted we return 0. Something like "Muted" would be nice, but lets not break progressbars. If it doesn't concern you, then return what ever you want...
Diffstat (limited to 'volume.lua')
-rw-r--r--volume.lua12
1 files changed, 8 insertions, 4 deletions
diff --git a/volume.lua b/volume.lua
index 3e59f48..d02c79e 100644
--- a/volume.lua
+++ b/volume.lua
@@ -6,7 +6,10 @@
-- {{{ Grab environment
local io = { popen = io.popen }
local setmetatable = setmetatable
-local string = { match = string.match }
+local string = {
+ find = string.find,
+ match = string.match
+}
-- }}}
@@ -22,9 +25,10 @@ local function worker(format, channel)
f:close()
local volume_level = string.match(mixer, "([%d]?[%d]?[%d])%%")
-
- -- Don't break progressbars
- if volume_level == nil then return {0} end
+ -- If muted return 0 (not "Mute") so we dont break progressbars
+ if string.find(mixer, "%[off%]") or volume_level == nil then
+ volume_level = 0
+ end
return {volume_level}
end