Awesompd fixes

diff --git a/modules/awesome/config.dot/awesome.link/awesompd.lua b/modules/awesome/config.dot/awesome.link/awesompd.lua
index 2027f8859c2d21a754049197ff5d5c0ebede5549..4af25a307557db3c6ae567694bb4140e58dce127 100644 (file)
--- a/modules/awesome/config.dot/awesome.link/awesompd.lua
+++ b/modules/awesome/config.dot/awesome.link/awesompd.lua
@@ -1,57 +1,57 @@
-  require("awesompd/awesompd")
+require("awesompd/awesompd")
 
-  musicwidget = awesompd:create() -- Create awesompd widget
-  --musicwidget.font = "Liberation Mono" -- Set widget font 
-  musicwidget.scrolling = true -- If true, the text in the widget will be scrolled
-  musicwidget.output_size = 30 -- Set the size of widget in symbols
-  musicwidget.update_interval = 10 -- Set the update interval in seconds
-  -- Set the folder where icons are located (change username to your login name)
-  musicwidget.path_to_icons = configdir .. "/awesompd/icons" 
-  -- Set the default music format for Jamendo streams. You can change
-  -- this option on the fly in awesompd itself.
-  -- possible formats: awesompd.FORMAT_MP3, awesompd.FORMAT_OGG
-  musicwidget.jamendo_format = awesompd.FORMAT_MP3
-  -- If true, song notifications for Jamendo tracks and local tracks will also contain
-  -- album cover image.
-  musicwidget.show_album_cover = false
-  -- Specify how big in pixels should an album cover be. Maximum value
-  -- is 100.
-  musicwidget.album_cover_size = 50
-  -- This option is necessary if you want the album covers to be shown
-  -- for your local tracks.
-  --musicwidget.mpd_config = homedir .. "/.mpdconf"
-  -- Specify the browser you use so awesompd can open links from
-  -- Jamendo in it.
-  musicwidget.browser = "firefox"
-  -- Specify decorators on the left and the right side of the
-  -- widget. Or just leave empty strings if you decorate the widget
-  -- from outside.
-  musicwidget.ldecorator = " "
-  musicwidget.rdecorator = " "
-  -- Set all the servers to work with (here can be any servers you use)
-  -- Set the buttons of the widget
-  musicwidget:register_buttons({
-               --{ "", awesompd.MOUSE_LEFT, musicwidget:command_toggle() },
-                          --{ "Control", awesompd.MOUSE_SCROLL_UP, musicwidget:command_prev_track() },
-                                --{ "Control", awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_next_track() },
-                          { "", "XF86AudioPrev", musicwidget:command_prev_track() },
-                                { "", "XF86AudioNext", musicwidget:command_next_track() },
-                          { modkey, "XF86AudioPrev", musicwidget:command_previous_server() },
-                                { modkey, "XF86AudioNext", musicwidget:command_next_server() },
-                                --{ "", awesompd.MOUSE_SCROLL_UP, musicwidget:command_volume_up() },
-                                --{ "", awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_volume_down() },
-                                { "", awesompd.MOUSE_RIGHT, musicwidget:command_show_menu() },
-               --{ "", "XF86AudioLowerVolume", musicwidget:command_volume_down() },
-               --{ "", "XF86AudioRaiseVolume", musicwidget:command_volume_up() },
-               --{ modkey, "Pause", musicwidget:command_playpause() } })
-               { "", "XF86AudioPlay", musicwidget:command_playpause() } })
+musicwidget = awesompd:create() -- Create awesompd widget
+--musicwidget.font = "Liberation Mono" -- Set widget font 
+musicwidget.scrolling = true -- If true, the text in the widget will be scrolled
+musicwidget.output_size = 30 -- Set the size of widget in symbols
+musicwidget.update_interval = 10 -- Set the update interval in seconds
+-- Set the folder where icons are located (change username to your login name)
+musicwidget.path_to_icons = configdir .. "/awesompd/icons" 
+-- Set the default music format for Jamendo streams. You can change
+-- this option on the fly in awesompd itself.
+-- possible formats: awesompd.FORMAT_MP3, awesompd.FORMAT_OGG
+musicwidget.jamendo_format = awesompd.FORMAT_MP3
+-- If true, song notifications for Jamendo tracks and local tracks will also contain
+-- album cover image.
+musicwidget.show_album_cover = false
+-- Specify how big in pixels should an album cover be. Maximum value
+-- is 100.
+musicwidget.album_cover_size = 50
+-- This option is necessary if you want the album covers to be shown
+-- for your local tracks.
+--musicwidget.mpd_config = homedir .. "/.mpdconf"
+-- Specify the browser you use so awesompd can open links from
+-- Jamendo in it.
+musicwidget.browser = "firefox"
+-- Specify decorators on the left and the right side of the
+-- widget. Or just leave empty strings if you decorate the widget
+-- from outside.
+musicwidget.ldecorator = " "
+musicwidget.rdecorator = " "
+-- Set all the servers to work with (here can be any servers you use)
+-- Set the buttons of the widget
+musicwidget:register_buttons({
+             --{ "", awesompd.MOUSE_LEFT, musicwidget:command_toggle() },
+             --{ "Control", awesompd.MOUSE_SCROLL_UP, musicwidget:command_prev_track() },
+             --{ "Control", awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_next_track() },
+             { "", "XF86AudioPrev", musicwidget:command_prev_track() },
+             { "", "XF86AudioNext", musicwidget:command_next_track() },
+             { modkey, "XF86AudioPrev", musicwidget:command_previous_server() },
+             { modkey, "XF86AudioNext", musicwidget:command_next_server() },
+                        --{ "", awesompd.MOUSE_SCROLL_UP, musicwidget:command_volume_up() },
+                        --{ "", awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_volume_down() },
+                        { "", awesompd.MOUSE_RIGHT, musicwidget:command_show_menu() },
+             --{ "", "XF86AudioLowerVolume", musicwidget:command_volume_down() },
+             --{ "", "XF86AudioRaiseVolume", musicwidget:command_volume_up() },
+             --{ modkey, "Pause", musicwidget:command_playpause() } })
+             { "", "XF86AudioPlay", musicwidget:command_playpause() } })
 
