diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-03-04 13:24:38 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-03-04 13:24:38 +0000 |
| commit | 211ec74f0e8ce372dd4958ddc2c7f8747fb65355 (patch) | |
| tree | cae661340863f8b85f5479e01e508dd49cda8c29 | |
| parent | 0331fdbe6e368524f656b18b8ed4f7bc32b81772 (diff) | |
Use "hfp" instead of "no_hfp" and "EnableHFP" instead of "DisableHFP" to make the options more clear to understand (avoid double negatives)
| -rw-r--r-- | audio/audio.conf | 4 | ||||
| -rw-r--r-- | audio/manager.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/audio/audio.conf b/audio/audio.conf index 0d733105..07ed3ea4 100644 --- a/audio/audio.conf +++ b/audio/audio.conf @@ -16,9 +16,9 @@ # service interacts with remote headset devices) [Headset] -# Set to true to only support HSP +# Set to true to support HFP (in addition to HSP only which is the default) # Defaults to false -DisableHFP=true +EnableHFP=false # HFP Gateway features # Defaults to false diff --git a/audio/manager.c b/audio/manager.c index 69f9237f..c5f7df30 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -1540,7 +1540,7 @@ static int headset_server_init(DBusConnection *conn, GKeyFile *config) { uint8_t chan = DEFAULT_HS_AG_CHANNEL; sdp_buf_t buf; - gboolean no_hfp = FALSE; + gboolean hfp = TRUE; GError *err = NULL; uint32_t features; @@ -1569,7 +1569,7 @@ static int headset_server_init(DBusConnection *conn, GKeyFile *config) (GIOFunc) ag_io_cb, NULL); if (config) { - no_hfp = g_key_file_get_boolean(config, "Headset", "DisableHFP", + hfp = g_key_file_get_boolean(config, "Headset", "EnableHFP", &err); if (err) { debug("audio.conf: %s", err->message); @@ -1578,7 +1578,7 @@ static int headset_server_init(DBusConnection *conn, GKeyFile *config) } } - if (no_hfp) + if (!hfp) return 0; chan = DEFAULT_HF_AG_CHANNEL; |