mpris.py: fix volume handling (wrong event).

[vlc] / extras / misc / mpris.py

diff --git a/extras/misc/mpris.py b/extras/misc/mpris.py
index 8b157b790e7f464b52a03f1bb7c8932c346c63a7..32aa79122d6132ee4fa1c650dd1585f8146708f4 100755 (executable)
--- a/extras/misc/mpris.py
+++ b/extras/misc/mpris.py
@@ -153,7 +153,7 @@ def Stop(widget):
     update(0)
 
 def Quit(widget):
-    player.Quit(reply_handler=(lambda *args: None), error_handler=(lambda *args: None))
+    root.Quit(reply_handler=(lambda *args: None), error_handler=(lambda *args: None))
     l_title.set_text("")
 
 def Pause(widget):
@@ -173,12 +173,12 @@ def Repeat(widget):
 def Shuffle(widget):
     global shuffle
     shuffle = not shuffle
-    tracklist.Random(shuffle)
+    tracklist.SetRandom(shuffle)
 
 def Loop(widget):
     global loop
     loop = not loop
-    tracklist.Loop(loop)
+    tracklist.SetLoop(loop)
 
 # update status display
 def update(widget):
@@ -212,7 +212,7 @@ def update(widget):
     GetPlayStatus(0)
 
 # callback for volume change
-def volchange(widget, data):
+def volchange(widget):
     player.VolumeSet(vol.get_value_as_int(), reply_handler=(lambda *args: None), error_handler=(lambda *args: None))
 
 # callback for position change
@@ -290,7 +290,7 @@ def GetPlayStatus(widget):
 # loads glade file from the directory where the script is,
 # so we can use /path/to/mpris.py to execute it.
 import sys
-xml = gtk.glade.XML(os.path.dirname(sys.argv[0]) + '/mpris.glade')
+xml = gtk.glade.XML(os.path.join(os.path.dirname(sys.argv[0]) , 'mpris.glade'))
 
 # ui setup
 bt_close    = xml.get_widget('close')
@@ -336,8 +336,7 @@ bt_loop.connect('clicked',      Loop)
 bt_repeat.connect('clicked',    Repeat)
 bt_shuffle.connect('clicked',   Shuffle)
 exp.connect('activate',         expander)
-vol.connect('change-value',     volchange)
-vol.connect('scroll-event',     volchange)
+vol.connect('changed',          volchange)
 time_s.connect('adjust-bounds', timechange)
 audioicon.set_events(gtk.gdk.BUTTON_PRESS_MASK) # hack for the bottom right icon
 audioicon.connect('button_press_event', icon_clicked)