Diff between 43af5ef5a3075744732a3c6a2e1b334b06f89f5c and 8ce025543502fe1c80ee746e1571d090045e6836

Changed Files

File Additions Deletions Status
doc/control-api.txt +0 -52 deleted
doc/media-api.txt +50 -0 modified

Full Patch

diff --git a/doc/control-api.txt b/doc/control-api.txt
deleted file mode 100644
index 7f51e3d..0000000
--- a/doc/control-api.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-BlueZ D-Bus Control API description
-***********************************
-
-
-Control hierarchy
-=================
-
-Service		org.bluez
-Interface	org.bluez.Control1
-Object path	[variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX
-
-Methods		void Play()
-
-			Resume playback.
-
-		void Pause()
-
-			Pause playback.
-
-		void Stop()
-
-			Stop playback.
-
-		void Next()
-
-			Next item.
-
-		void Previous()
-
-			Previous item.
-
-		void VolumeUp()
-
-			Adjust remote volume one step up
-
-		void VolumeDown()
-
-			Adjust remote volume one step down
-
-		void FastForward()
-
-			Fast forward playback, this action is only stopped
-			when another method in this interface is called.
-
-		void Rewind()
-
-			Rewind playback, this action is only stopped
-			when another method in this interface is called.
-
-Properties
-
-		boolean Connected [readonly]
diff --git a/doc/media-api.txt b/doc/media-api.txt
index a687bba..e2a72dc 100644
--- a/doc/media-api.txt
+++ b/doc/media-api.txt
@@ -125,6 +125,56 @@ Methods		void RegisterEndpoint(object endpoint, dict properties)
 			Unregister sender media player.
 
 
+Media Control hierarchy
+=======================
+
+Service		org.bluez
+Interface	org.bluez.MediaControl1
+Object path	[variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX
+
+Methods		void Play()
+
+			Resume playback.
+
+		void Pause()
+
+			Pause playback.
+
+		void Stop()
+
+			Stop playback.
+
+		void Next()
+
+			Next item.
+
+		void Previous()
+
+			Previous item.
+
+		void VolumeUp()
+
+			Adjust remote volume one step up
+
+		void VolumeDown()
+
+			Adjust remote volume one step down
+
+		void FastForward()
+
+			Fast forward playback, this action is only stopped
+			when another method in this interface is called.
+
+		void Rewind()
+
+			Rewind playback, this action is only stopped
+			when another method in this interface is called.
+
+Properties
+
+		boolean Connected [readonly]
+
+
 MediaPlayer1 hierarchy
 ======================