[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok] 603b016: Deprecate deprecated D-Bus methods.
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2010-09-22 15:32:32
Message-ID: 20100922153232.9A36AC4F82C () projects ! kde ! org
[Download RAW message or body]

commit 603b01603a7c4468b1d5c668583a0be73afb452c
Author: Alex Merry <kde@randomguy3.me.uk>
Date:   Wed Sep 22 16:31:14 2010 +0100

    Deprecate deprecated D-Bus methods.
    
    So, I didn't do quite what I intended last time.  I meant to remove the
    methods that shouldn't have been there from the MPRIS1 interface, but
    failed to.  This is probably a good thing, so I'll just deprecate them
    for now.

diff --git a/src/dbus/mpris1/org.freedesktop.MediaPlayer.player.xml \
b/src/dbus/mpris1/org.freedesktop.MediaPlayer.player.xml index c3cf235..f52b9db \
                100644
--- a/src/dbus/mpris1/org.freedesktop.MediaPlayer.player.xml
+++ b/src/dbus/mpris1/org.freedesktop.MediaPlayer.player.xml
@@ -11,15 +11,9 @@
     <method name="Stop">
     </method>
 
-    <method name="StopAfterCurrent">
-    </method>
-
     <method name="Play">
     </method>
 
-    <method name="PlayPause">
-    </method>
-
     <method name="Prev">
     </method>
 
@@ -75,29 +69,45 @@
     </signal>
 
     <!-- NB: Amarok extensions to the mpris spec -->
+    <!-- these should not be here, but we keep them for compatilibility -->
+    <method name="StopAfterCurrent">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
+    </method>
+
+    <method name="PlayPause">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
+    </method>
+
     <method name="VolumeUp">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
         <arg type="i" direction="in"/>
     </method>
 
     <method name="VolumeDown">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
         <arg type="i" direction="in"/>
     </method>
 
     <method name="Mute">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
     </method>
 
     <method name="ShowOSD">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
     </method>
 
     <method name="LoadThemeFile">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
         <arg type="s" direction="in"/>
     </method>
 
     <method name="Forward">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
         <arg type="i" direction="in"/>
     </method>
 
     <method name="Backward">
+        <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
         <arg type="i" direction="in"/>
     </method>
 
diff --git a/src/dbus/org.kde.amarok.Player.xml b/src/dbus/org.kde.amarok.Player.xml
index 4f2b1ad..aeae906 100644
--- a/src/dbus/org.kde.amarok.Player.xml
+++ b/src/dbus/org.kde.amarok.Player.xml
@@ -5,7 +5,6 @@
 <node>
   <interface name="org.kde.amarok.Player">
 
-    <!-- NB: Amarok extensions to the mpris spec -->
     <method name="VolumeUp">
         <arg type="i" direction="in"/>
     </method>
@@ -25,5 +24,12 @@
         <arg type="i" direction="in"/>
     </method>
 
+    <method name="StopAfterCurrent">
+    </method>
+
+    <!-- this is actually in MPRIS2, but we keep it here for MPRIS1 -->
+    <method name="PlayPause">
+    </method>
+
   </interface>
 </node>


[prev in list] [next in list] [prev in thread] [next in thread]