mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the same module parameter names for module-bluetooth-device as for most other modules

Browse source
This commit is contained in:
Lennart Poettering 2008-09-29 21:40:52 +02:00
parent 7923731e18
commit aa1974b7a0
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -63,8 +63,8 @@ PA_MODULE_DESCRIPTION("Bluetooth audio sink and source");
PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE); PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"name=<name of the device> " "sink_name=<name of the device> "
"addr=<address of the device> " "address=<address of the device> "
"profile=<a2dp|hsp>"); "profile=<a2dp|hsp>");
struct bt_a2dp { struct bt_a2dp {
@ -115,8 +115,8 @@ struct userdata {
}; };
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"name", "sink_name",
"addr", "address",
"profile", "profile",
"rate", "rate",
"channels", "channels",
@ -789,29 +789,32 @@ int pa__init(pa_module* m) {
u->rtpoll = pa_rtpoll_new(); u->rtpoll = pa_rtpoll_new();
pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll); pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll);
u->rtpoll_item = NULL; u->rtpoll_item = NULL;
u->ss = m->core->default_sample_spec;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log_error("failed to parse module arguments"); pa_log_error("Failed to parse module arguments");
goto fail; goto fail;
} }
if (!(u->name = pa_xstrdup(pa_modargs_get_value(ma, "name", DEFAULT_SINK_NAME)))) { if (!(u->name = pa_xstrdup(pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME)))) {
pa_log_error("failed to get device name from module arguments"); pa_log_error("Failed to get device name from module arguments");
goto fail; goto fail;
} }
if (!(u->addr = pa_xstrdup(pa_modargs_get_value(ma, "addr", NULL)))) { if (!(u->addr = pa_xstrdup(pa_modargs_get_value(ma, "address", NULL)))) {
pa_log_error("failed to get device address from module arguments"); pa_log_error("Failed to get device address from module arguments");
goto fail; goto fail;
} }
if (!(u->profile = pa_xstrdup(pa_modargs_get_value(ma, "profile", NULL)))) { if (!(u->profile = pa_xstrdup(pa_modargs_get_value(ma, "profile", NULL)))) {
pa_log_error("failed to get profile from module arguments"); pa_log_error("Failed to get profile from module arguments");
goto fail; goto fail;
} }
if (pa_modargs_get_value_u32(ma, "rate", &u->ss.rate) < 0) { if (pa_modargs_get_value_u32(ma, "rate", &u->ss.rate) < 0) {
pa_log_error("failed to get rate from module arguments"); pa_log_error("Failed to get rate from module arguments");
goto fail; goto fail;
} }
channels = u->ss.channels;
if (pa_modargs_get_value_u32(ma, "channels", &channels) < 0) { if (pa_modargs_get_value_u32(ma, "channels", &channels) < 0) {
pa_log_error("failed to get channels from module arguments"); pa_log_error("Failed to get channels from module arguments");
goto fail; goto fail;
} }
u->ss.channels = (uint8_t) channels; u->ss.channels = (uint8_t) channels;