mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove u->channels and u->rates, since it's redundant info

Browse source
This commit is contained in:
João Paulo Rechi Vita 2008-08-21 17:23:16 -03:00 • committed by Lennart Poettering
parent 0e817579ee
commit 027940b316
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/module-bt-device.c
View file

@ -97,8 +97,6 @@ struct userdata {
char *name; char *name;
char *addr; char *addr;
char *profile; char *profile;
int rate;
int channels;
pa_sample_spec ss; pa_sample_spec ss;
int audioservice_fd; int audioservice_fd;
@ -251,7 +249,7 @@ static int bt_a2dp_init(struct userdata *u) {
sbc_capabilities_t *cap = &u->a2dp.sbc_capabilities; sbc_capabilities_t *cap = &u->a2dp.sbc_capabilities;
unsigned int max_bitpool, min_bitpool; unsigned int max_bitpool, min_bitpool;
switch (u->rate) { switch (u->ss.rate) {
case 48000: case 48000:
cap->frequency = BT_SBC_SAMPLING_FREQ_48000; cap->frequency = BT_SBC_SAMPLING_FREQ_48000;
break; break;
@ -265,14 +263,14 @@ static int bt_a2dp_init(struct userdata *u) {
cap->frequency = BT_SBC_SAMPLING_FREQ_16000; cap->frequency = BT_SBC_SAMPLING_FREQ_16000;
break; break;
default: default:
pa_log_error("Rate %d not supported", u->rate); pa_log_error("Rate %d not supported", u->ss.rate);
return -1; return -1;
} }
// if (cfg->has_channel_mode) // if (cfg->has_channel_mode)
// cap->channel_mode = cfg->channel_mode; // cap->channel_mode = cfg->channel_mode;
// else // else
if (u->channels == 2) { if (u->ss.channels == 2) {
if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO) if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO)
cap->channel_mode = BT_A2DP_CHANNEL_MODE_JOINT_STEREO; cap->channel_mode = BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO) else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO)
@ -418,9 +416,6 @@ static int bt_setconf(struct userdata *u) {
else else
u->ss.format = PA_SAMPLE_U8; u->ss.format = PA_SAMPLE_U8;
u->ss.rate = u->rate;
u->ss.channels = u->channels;
memset(setconf_req, 0, BT_AUDIO_IPC_PACKET_SIZE); memset(setconf_req, 0, BT_AUDIO_IPC_PACKET_SIZE);
setconf_req->h.msg_type = BT_SETCONFIGURATION_REQ; setconf_req->h.msg_type = BT_SETCONFIGURATION_REQ;
strncpy(setconf_req->device, u->addr, 18); strncpy(setconf_req->device, u->addr, 18);
@ -837,7 +832,6 @@ finish:
int pa__init(pa_module* m) { int pa__init(pa_module* m) {
int e; int e;
const char *rate, *channels;
pa_modargs *ma; pa_modargs *ma;
pa_sink_new_data data; pa_sink_new_data data;
struct pollfd *pollfd; struct pollfd *pollfd;
@ -876,11 +870,11 @@ int pa__init(pa_module* m) {
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->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;
} }
if (pa_modargs_get_value_u32(ma, "channels", &u->channels) < 0) { if (pa_modargs_get_value_u32(ma, "channels", &u->ss.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;
} }