From d9939690ed121931e17e985afe01149da93ca3f3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 17 Jun 2009 03:05:30 +0200 Subject: channelmap: implement pa_channel_position_from_string() --- src/pulse/channelmap.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/pulse/channelmap.h') diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h index 2aaead01..d0474262 100644 --- a/src/pulse/channelmap.h +++ b/src/pulse/channelmap.h @@ -282,6 +282,9 @@ pa_channel_map* pa_channel_map_init_extend(pa_channel_map *m, unsigned channels, /** Return a text label for the specified channel position */ const char* pa_channel_position_to_string(pa_channel_position_t pos) PA_GCC_PURE; +/* The inverse of pa_channel_position_to_string(). \since 0.9.16 */ +pa_channel_position_t pa_channel_position_from_string(const char *s) PA_GCC_PURE; + /** Return a human readable text label for the specified channel position. \since 0.9.7 */ const char* pa_channel_position_to_pretty_string(pa_channel_position_t pos); -- cgit From 4f36cc76f25632212d1c661bd82780b2f938819d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 17 Jun 2009 03:06:54 +0200 Subject: channelmap: make sure a mask is generated is 64 bit int --- src/pulse/channelmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pulse/channelmap.h') diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h index d0474262..d7901ac2 100644 --- a/src/pulse/channelmap.h +++ b/src/pulse/channelmap.h @@ -209,7 +209,7 @@ typedef enum pa_channel_position { typedef uint64_t pa_channel_position_mask_t; /** Makes a bit mask from a channel position. \since 0.9.16 */ -#define PA_CHANNEL_POSITION_MASK(f) ((pa_channel_position_mask_t) (1 << (f))) +#define PA_CHANNEL_POSITION_MASK(f) ((pa_channel_position_mask_t) (1ULL << (f))) /** A list of channel mapping definitions for pa_channel_map_init_auto() */ typedef enum pa_channel_map_def { -- cgit