korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-14 06:25:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

audio: Remove not used auto connect flag

Browse Source 
This flag is not used anymore because HFP is moved away from bluez
It was used for Automatic HFP+A2DP connection with incomming connection.
This commit is contained in:
Chan-yeol Park 2012-12-05 19:16:35 +09:00 committed by Johan Hedberg
parent 83d330c64b
commit edf8f75b39
6 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
profiles/audio/audio.conf
View File

@ -10,10 +10,3 @@
# If we want to disable support for specific services
# 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
# other one automatically so the default setting of true is usually a good
# idea.
#AutoConnect=true

11
profiles/audio/avdtp.c
View File

@ -436,8 +436,6 @@ static GSList *servers = NULL;
static GSList *avdtp_callbacks = NULL;
static gboolean auto_connect = TRUE;
static int send_request(struct avdtp *session, gboolean priority,
struct avdtp_stream *stream, uint8_t signal_id,
void *buffer, size_t size);
@ -2549,8 +2547,6 @@ static void avdtp_confirm_cb(GIOChannel *chan, gpointer data)
goto drop;
}
dev->auto_connect = auto_connect;
return;
drop:
@ -3880,13 +3876,6 @@ int avdtp_init(const bdaddr_t *src, GKeyFile *config)
} else
master = tmp;
tmp = g_key_file_get_boolean(config, "General", "AutoConnect",
&err);
if (err)
g_clear_error(&err);
else
auto_connect = tmp;
proceed:
server = g_new0(struct avdtp_server, 1);

2
profiles/audio/device.h
View File

@ -39,8 +39,6 @@ struct audio_device {
bdaddr_t src;
bdaddr_t dst;
gboolean auto_connect;
struct sink *sink;
struct source *source;
struct control *control;

10
profiles/audio/manager.c
View File

@ -80,7 +80,6 @@ struct profile_req {
btd_profile_cb cb;
};
static gboolean auto_connect = TRUE;
static GKeyFile *config = NULL;
static GSList *adapters = NULL;
static GSList *devices = NULL;
@ -579,8 +578,6 @@ int audio_manager_init(GKeyFile *conf)
{
char **list;
int i;
gboolean b;
GError *err = NULL;
if (!conf)
goto proceed;
@ -611,13 +608,6 @@ int audio_manager_init(GKeyFile *conf)
}
g_strfreev(list);
b = g_key_file_get_boolean(config, "General", "AutoConnect", &err);
if (err) {
DBG("audio.conf: %s", err->message);
g_clear_error(&err);
} else
auto_connect = b;
proceed:
if (enabled.source)
btd_profile_register(&a2dp_source_profile);

2
profiles/audio/sink.c
View File

@ -366,8 +366,6 @@ int sink_connect(struct audio_device *dev, audio_device_cb cb, void *data)
return -EIO;
}
dev->auto_connect = FALSE;
pending = sink->connect;
pending->cb = cb;

2
profiles/audio/source.c
View File

@ -366,8 +366,6 @@ int source_connect(struct audio_device *dev, audio_device_cb cb, void *data)
return -EIO;
}
dev->auto_connect = FALSE;
pending = source->connect;
pending->cb = cb;
pending->cb_data = data;