[PATCH 1/2] audio: Remove left over of HFP removal

[PATCH 1/2] audio: Remove left over of HFP removal

[chanyeol.park]

From: Chan-yeol Park <chanyeol.park@samsung.com>

---
 profiles/audio/main.c |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/profiles/audio/main.c b/profiles/audio/main.c
index ce060fc..c5d1426 100644
--- a/profiles/audio/main.c
+++ b/profiles/audio/main.c
@@ -44,8 +44,6 @@
 #include "device.h"
 #include "manager.h"
 
-static GIOChannel *sco_server = NULL;
-
 static GKeyFile *load_config_file(const char *file)
 {
 	GError *err = NULL;
@@ -81,12 +79,6 @@ static int audio_init(void)
 
 static void audio_exit(void)
 {
-	if (sco_server) {
-		g_io_channel_shutdown(sco_server, TRUE, NULL);
-		g_io_channel_unref(sco_server);
-		sco_server = NULL;
-	}
-
 	audio_manager_exit();
 }
 
-- 
1.7.9.5

[PATCH 2/2] build: Include bluetooth lib folder for obexd

[chanyeol.park]

From: Chan-yeol Park <chanyeol.park@samsung.com>

Because obexd is included in bluez repo, obexd should refer to local
lib folder before system's one.
---
 Makefile.obexd |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.obexd b/Makefile.obexd
index 1ed423b..cbcd65d 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -29,7 +29,7 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
 					-DPLUGINDIR=\""$(obex_plugindir)"\" \
 					-fPIC -D_FILE_OFFSET_BITS=64
 
-obexd_src_obexd_CPPFLAGS = -I$(builddir)/obexd/src \
+obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src  \
 				-I$(srcdir)/obexd/src -I$(srcdir)/btio \
 				-I$(srcdir)/gobex -I$(srcdir)/gdbus
 
@@ -76,7 +76,8 @@ obexd_client_obex_client_LDADD = lib/libbluetooth-private.la \
 obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
 						-fPIC -D_FILE_OFFSET_BITS=64
 
-obexd_client_obex_client_CPPFLAGS = -I$(srcdir)/obexd/src -I$(srcdir)/btio \
-					-I$(srcdir)/gobex -I$(srcdir)/gdbus
+obexd_client_obex_client_CPPFLAGS = -I$(builddir)/lib -I$(srcdir)/obexd/src \
+				-I$(srcdir)/btio -I$(srcdir)/gobex \
+				-I$(srcdir)/gdbus
 
 obexd_client_obex_client_SHORTNAME = obex-client
-- 
1.7.9.5

Re: [PATCH 1/2] audio: Remove left over of HFP removal

[Johan Hedberg]

Hi Chan-yeol,

On Wed, Dec 05, 2012, chanyeol.park@samsung.com wrote:
> ---
>  profiles/audio/main.c |    8 --------
>  1 file changed, 8 deletions(-)

Both patches have been applied. Thanks!

Johan

[PATCH 1/2] audio: Remove left over of HFP removal

[Chan-yeol Park]

---
 profiles/audio/audio.conf |   21 ++-------------------
 profiles/audio/manager.c  |   10 ----------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/profiles/audio/audio.conf b/profiles/audio/audio.conf
index 6bf4482..12b9c55 100644
--- a/profiles/audio/audio.conf
+++ b/profiles/audio/audio.conf
@@ -8,12 +8,8 @@
 #Master=true
 
 # If we want to disable support for specific services
-# 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)
-# Defaults to HCI
-#SCORouting=PCM
+# Defaults to supporting the services: Sink, Control
+#Disable=Source
 
 # Automatically connect both A2DP and HFP/HSP profiles for incoming
 # connections. Some headsets that support both profiles will only connect the
@@ -21,16 +17,3 @@
 # idea.
 #AutoConnect=true
 
-# Headset interface specific options (i.e. options which affect how the audio
-# service interacts with remote headset devices)
-[Headset]
-
-# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
-MaxConnected=1
-
-# Set to true to enable use of fast connectable mode (faster page scanning)
-# for HFP when incoming call starts. Default settings are restored after
-# call is answered or rejected. Page scan interval is much shorter and page
-# scan type changed to interlaced. Such allows faster connection initiated
-# by a headset.
-FastConnectable=false
diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c
index 714489a..4e0c631 100644
--- a/profiles/audio/manager.c
+++ b/profiles/audio/manager.c
@@ -81,7 +81,6 @@ struct profile_req {
 };
 
 static gboolean auto_connect = TRUE;
-static int max_connected_headsets = 1;
 static GKeyFile *config = NULL;
 static GSList *adapters = NULL;
 static GSList *devices = NULL;
@@ -619,15 +618,6 @@ int audio_manager_init(GKeyFile *conf)
 	} else
 		auto_connect = b;
 
-	err = NULL;
-	i = g_key_file_get_integer(config, "Headset", "MaxConnected",
-					&err);
-	if (err) {
-		DBG("audio.conf: %s", err->message);
-		g_clear_error(&err);
-	} else
-		max_connected_headsets = i;
-
 proceed:
 	if (enabled.source)
 		btd_profile_register(&a2dp_source_profile);
-- 
1.7.9.5

Re: [PATCH 1/2] audio: Remove left over of HFP removal

[Johan Hedberg]

Hi Chan-yeol,

On Wed, Dec 05, 2012, Chan-yeol Park wrote:
> ---
>  profiles/audio/audio.conf |   21 ++-------------------
>  profiles/audio/manager.c  |   10 ----------
>  2 files changed, 2 insertions(+), 29 deletions(-)

Both patches have been applied. Thanks.

Johan