-  -- Put your server definitions in this file, like this:
-  --musicwidget.servers = {
-  --   { server = "localhost",
-  --        port = 6600 },
-  --   { server = "192.168.0.72",
-  --        port = 6600 } }
-  dofile(homedir .. "/.custom/awesome/awesompd.lua")
+-- Put your server definitions in this file, like this:
+--musicwidget.servers = {
+--   { server = "localhost",
+--        port = 6600 },
+--   { server = "192.168.0.72",
+--        port = 6600 } }
+dofile(homedir .. "/.custom/awesome/awesompd.lua")
 
-  musicwidget:run() -- After all configuration is done, run the widget
+musicwidget:run() -- After all configuration is done, run the widget

diff --git a/modules/awesome/config.dot/awesome.link/rc.lua b/modules/awesome/config.dot/awesome.link/rc.lua
index 554c42ed1156eaaf5559b3a2792f7a4e124c4bb9..e5fe3bb6d9ad48f7faeaeabe73d24f4ef7525952 100644 (file)
--- a/modules/awesome/config.dot/awesome.link/rc.lua
+++ b/modules/awesome/config.dot/awesome.link/rc.lua
@@ -174,7 +174,7 @@ for s = 1, screen.count() do
         s == 1 and mysystray or nil,
         volume_widget,
         myledbox,
-        awesompd == true and musicwidget.widget or nil,
+        awesompd and musicwidget.widget or nil,
         mytasklist[s],
         layout = awful.widget.layout.horizontal.rightleft
     }