rpms/konversation/devel konversation-1.1-amarok2.patch,NONE,1.1

Rex Dieter rdieter at fedoraproject.org
Mon Mar 2 18:52:10 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15226

Added Files:
	konversation-1.1-amarok2.patch 
Log Message:
import awol patch


konversation-1.1-amarok2.patch:

--- NEW FILE konversation-1.1-amarok2.patch ---
diff -up konversation-1.1/konversation/scripts/media.amarok2 konversation-1.1/konversation/scripts/media
--- konversation-1.1/konversation/scripts/media.amarok2	2008-08-06 10:56:27.000000000 -0500
+++ konversation-1.1/konversation/scripts/media	2009-02-13 12:41:41.000000000 -0600
@@ -244,35 +244,35 @@ class AmarokPlayer(DCOPPlayer):
                 return ''
         return data
 
-#class Amarok2Player(Player):
-#    def __init__(self):
-#        Player.__init__(self, 'Amarok2', 'audio')
-#        self.isRunning()
-#
-#    def getData(self):
-#        playing=os.popen("qdbus org.mpris.amarok /Player PositionGet").readline().strip() != "0"
-#        if playing and self.isRunning():
-#            for line in os.popen("qdbus org.mpris.amarok /Player GetMetadata").readlines():
-#                if re.match("^title", line):
-#                    title=self.reEncodeString(line.strip().split(None,1)[1])
-#                if re.match("^artist", line):
-#                    artist=self.reEncodeString(line.strip().split(None,1)[1])
-#                if re.match("^album", line):
-#                    album=self.reEncodeString(line.strip().split(None,1)[1])
-#            return (title, artist, album)
-#        else:
-#            return ''
-#
-#    def isRunning(self):
-#        qdbus_items=subprocess.Popen(['qdbus'], stdout=subprocess.PIPE).communicate()[0]
-#        running=re.findall('^ org.mpris.amarok$', qdbus_items, re.M)
-#        if type(running) is list:
-#            try:
-#                running=running[0]
-#            except IndexError:
-#                running=''
-#        self.running=bool(running.strip())
-#        return self.running
+class Amarok2Player(Player):
+    def __init__(self):
+        Player.__init__(self, 'Amarok2', 'audio')
+        self.isRunning()
+
+    def getData(self):
+        playing=os.popen("qdbus org.mpris.amarok /Player PositionGet").readline().strip() != "0"
+        if playing and self.isRunning():
+            for line in os.popen("qdbus org.mpris.amarok /Player GetMetadata").readlines():
+                if re.match("^title", line):
+                    title=self.reEncodeString(line.strip().split(None,1)[1])
+                if re.match("^artist", line):
+                    artist=self.reEncodeString(line.strip().split(None,1)[1])
+                if re.match("^album", line):
+                    album=self.reEncodeString(line.strip().split(None,1)[1])
+            return (title, artist, album)
+        else:
+            return ''
+
+    def isRunning(self):
+        qdbus_items=subprocess.Popen(['qdbus'], stdout=subprocess.PIPE).communicate()[0]
+        running=re.findall('^ org.mpris.amarok$', qdbus_items, re.M)
+        if type(running) is list:
+            try:
+                running=running[0]
+            except IndexError:
+                running=''
+        self.running=bool(running.strip())
+        return self.running
 
 import socket
 
@@ -432,6 +432,7 @@ DCOP_ITEMS=subprocess.Popen(['dcop'], st
 
 PLAYERS = [
 AmarokPlayer(),
+Amarok2Player(),
 DCOPPlayer("JuK","juk","Player trackProperty Title","Player trackProperty Artist","Player trackProperty Album"),
 DCOPPlayer("Noatun",'noatun',"Noatun title",playerType='audio, video'),
 DCOPPlayer("Kaffeine","kaffeine","KaffeineIface title","KaffeineIface artist","KaffeineIface album",playerType='video, audio'),




More information about the fedora-extras-commits mailing list