summaryrefslogtreecommitdiffstats
path: root/src/modules/alsa-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-05-16 23:47:38 +0000
committerLennart Poettering <lennart@poettering.net>2006-05-16 23:47:38 +0000
commit4b6ab291a787ff597c938842b569a35434ab11d8 (patch)
tree2cecfeceebbb509ed2f32d94c0f489ed3c5654bb /src/modules/alsa-util.c
parentc63cc7bb79fb60b6493c3e80648501fbe8a83963 (diff)
* modify pa_channel_map_init_auto() to take an extra argument specifying the standard to use (ALSA, AIFF, ...)
* add some more validity checks to pa_source_new(),pa_sink_new(),pa_sink_input_new(),pa_source_output_new() git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@888 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/alsa-util.c')
-rw-r--r--src/modules/alsa-util.c44
1 files changed, 0 insertions, 44 deletions
diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c
index a8192165..503b8efb 100644
--- a/src/modules/alsa-util.c
+++ b/src/modules/alsa-util.c
@@ -340,47 +340,3 @@ snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name) {
return elem;
}
-
-pa_channel_map* pa_alsa_channel_map_init_auto(pa_channel_map *m, unsigned channels) {
- assert(m);
- assert(channels > 0);
- assert(channels <= PA_CHANNELS_MAX);
-
- pa_channel_map_init(m);
-
- m->channels = channels;
-
- /* The standard ALSA channel order */
-
- switch (channels) {
- case 1:
- m->map[0] = PA_CHANNEL_POSITION_MONO;
- return m;
-
- case 8:
- m->map[6] = PA_CHANNEL_POSITION_SIDE_LEFT;
- m->map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT;
- /* Fall through */
-
- case 6:
- m->map[5] = PA_CHANNEL_POSITION_LFE;
- /* Fall through */
-
- case 5:
- m->map[4] = PA_CHANNEL_POSITION_FRONT_CENTER;
- /* Fall through */
-
- case 4:
- m->map[2] = PA_CHANNEL_POSITION_REAR_LEFT;
- m->map[3] = PA_CHANNEL_POSITION_REAR_RIGHT;
- /* Fall through */
-
- case 2:
- m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
- m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
- return m;
-
- default:
- return NULL;
- }
-}