diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-09-08 17:25:16 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-09-08 17:25:16 +0300 |
| commit | c7a77657ffe00b6d52a0c7e3d29f4fcf8537af5f (patch) | |
| tree | 1ac05a5c37df435c164736b684903a926a733b8d /src/pulse/channelmap.h | |
| parent | 6b034f5bfd4a69d5795f2292014f902fd450a8a4 (diff) | |
| parent | 821dc1797faa903618c7585d3c053fd7ae6e93db (diff) | |
Merge branch 'master' into master-tx
Diffstat (limited to 'src/pulse/channelmap.h')
| -rw-r--r-- | src/pulse/channelmap.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h index f9086d19..d2dd6f8f 100644 --- a/src/pulse/channelmap.h +++ b/src/pulse/channelmap.h @@ -157,6 +157,9 @@ typedef enum pa_channel_map_def { PA_CHANNEL_MAP_OSS, /**< The default channel mapping used by OSS as defined in the OSS 4.0 API specs */ + /**< Upper limit of valid channel mapping definitions */ + PA_CHANNEL_MAP_DEF_MAX, + PA_CHANNEL_MAP_DEFAULT = PA_CHANNEL_MAP_AIFF /**< The default channel map */ } pa_channel_map_def_t; @@ -211,9 +214,13 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *map, const char *s); /** Compare two channel maps. Return 1 if both match. */ int pa_channel_map_equal(const pa_channel_map *a, const pa_channel_map *b) PA_GCC_PURE; -/** Return non-zero of the specified channel map is considered valid */ +/** Return non-zero if the specified channel map is considered valid */ int pa_channel_map_valid(const pa_channel_map *map) PA_GCC_PURE; +/** Return non-zero if the specified channel map is compatible with + * the specified sample spec. \since 0.9.12 */ +int pa_channel_map_compatible(const pa_channel_map *map, const pa_sample_spec *ss) PA_GCC_PURE; + PA_C_DECL_END #endif |