Diff between d992e2a99c3a9fb198e2b12923bcc80257c7f355 and a052a7be95af274159cc172c1e55fe9d4e7bf8b1

Changed Files

File Additions Deletions Status
profiles/audio/media.c +6 -0 modified
profiles/audio/player.c +4 -2 modified

Full Patch

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 84f8aeb..f728460 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -868,6 +868,7 @@ static DBusMessage *unregister_endpoint(DBusConnection *conn, DBusMessage *msg,
 	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
+#if 0
 static struct media_player *media_adapter_find_player(
 						struct media_adapter *adapter,
 						const char *sender,
@@ -1532,6 +1533,7 @@ static DBusMessage *unregister_player(DBusConnection *conn, DBusMessage *msg,
 
 	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
+#endif
 
 static const GDBusMethodTable media_methods[] = {
 	{ GDBUS_METHOD("RegisterEndpoint",
@@ -1539,12 +1541,14 @@ static const GDBusMethodTable media_methods[] = {
 		NULL, register_endpoint) },
 	{ GDBUS_METHOD("UnregisterEndpoint",
 		GDBUS_ARGS({ "endpoint", "o" }), NULL, unregister_endpoint) },
+#if 0
 	{ GDBUS_METHOD("RegisterPlayer",
 		GDBUS_ARGS({ "player", "o" }, { "properties", "a{sv}" },
 						{ "metadata", "a{sv}" }),
 		NULL, register_player) },
 	{ GDBUS_METHOD("UnregisterPlayer",
 		GDBUS_ARGS({ "player", "o" }), NULL, unregister_player) },
+#endif
 	{ },
 };
 
@@ -1555,8 +1559,10 @@ static void path_free(void *data)
 	while (adapter->endpoints)
 		release_endpoint(adapter->endpoints->data);
 
+#if 0
 	while (adapter->players)
 		media_player_destroy(adapter->players->data);
+#endif
 
 	adapters = g_slist_remove(adapters, adapter);
 
diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index 6773b43..005d0d1 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -298,6 +298,7 @@ struct media_player *media_player_controller_create(const char *path)
 							g_free, g_free);
 	mp->progress = g_timer_new();
 
+#if 0
 	if (!g_dbus_register_interface(btd_get_dbus_connection(),
 					mp->path, MEDIA_PLAYER_INTERFACE,
 					media_player_methods,
@@ -307,7 +308,7 @@ struct media_player *media_player_controller_create(const char *path)
 		media_player_destroy(mp);
 		return NULL;
 	}
-
+#endif
 	DBG("%s", mp->path);
 
 	return mp;
@@ -409,6 +410,7 @@ void media_player_set_status(struct media_player *mp, const char *status)
 
 static gboolean process_metadata_changed(void *user_data)
 {
+#if 0
 	struct media_player *mp = user_data;
 	DBusMessage *signal;
 	DBusMessageIter iter, dict;
@@ -437,7 +439,7 @@ static gboolean process_metadata_changed(void *user_data)
 	dbus_message_iter_close_container(&iter, &dict);
 
 	g_dbus_send_message(btd_get_dbus_connection(), signal);
-
+#endif
 	return FALSE;
 }