summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-06-23 00:08:02 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-06-23 00:08:02 +0000
commitebe177dc2e207790113fa0f34b758a5e4549f06d (patch)
treeca195afb89d6c2b683a0cc86fef1b87d9d789779 /audio
parent1a03aad91407d5b170787c24e32edfc2e673d76c (diff)
Fix default config settings
Diffstat (limited to 'audio')
-rw-r--r--audio/gateway.c9
-rw-r--r--audio/main.c5
2 files changed, 3 insertions, 11 deletions
diff --git a/audio/gateway.c b/audio/gateway.c
index 7064df2c..afdcbe01 100644
--- a/audio/gateway.c
+++ b/audio/gateway.c
@@ -49,9 +49,6 @@
#include "manager.h"
#include "error.h"
-static gboolean disable_hfp = FALSE;
-static gboolean sco_over_hci = TRUE;
-
static uint32_t hs_record_id = 0;
static uint32_t hf_record_id = 0;
@@ -498,11 +495,7 @@ int gateway_init(DBusConnection *conn, gboolean no_hfp, gboolean sco_hci)
g_io_add_watch(hs_server, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
(GIOFunc) gateway_io_cb, NULL);
- disable_hfp = no_hfp;
-
- sco_over_hci = sco_hci;
-
- if (disable_hfp)
+ if (no_hfp)
return 0;
chan = DEFAULT_HF_AG_CHANNEL;
diff --git a/audio/main.c b/audio/main.c
index 4a32a320..a7c93201 100644
--- a/audio/main.c
+++ b/audio/main.c
@@ -38,9 +38,8 @@
#include "manager.h"
-/* Configuration settings */
static gboolean disable_hfp = TRUE;
-static gboolean sco_hci = TRUE;
+static gboolean sco_hci = FALSE;
static GMainLoop *main_loop = NULL;
@@ -49,7 +48,7 @@ static void sig_term(int sig)
g_main_loop_quit(main_loop);
}
-void read_config(const char *file)
+static void read_config(const char *file)
{
GKeyFile *keyfile;
GError *err = NULL;