summaryrefslogtreecommitdiffstats
path: root/src/pulse/channelmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pulse/channelmap.c')
-rw-r--r--src/pulse/channelmap.c108
1 files changed, 89 insertions, 19 deletions
diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c
index d5b8f743..2b8ef2b0 100644
--- a/src/pulse/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -27,12 +27,12 @@
#endif
#include <stdlib.h>
-#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <pulse/xmalloc.h>
#include <pulsecore/core-util.h>
+#include <pulsecore/macro.h>
#include "channelmap.h"
@@ -90,18 +90,81 @@ const char *const table[] = {
[PA_CHANNEL_POSITION_TOP_CENTER] = "top-center",
+ [PA_CHANNEL_POSITION_TOP_FRONT_CENTER] = "top-front-center",
[PA_CHANNEL_POSITION_TOP_FRONT_LEFT] = "top-front-left",
[PA_CHANNEL_POSITION_TOP_FRONT_RIGHT] = "top-front-right",
- [PA_CHANNEL_POSITION_TOP_FRONT_CENTER] = "top-front-center",
+ [PA_CHANNEL_POSITION_TOP_REAR_CENTER] = "top-rear-center",
[PA_CHANNEL_POSITION_TOP_REAR_LEFT] = "top-rear-left",
- [PA_CHANNEL_POSITION_TOP_REAR_RIGHT] = "top-rear-right",
- [PA_CHANNEL_POSITION_TOP_REAR_CENTER] = "top-rear-center"
+ [PA_CHANNEL_POSITION_TOP_REAR_RIGHT] = "top-rear-right"
+};
+
+const char *const pretty_table[] = {
+ [PA_CHANNEL_POSITION_MONO] = "Mono",
+
+ [PA_CHANNEL_POSITION_FRONT_CENTER] = "Front Center",
+ [PA_CHANNEL_POSITION_FRONT_LEFT] = "Front Left",
+ [PA_CHANNEL_POSITION_FRONT_RIGHT] = "Front Right",
+
+ [PA_CHANNEL_POSITION_REAR_CENTER] = "Rear Center",
+ [PA_CHANNEL_POSITION_REAR_LEFT] = "Rear Left",
+ [PA_CHANNEL_POSITION_REAR_RIGHT] = "Rear Right",
+
+ [PA_CHANNEL_POSITION_LFE] = "Low Frequency Emmiter",
+
+ [PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER] = "Front Left-of-center",
+ [PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER] = "Front Right-of-center",
+
+ [PA_CHANNEL_POSITION_SIDE_LEFT] = "Side Left",
+ [PA_CHANNEL_POSITION_SIDE_RIGHT] = "Side Right",
+
+ [PA_CHANNEL_POSITION_AUX0] = "Auxiliary 0",
+ [PA_CHANNEL_POSITION_AUX1] = "Auxiliary 1",
+ [PA_CHANNEL_POSITION_AUX2] = "Auxiliary 2",
+ [PA_CHANNEL_POSITION_AUX3] = "Auxiliary 3",
+ [PA_CHANNEL_POSITION_AUX4] = "Auxiliary 4",
+ [PA_CHANNEL_POSITION_AUX5] = "Auxiliary 5",
+ [PA_CHANNEL_POSITION_AUX6] = "Auxiliary 6",
+ [PA_CHANNEL_POSITION_AUX7] = "Auxiliary 7",
+ [PA_CHANNEL_POSITION_AUX8] = "Auxiliary 8",
+ [PA_CHANNEL_POSITION_AUX9] = "Auxiliary 9",
+ [PA_CHANNEL_POSITION_AUX10] = "Auxiliary 10",
+ [PA_CHANNEL_POSITION_AUX11] = "Auxiliary 11",
+ [PA_CHANNEL_POSITION_AUX12] = "Auxiliary 12",
+ [PA_CHANNEL_POSITION_AUX13] = "Auxiliary 13",
+ [PA_CHANNEL_POSITION_AUX14] = "Auxiliary 14",
+ [PA_CHANNEL_POSITION_AUX15] = "Auxiliary 15",
+ [PA_CHANNEL_POSITION_AUX16] = "Auxiliary 16",
+ [PA_CHANNEL_POSITION_AUX17] = "Auxiliary 17",
+ [PA_CHANNEL_POSITION_AUX18] = "Auxiliary 18",
+ [PA_CHANNEL_POSITION_AUX19] = "Auxiliary 19",
+ [PA_CHANNEL_POSITION_AUX20] = "Auxiliary 20",
+ [PA_CHANNEL_POSITION_AUX21] = "Auxiliary 21",
+ [PA_CHANNEL_POSITION_AUX22] = "Auxiliary 22",
+ [PA_CHANNEL_POSITION_AUX23] = "Auxiliary 23",
+ [PA_CHANNEL_POSITION_AUX24] = "Auxiliary 24",
+ [PA_CHANNEL_POSITION_AUX25] = "Auxiliary 25",
+ [PA_CHANNEL_POSITION_AUX26] = "Auxiliary 26",
+ [PA_CHANNEL_POSITION_AUX27] = "Auxiliary 27",
+ [PA_CHANNEL_POSITION_AUX28] = "Auxiliary 28",
+ [PA_CHANNEL_POSITION_AUX29] = "Auxiliary 29",
+ [PA_CHANNEL_POSITION_AUX30] = "Auxiliary 30",
+ [PA_CHANNEL_POSITION_AUX31] = "Auxiliary 31",
+
+ [PA_CHANNEL_POSITION_TOP_CENTER] = "Top Center",
+
+ [PA_CHANNEL_POSITION_TOP_FRONT_CENTER] = "Top Front Center",
+ [PA_CHANNEL_POSITION_TOP_FRONT_LEFT] = "Top Front Left",
+ [PA_CHANNEL_POSITION_TOP_FRONT_RIGHT] = "Top Front Right",
+
+ [PA_CHANNEL_POSITION_TOP_REAR_CENTER] = "Top Rear Center",
+ [PA_CHANNEL_POSITION_TOP_REAR_LEFT] = "Top Rear left",
+ [PA_CHANNEL_POSITION_TOP_REAR_RIGHT] = "Top Rear Right"
};
pa_channel_map* pa_channel_map_init(pa_channel_map *m) {
unsigned c;
- assert(m);
+ pa_assert(m);
m->channels = 0;
@@ -112,7 +175,7 @@ pa_channel_map* pa_channel_map_init(pa_channel_map *m) {
}
pa_channel_map* pa_channel_map_init_mono(pa_channel_map *m) {
- assert(m);
+ pa_assert(m);
pa_channel_map_init(m);
@@ -122,7 +185,7 @@ pa_channel_map* pa_channel_map_init_mono(pa_channel_map *m) {
}
pa_channel_map* pa_channel_map_init_stereo(pa_channel_map *m) {
- assert(m);
+ pa_assert(m);
pa_channel_map_init(m);
@@ -133,9 +196,9 @@ pa_channel_map* pa_channel_map_init_stereo(pa_channel_map *m) {
}
pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, pa_channel_map_def_t def) {
- assert(m);
- assert(channels > 0);
- assert(channels <= PA_CHANNELS_MAX);
+ pa_assert(m);
+ pa_assert(channels > 0);
+ pa_assert(channels <= PA_CHANNELS_MAX);
pa_channel_map_init(m);
@@ -342,11 +405,18 @@ const char* pa_channel_position_to_string(pa_channel_position_t pos) {
return table[pos];
}
+const char* pa_channel_position_to_pretty_string(pa_channel_position_t pos) {
+ if (pos < 0 || pos >= PA_CHANNEL_POSITION_MAX)
+ return NULL;
+
+ return pretty_table[pos];
+}
+
int pa_channel_map_equal(const pa_channel_map *a, const pa_channel_map *b) {
unsigned c;
- assert(a);
- assert(b);
+ pa_assert(a);
+ pa_assert(b);
if (a->channels != b->channels)
return 0;
@@ -363,14 +433,14 @@ char* pa_channel_map_snprint(char *s, size_t l, const pa_channel_map *map) {
int first = 1;
char *e;
- assert(s);
- assert(l > 0);
- assert(map);
+ pa_assert(s);
+ pa_assert(l > 0);
+ pa_assert(map);
*(e = s) = 0;
for (channel = 0; channel < map->channels && l > 1; channel++) {
- l -= snprintf(e, l, "%s%s",
+ l -= pa_snprintf(e, l, "%s%s",
first ? "" : ",",
pa_channel_position_to_string(map->map[channel]));
@@ -386,8 +456,8 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) {
pa_channel_map map;
char *p;
- assert(rmap);
- assert(s);
+ pa_assert(rmap);
+ pa_assert(s);
memset(&map, 0, sizeof(map));
@@ -447,7 +517,7 @@ finish:
int pa_channel_map_valid(const pa_channel_map *map) {
unsigned c;
- assert(map);
+ pa_assert(map);
if (map->channels <= 0 || map->channels > PA_CHANNELS_MAX)
return 0;