awesome: get default sink using ponymix

diff --git a/awesome/utils.lua b/awesome/utils.lua
index 8bbf3400941d2cf8de6cd4c353bdef8b9c537ab7..7519473cb5d513321c4df379b72fcb7b5c02bb9e 100644 (file)
--- a/awesome/utils.lua
+++ b/awesome/utils.lua
@@ -1,4 +1,8 @@
-local utils = { }
+local utils  = { }
+local io     = { popen = io.popen }
+local string = { match = string.match,
+                 lower = string.lower}
+

 utils.rules = { }
 utils.globalkeys = { }
 
 utils.rules = { }
 utils.globalkeys = { }
 


@@ -40,6 +44,12 @@ function utils.run_once(prg,arg_string,pname,screen)
     end
 end
 
     end
 end
 

+function utils.get_default_sink()
+    local f = io.popen('ponymix defaults --short')
+    line = f:read('*l')
+    f:close()
+    return string.match(line, "^sink%s*%d*%s*(.-)%s")
+end

 
 function utils.joinTables(t1, t2)
     for k,v in ipairs(t2) do table.insert(t1, v) end return t1
 
 function utils.joinTables(t1, t2)
     for k,v in ipairs(t2) do table.insert(t1, v) end return t1

diff --git a/awesome/widgets/volume_widget.lua b/awesome/widgets/volume_widget.lua
index 2dff741f9c15ba091a7d50bad5894901599660b5..48fcbadc48c0131039ec189cefefcc187f7f041d 100644 (file)
--- a/awesome/widgets/volume_widget.lua
+++ b/awesome/widgets/volume_widget.lua
@@ -6,8 +6,7 @@ local volwidget = { }
 
 -- Volume Widget {{{1
 -- Select device
 
 -- Volume Widget {{{1
 -- Select device

-local device = "alsa_output.pci-0000_00_1b.0.analog-stereo"
-if utils.host == "shada"   then device = "surround31" end
+local device = utils.get_default_sink()

 -- Register widget
 volwidget = wibox.widget.textbox()
 vicious.register(volwidget, vicious.contrib.pulse, '<span font="Symbola 12">🔊</span> '.."$1", 1, device)
 -- Register widget
 volwidget = wibox.widget.textbox()
 vicious.register(volwidget, vicious.contrib.pulse, '<span font="Symbola 12">🔊</span> '.."$1", 1, device)