mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-15 08:56:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth-discover: Remove remaining ifdef NOKIAs.

Browse source 
These were supposed to be removed already in 13849f153, but
at that time I missed the ifdefs in
module-bluetooth-discover.c.
This commit is contained in:
Tanu Kaskinen 2011-06-13 18:47:43 +03:00 • committed by Colin Guthrie
parent c3056ce530
commit 62e43f9181
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/bluetooth/module-bluetooth-discover.c
View file

@ -42,21 +42,14 @@
PA_MODULE_AUTHOR("Joao Paulo Rechi Vita"); PA_MODULE_AUTHOR("Joao Paulo Rechi Vita");
PA_MODULE_DESCRIPTION("Detect available bluetooth audio devices and load bluetooth audio drivers"); PA_MODULE_DESCRIPTION("Detect available bluetooth audio devices and load bluetooth audio drivers");
PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("async=<Asynchronous initialization?>"); PA_MODULE_USAGE("async=<Asynchronous initialization?> "
"sco_sink=<name of sink> "
"sco_source=<name of source> ");
PA_MODULE_LOAD_ONCE(TRUE); PA_MODULE_LOAD_ONCE(TRUE);
/*
#ifdef NOKIA
"sco_sink=<name of sink> "
"sco_source=<name of source>"
#endif
*/
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
#ifdef NOKIA
"sco_sink", "sco_sink",
"sco_source", "sco_source",
#endif
"async", "async",
NULL NULL
}; };
@ -105,7 +98,6 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
} }
#endif #endif
#ifdef NOKIA
if (pa_modargs_get_value(u->modargs, "sco_sink", NULL) && if (pa_modargs_get_value(u->modargs, "sco_sink", NULL) &&
pa_modargs_get_value(u->modargs, "sco_source", NULL)) { pa_modargs_get_value(u->modargs, "sco_source", NULL)) {
char *tmp; char *tmp;
@ -116,7 +108,6 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
pa_xfree(args); pa_xfree(args);
args = tmp; args = tmp;
} }
#endif
if (d->audio_source_state >= PA_BT_AUDIO_STATE_CONNECTED) if (d->audio_source_state >= PA_BT_AUDIO_STATE_CONNECTED)
args = pa_sprintf_malloc("%s profile=\"a2dp_source\" auto_connect=no", args); args = pa_sprintf_malloc("%s profile=\"a2dp_source\" auto_connect=no", args);