summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-06-13 06:23:08 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-06-13 06:23:08 +0000
commit3f171de3179effc5b22462497bcbd56b18887adc (patch)
treedd95653a5fd71959594b3ca15bf00d225b335f09 /audio
parent35b7eb29eebf1a85fce60aa0b946ff2e04ebf684 (diff)
Refuse to pass SCO socket to alsa if PCM SCO routing is configured
Diffstat (limited to 'audio')
-rw-r--r--audio/headset.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/audio/headset.c b/audio/headset.c
index d6cc7751..6e5ec517 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -113,6 +113,7 @@ static DBusHandlerResult hs_disconnect(DBusConnection *conn, DBusMessage *msg,
void *data);
static gboolean disable_hfp = FALSE;
+static gboolean sco_over_hci = TRUE;
static GIOChannel *hs_server = NULL;
static GIOChannel *hf_server = NULL;
@@ -1800,6 +1801,8 @@ int headset_server_init(DBusConnection *conn, gboolean no_hfp,
disable_hfp = no_hfp;
+ sco_over_hci = sco_hci;
+
if (disable_hfp)
return 0;
@@ -1857,6 +1860,9 @@ void headset_exit(void)
int headset_get_config(headset_t *headset, struct ipc_data_cfg *cfg)
{
+ if (!sco_over_hci)
+ return -1;
+
if (headset->sco == NULL)
return -1;