korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-17 17:24:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove HFP AG features from audio.conf since they should come from the telephony plugin

Browse Source
This commit is contained in:
Johan Hedberg 2008-09-03 17:07:27 +03:00
parent 2bda864bfb
commit 40c0305b1f
3 changed files with 10 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/audio.conf
View File

@ -23,18 +23,6 @@
# Defaults to false
HFP=false
# HFP Gateway features
# Defaults to false
3WayCalling=false
EchoCancelNoiseCancel=false
VoiceRecognition=false
InBandRingtone=false
VoiceTags=false
RejectingCalls=false
EnhancedCallStatus=false
EnhancedCallControl=false
ExtendedErrorResultCodes=false
# Just an example of potential config options for the other interfaces
#[A2DP]
#SBCSources=1

92
audio/headset.c
View File

@ -67,16 +67,6 @@
#define HEADSET_GAIN_SPEAKER 'S'
#define HEADSET_GAIN_MICROPHONE 'M'
#define AG_FEATURE_THREE_WAY_CALLING 0x0001
#define AG_FEATURE_EC_ANDOR_NR 0x0002
#define AG_FEATURE_VOICE_RECOGNITION 0x0004
#define AG_FEATURE_INBAND_RINGTONE 0x0008
#define AG_FEATURE_ATTACH_NUMBER_TO_VOICETAG 0x0010
#define AG_FEATURE_REJECT_A_CALL 0x0020
#define AG_FEATURE_ENHANCES_CALL_STATUS 0x0040
#define AG_FEATURE_ENHANCES_CALL_CONTROL 0x0080
#define AG_FEATURE_EXTENDED_ERROR_RESULT_CODES 0x0100
static uint32_t ag_features = 0;
static gboolean sco_hci = TRUE;
@ -1614,7 +1604,6 @@ register_iface:
uint32_t headset_config_init(GKeyFile *config)
{
GError *err = NULL;
gboolean value;
char *str;
/* Use the default values if there is no config file */
@ -1637,87 +1626,6 @@ uint32_t headset_config_init(GKeyFile *config)
g_free(str);
}
value = g_key_file_get_boolean(config, "Headset", "3WayCalling",
&err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_THREE_WAY_CALLING;
value = g_key_file_get_boolean(config, "Headset", "EchoCancelNoiseCancel",
&err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_EC_ANDOR_NR;
value = g_key_file_get_boolean(config, "Headset", "VoiceRecognition",
&err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_VOICE_RECOGNITION;
value = g_key_file_get_boolean(config, "Headset", "InBandRingtone",
&err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_INBAND_RINGTONE;
value = g_key_file_get_boolean(config, "Headset", "VoiceTags",
&err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_ATTACH_NUMBER_TO_VOICETAG;
value = g_key_file_get_boolean(config, "Headset", "RejectingCalls",
&err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_REJECT_A_CALL;
value = g_key_file_get_boolean(config, "Headset", "EnhancedCallStatus",
&err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_ENHANCES_CALL_STATUS;
value = g_key_file_get_boolean(config, "Headset", "EnhancedCallControl",
&err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_ENHANCES_CALL_CONTROL;
value = g_key_file_get_boolean(config, "Headset",
"ExtendedErrorResultCodes", &err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else if (value)
ag_features |= AG_FEATURE_EXTENDED_ERROR_RESULT_CODES;
return ag_features;
}

10
audio/telephony.h
View File

@ -24,6 +24,16 @@
#include <stdint.h>
#define AG_FEATURE_THREE_WAY_CALLING 0x0001
#define AG_FEATURE_EC_ANDOR_NR 0x0002
#define AG_FEATURE_VOICE_RECOGNITION 0x0004
#define AG_FEATURE_INBAND_RINGTONE 0x0008
#define AG_FEATURE_ATTACH_NUMBER_TO_VOICETAG 0x0010
#define AG_FEATURE_REJECT_A_CALL 0x0020
#define AG_FEATURE_ENHANCES_CALL_STATUS 0x0040
#define AG_FEATURE_ENHANCES_CALL_CONTROL 0x0080
#define AG_FEATURE_EXTENDED_ERROR_RESULT_CODES 0x0100
struct indicator {
const char *desc;
const char *range;