Use var_InheritString for --decklink-video-connection.

[vlc] / extras / misc / mpris.py

diff --git a/extras/misc/mpris.py b/extras/misc/mpris.py
index 60d3a74d1133bd595e0ea4759c57d973447be151..67a6e79d6ec7ef7767bf952d3a42a41a6a757d1c 100755 (executable)
--- a/extras/misc/mpris.py
+++ b/extras/misc/mpris.py
@@ -76,7 +76,7 @@ def NameOwnerChanged(name, new, old):
 
 # Callback for when "TrackChange" signal is emitted
 def TrackChange(Track):
-    # the only mandatory metadata is "URI"
+    # the only mandatory metadata is "location"
     try:
         a = Track["artist"]
     except:
@@ -84,7 +84,7 @@ def TrackChange(Track):
     try:
         t = Track["title"]
     except:
-        t = Track["URI"]
+        t = Track["location"]
     try:
         length = Track["length"]
     except:
@@ -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):
@@ -194,7 +194,7 @@ def update(widget):
         t = ""
     if t == "":
         try:
-            t = Track["URI"]
+            t = Track["location"]
         except:
             t = ""
     l_artist.set_text(a)
@@ -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
@@ -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)