From 26dc8445ffa66aa3c933442848c3a92070b25fb7 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@nokia.com>
Date: Sat, 6 Sep 2008 02:09:05 +0300
Subject: Fix audio and input interfaces match the API documentation

---
 audio/control.h | 2 +-
 audio/device.h  | 8 +++-----
 audio/gateway.h | 2 +-
 audio/headset.h | 2 +-
 audio/manager.h | 4 ----
 audio/sink.h    | 2 +-
 input/device.c  | 2 +-
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/audio/control.h b/audio/control.h
index 4ebcb9a3..6475df51 100644
--- a/audio/control.h
+++ b/audio/control.h
@@ -22,7 +22,7 @@
  *
  */
 
-#define AUDIO_CONTROL_INTERFACE "org.bluez.audio.Control"
+#define AUDIO_CONTROL_INTERFACE "org.bluez.Control"
 
 int avrcp_init(DBusConnection *conn, GKeyFile *config);
 void avrcp_exit(void);
diff --git a/audio/device.h b/audio/device.h
index 96bb0705..20bc4d99 100644
--- a/audio/device.h
+++ b/audio/device.h
@@ -22,8 +22,6 @@
  *
  */
 
-#define AUDIO_DEVICE_INTERFACE	"org.bluez.audio.Device"
-
 #define GENERIC_AUDIO_UUID	"00001203-0000-1000-8000-00805F9B34FB"
 
 #define HSP_HS_UUID		"00001108-0000-1000-8000-00805F9B34FB"
@@ -41,9 +39,9 @@
 #define AVRCP_TARGET_UUID	"0000110C-0000-1000-8000-00805F9B34FB"
 
 /* Move these to respective .h files once they exist */
-#define AUDIO_SOURCE_INTERFACE		"org.bluez.audio.Source"
-#define AUDIO_CONTROL_INTERFACE		"org.bluez.audio.Control"
-#define AUDIO_TARGET_INTERFACE		"org.bluez.audio.Target"
+#define AUDIO_SOURCE_INTERFACE		"org.bluez.Source"
+#define AUDIO_CONTROL_INTERFACE		"org.bluez.Control"
+#define AUDIO_TARGET_INTERFACE		"org.bluez.Target"
 
 struct source;
 struct control;
diff --git a/audio/gateway.h b/audio/gateway.h
index 12e413fd..3e44937c 100644
--- a/audio/gateway.h
+++ b/audio/gateway.h
@@ -22,7 +22,7 @@
  *
  */
 
-#define AUDIO_GATEWAY_INTERFACE "org.bluez.audio.Gateway"
+#define AUDIO_GATEWAY_INTERFACE "org.bluez.Gateway"
 
 #define DEFAULT_HSP_HS_CHANNEL 6
 #define DEFAULT_HFP_HS_CHANNEL 7
diff --git a/audio/headset.h b/audio/headset.h
index 4c928e54..65c3f411 100644
--- a/audio/headset.h
+++ b/audio/headset.h
@@ -22,7 +22,7 @@
  *
  */
 
-#define AUDIO_HEADSET_INTERFACE "org.bluez.audio.Headset"
+#define AUDIO_HEADSET_INTERFACE "org.bluez.Headset"
 
 #define DEFAULT_HS_AG_CHANNEL 12
 #define DEFAULT_HF_AG_CHANNEL 13
diff --git a/audio/manager.h b/audio/manager.h
index 209488b0..708b52be 100644
--- a/audio/manager.h
+++ b/audio/manager.h
@@ -22,10 +22,6 @@
  *
  */
 
-#define MAX_PATH_LENGTH 64 /* D-Bus path */
-#define AUDIO_MANAGER_PATH "/org/bluez/audio"
-#define AUDIO_MANAGER_INTERFACE "org.bluez.audio.Manager"
-
 struct enabled_interfaces {
 	gboolean headset;
 	gboolean gateway;
diff --git a/audio/sink.h b/audio/sink.h
index b067e19c..f5d56fef 100644
--- a/audio/sink.h
+++ b/audio/sink.h
@@ -22,7 +22,7 @@
  *
  */
 
-#define AUDIO_SINK_INTERFACE "org.bluez.audio.Sink"
+#define AUDIO_SINK_INTERFACE "org.bluez.Sink"
 
 struct sink *sink_init(struct audio_device *dev);
 void sink_unregister(struct audio_device *dev);
diff --git a/input/device.c b/input/device.c
index e5fe0c46..44bec0d6 100644
--- a/input/device.c
+++ b/input/device.c
@@ -52,7 +52,7 @@
 #include "fakehid.h"
 #include "glib-helper.h"
 
-#define INPUT_DEVICE_INTERFACE "org.bluez.input.Device"
+#define INPUT_DEVICE_INTERFACE "org.bluez.Input"
 
 #define BUF_SIZE		16
 
-- 
cgit