From 869ba2f83f53e6210f07c028cf9d72ac96f04887 Mon Sep 17 00:00:00 2001 From: Chan-yeol Park Date: Mon, 3 Sep 2012 14:48:01 +0300 Subject: [PATCH] audio: remove redundant Media API option BlueZ supports only Media API. So option handler's are useless. --- audio/audio.conf | 2 +- audio/manager.c | 12 ++---------- audio/manager.h | 2 -- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/audio/audio.conf b/audio/audio.conf index 662647c4b..d1c57d3e6 100644 --- a/audio/audio.conf +++ b/audio/audio.conf @@ -8,7 +8,7 @@ #Master=true # If we want to disable support for specific services -# Defaults to supporting the services: HFP, Headset, Sink, Control and Media +# Defaults to supporting the services: HFP, Headset, Sink, Control #Disable=Gateway,Source # SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA) diff --git a/audio/manager.c b/audio/manager.c index 5b34f9b40..ae6b6fcfd 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -113,7 +113,6 @@ static struct enabled_interfaces enabled = { .sink = TRUE, .source = FALSE, .control = TRUE, - .media = TRUE, }; static struct audio_adapter *find_adapter(GSList *list, @@ -1159,9 +1158,6 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf, enabled.source = TRUE; else if (g_str_equal(list[i], "Control")) enabled.control = TRUE; - else if (g_str_equal(list[i], "Media")) - enabled.media = TRUE; - } g_strfreev(list); @@ -1178,8 +1174,6 @@ int audio_manager_init(DBusConnection *conn, GKeyFile *conf, enabled.source = FALSE; else if (g_str_equal(list[i], "Control")) enabled.control = FALSE; - else if (g_str_equal(list[i], "Media")) - enabled.media = FALSE; } g_strfreev(list); @@ -1219,8 +1213,7 @@ proceed: if (enabled.control) btd_profile_register(&avrcp_profile); - if (enabled.media) - btd_register_adapter_driver(&media_driver); + btd_register_adapter_driver(&media_driver); *enable_sco = (enabled.gateway || enabled.headset); @@ -1253,8 +1246,7 @@ void audio_manager_exit(void) if (enabled.control) btd_profile_unregister(&avrcp_profile); - if (enabled.media) - btd_unregister_adapter_driver(&media_driver); + btd_unregister_adapter_driver(&media_driver); } GSList *manager_find_devices(const char *path, diff --git a/audio/manager.h b/audio/manager.h index 1320c7121..300142dad 100644 --- a/audio/manager.h +++ b/audio/manager.h @@ -29,8 +29,6 @@ struct enabled_interfaces { gboolean sink; gboolean source; gboolean control; - gboolean socket; - gboolean media; gboolean media_player; }; -- 2.47.3