aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-25 21:51:32 +0100
committerMax Kellermann <max@duempel.org>2009-02-25 21:51:32 +0100
commit84ed6d4701af1b4b37fbd57e6db99b931687c6c4 (patch)
tree57382982915ce29b29878c326353ad8a3356c59f /src/output
parent57a9e5605b66e66b2403f2adcaa7a7b903e6cbc5 (diff)
downloadmpd-84ed6d4701af1b4b37fbd57e6db99b931687c6c4.tar.gz
mpd-84ed6d4701af1b4b37fbd57e6db99b931687c6c4.tar.xz
mpd-84ed6d4701af1b4b37fbd57e6db99b931687c6c4.zip
mvp: pass audio_format struct to mvp_set_pcm_params()
Pass a pointer to the audio_format struct instead of 3 separate integers.
Diffstat (limited to 'src/output')
-rw-r--r--src/output/mvp_plugin.c36
1 files changed, 23 insertions, 13 deletions
diff --git a/src/output/mvp_plugin.c b/src/output/mvp_plugin.c
index 5b5fc229a..88d3e06ab 100644
--- a/src/output/mvp_plugin.c
+++ b/src/output/mvp_plugin.c
@@ -119,26 +119,37 @@ mvp_output_finish(void *data)
}
static int
-mvp_set_pcm_params(struct mvp_data *md, unsigned long rate, int channels,
- unsigned bits)
+mvp_set_pcm_params(struct mvp_data *md, struct audio_format *audio_format)
{
unsigned iloop;
unsigned mix[5];
- if (channels == 1)
+ switch (audio_format->channels) {
+ case 1:
mix[0] = 1;
- else if (channels == 2)
+ break;
+
+ case 2:
mix[0] = 0;
- else
+ break;
+
+ default:
return -1;
+ }
/* 0,1=24bit(24) , 2,3=16bit */
- if (bits == 16)
+ switch (audio_format->bits) {
+ case 16:
mix[1] = 2;
- else if (bits == 24)
+ break;
+
+ case 24:
mix[1] = 0;
- else
+ break;
+
+ default:
return -1;
+ }
mix[3] = 0; /* stream type? */
mix[4] = G_BYTE_ORDER == G_LITTLE_ENDIAN;
@@ -147,15 +158,15 @@ mvp_set_pcm_params(struct mvp_data *md, unsigned long rate, int channels,
* if there is an exact match for the frequency, use it.
*/
for (iloop = 0; iloop < G_N_ELEMENTS(mvp_sample_rates); iloop++) {
- if (rate == mvp_sample_rates[iloop][1]) {
+ if (audio_format->sample_rate == mvp_sample_rates[iloop][1]) {
mix[2] = mvp_sample_rates[iloop][0];
break;
}
}
if (iloop >= G_N_ELEMENTS(mvp_sample_rates)) {
- g_warning("Can not find suitable output frequency for %ld\n",
- rate);
+ g_warning("Can not find suitable output frequency for %u\n",
+ audio_format->sample_rate);
return -1;
}
@@ -210,8 +221,7 @@ mvp_output_open(void *data, struct audio_format *audio_format)
strerror(errno));
return false;
}
- mvp_set_pcm_params(md, audio_format->sample_rate,
- audio_format->channels, audio_format->bits);
+ mvp_set_pcm_params(md, audio_format);
md->audio_format = *audio_format;
return true;
}