diff --git a/src/modules/meson.build b/src/modules/meson.build index c6852f0ab..e5f937a92 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -137,6 +137,7 @@ pipewire_module_protocol_pulse_sources = [ 'module-protocol-pulse/dbus-name.c', 'module-protocol-pulse/format.c', 'module-protocol-pulse/manager.c', + 'module-protocol-pulse/media-roles.c', 'module-protocol-pulse/pending-sample.c', 'module-protocol-pulse/pulse-server.c', 'module-protocol-pulse/sample.c', diff --git a/src/modules/module-protocol-pulse/media-roles.c b/src/modules/module-protocol-pulse/media-roles.c new file mode 100644 index 000000000..b1fada1c6 --- /dev/null +++ b/src/modules/module-protocol-pulse/media-roles.c @@ -0,0 +1,40 @@ +/* PipeWire + * + * Copyright © 2020 Wim Taymans + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include + +#include "media-roles.h" + +const struct str_map media_role_map[] = { + { "Movie", "video", }, + { "Music", "music", }, + { "Game", "game", }, + { "Notification", "event", }, + { "Communication", "phone", }, + { "Movie", "animation", }, + { "Production", "production", }, + { "Accessibility", "a11y", }, + { "Test", "test", }, + { NULL, NULL }, +}; diff --git a/src/modules/module-protocol-pulse/media-roles.h b/src/modules/module-protocol-pulse/media-roles.h new file mode 100644 index 000000000..59103b820 --- /dev/null +++ b/src/modules/module-protocol-pulse/media-roles.h @@ -0,0 +1,50 @@ +/* PipeWire + * + * Copyright © 2020 Wim Taymans + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef PULSE_SERVER_MEDIA_ROLES_H +#define PULSE_SERVER_MEDIA_ROLES_H + +#include + +#include + +struct str_map { + const char *pw_str; + const char *pa_str; + const struct str_map *child; +}; + +extern const struct str_map media_role_map[]; + +static inline const struct str_map *str_map_find(const struct str_map *map, const char *pw, const char *pa) +{ + size_t i; + for (i = 0; map[i].pw_str; i++) + if ((pw && spa_streq(map[i].pw_str, pw)) || + (pa && spa_streq(map[i].pa_str, pa))) + return &map[i]; + return NULL; +} + +#endif /* PULSE_SERVER_MEDIA_ROLES_H */ diff --git a/src/modules/module-protocol-pulse/message.c b/src/modules/module-protocol-pulse/message.c index 545b5882a..dfa46e662 100644 --- a/src/modules/module-protocol-pulse/message.c +++ b/src/modules/module-protocol-pulse/message.c @@ -24,6 +24,8 @@ #include +#include "media-roles.h" + #define VOLUME_MUTED ((uint32_t) 0U) #define VOLUME_NORM ((uint32_t) 0x10000U) #define VOLUME_MAX ((uint32_t) UINT32_MAX/2) @@ -47,25 +49,6 @@ static inline float volume_to_linear(uint32_t vol) return v * v * v; } -struct str_map { - const char *pw_str; - const char *pa_str; - const struct str_map *child; -}; - -const struct str_map media_role_map[] = { - { "Movie", "video", }, - { "Music", "music", }, - { "Game", "game", }, - { "Notification", "event", }, - { "Communication", "phone", }, - { "Movie", "animation", }, - { "Production", "production", }, - { "Accessibility", "a11y", }, - { "Test", "test", }, - { NULL, NULL }, -}; - const struct str_map key_table[] = { { PW_KEY_DEVICE_BUS_PATH, "device.bus_path" }, { PW_KEY_DEVICE_FORM_FACTOR, "device.form_factor" }, @@ -80,16 +63,6 @@ const struct str_map key_table[] = { { NULL, NULL }, }; -static inline const struct str_map *str_map_find(const struct str_map *map, const char *pw, const char *pa) -{ - uint32_t i; - for (i = 0; map[i].pw_str; i++) - if ((pw && spa_streq(map[i].pw_str, pw)) || - (pa && spa_streq(map[i].pa_str, pa))) - return &map[i]; - return NULL; -} - enum { TAG_INVALID = 0, TAG_STRING = 't',