Merge the 3 well-known objects into /org/mpris/MediaPlayer2

3 files changed, 18 insertions, 27 deletions

diff --git a/spec/Root_Node.xml b/spec/Root_Node.xml
index c3665d6..79f5647 100644
--- a/spec/Root_Node.xml
+++ b/spec/Root_Node.xml
@@ -71,9 +71,9 @@
     <property name="HasTrackList" type="b" tp:name-for-bindings="Has_TrackList" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>
-          Indicates whether the <strong>org.mpris.MediaPlayer.TrackList</strong>
-          interface is implemented by an object at
-          <strong>/org/mpris/MediaPlayer/TrackList</strong>.
+          Indicates whether the <strong>/org/mpris/MediaPlayer2</strong>
+          object implements the <strong>org.mpris.MediaPlayer2.TrackList</strong>
+          interface.
         </p>
       </tp:docstring>
     </property>
diff --git a/spec/TrackList_Node.xml b/spec/TrackList_Node.xml
index e47a884..0918a4c 100644
--- a/spec/TrackList_Node.xml
+++ b/spec/TrackList_Node.xml
@@ -172,11 +172,10 @@
         <p>Skip to the specified TrackId.</p>
         <p>If the track is not part of this tracklist, this has no effect.</p>
         <p>
-          If this object is not the current TrackList (ie: the one at
-          <strong>/org/mpris/MediaPlayer/TrackList</strong>), the current
-          TrackList's tracks should be replaced with the contents of this
-          TrackList, and the TrackListReplaced signal should be fired on
-          the current TrackList.
+          If this object is not <strong>/org/mpris/MediaPlayer2</strong>,
+          the current TrackList's tracks should be replaced with the contents of
+          this TrackList, and the TrackListReplaced signal should be fired from
+          <strong>/org/mpris/MediaPlayer2</strong>.
         </p>
       </tp:docstring>
     </method>
diff --git a/spec/all.xml b/spec/all.xml
index 66b7427..b74e5c0 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -79,33 +79,25 @@
     </tp:docstring>
   </tp:section>
 
-  <tp:section name="Well-known Object Paths">
+  <tp:section name="Well-known Object Path">
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+
       <p>
-        The media player must expose at least the two
-        following object paths whenever it is running:
+        The media player <strong>must</strong> expose the
+        <strong>/org/mpris/MediaPlayer2</strong> object path, which
+        <strong>must</strong> implement the following interfaces:
       </p>
 
       <ul>
-        <li>
-          <strong>/org/mpris/MediaPlayer</strong>, which implements the
-          <strong>org.mpris.MediaPlayer2</strong> interface;
-        </li>
-        <li>
-          <strong>/org/mpris/MediaPlayer/Player</strong>, which implements the
-          <strong>org.mpris.MediaPlayer2.Player</strong> interface.
-        </li>
+        <li>org.mpris.MediaPlayer2</li>
+        <li>org.mpris.MediaPlayer2.Player</li>
       </ul>
 
-      <p>The media player may expose the following object path:</p>
+      <p>
+        The <strong>/org/mpris/MediaPlayer2</strong> object may implement
+        the <strong>org.mpris.MediaPlayer2.TrackList</strong> interface:
+      </p>
 
-      <ul>
-        <li>
-          <strong>/org/mpris/MediaPlayer/TrackList</strong>,
-          which implements the <strong>org.mpris.MediaPlayer2.TrackList
-          </strong> interface.
-        </li>
-      </ul>
     </tp:docstring>
   </tp:section>