mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-14 08:56:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

audioconvert2: rename to audioconvert

Browse source
This commit is contained in:
Wim Taymans 2022-06-16 09:19:05 +02:00
parent cf04bb573c
commit de2e819fec
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/audioconvert/audioadapter.c
View file

@ -484,7 +484,7 @@ static int configure_convert(struct impl *this, uint32_t mode)
return spa_node_set_param(this->convert, SPA_PARAM_PortConfig, 0, param); return spa_node_set_param(this->convert, SPA_PARAM_PortConfig, 0, param);
} }
extern const struct spa_handle_factory spa_audioconvert2_factory; extern const struct spa_handle_factory spa_audioconvert_factory;
static const struct spa_node_events follower_node_events; static const struct spa_node_events follower_node_events;
@ -1520,7 +1520,7 @@ impl_get_size(const struct spa_handle_factory *factory,
{ {
size_t size; size_t size;
size = spa_handle_factory_get_size(&spa_audioconvert2_factory, params); size = spa_handle_factory_get_size(&spa_audioconvert_factory, params);
size += sizeof(struct impl); size += sizeof(struct impl);
return size; return size;
@ -1569,7 +1569,7 @@ impl_init(const struct spa_handle_factory *factory,
&impl_node, this); &impl_node, this);
this->hnd_convert = SPA_PTROFF(this, sizeof(struct impl), struct spa_handle); this->hnd_convert = SPA_PTROFF(this, sizeof(struct impl), struct spa_handle);
spa_handle_factory_init(&spa_audioconvert2_factory, spa_handle_factory_init(&spa_audioconvert_factory,
this->hnd_convert, this->hnd_convert,
info, support, n_support); info, support, n_support);

4
spa/plugins/audioconvert/audioconvert2.c → spa/plugins/audioconvert/audioconvert.c
View file

@ -52,7 +52,7 @@
#undef SPA_LOG_TOPIC_DEFAULT #undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT log_topic #define SPA_LOG_TOPIC_DEFAULT log_topic
static struct spa_log_topic *log_topic = &SPA_LOG_TOPIC(0, "spa.audioconvert2"); static struct spa_log_topic *log_topic = &SPA_LOG_TOPIC(0, "spa.audioconvert");
#define DEFAULT_RATE 48000 #define DEFAULT_RATE 48000
#define DEFAULT_CHANNELS 2 #define DEFAULT_CHANNELS 2
@ -2687,7 +2687,7 @@ impl_enum_interface_info(const struct spa_handle_factory *factory,
return 1; return 1;
} }
const struct spa_handle_factory spa_audioconvert2_factory = { const struct spa_handle_factory spa_audioconvert_factory = {
SPA_VERSION_HANDLE_FACTORY, SPA_VERSION_HANDLE_FACTORY,
SPA_NAME_AUDIO_CONVERT, SPA_NAME_AUDIO_CONVERT,
NULL, NULL,

5
spa/plugins/audioconvert/meson.build
View file

@ -1,5 +1,6 @@
audioconvert_sources = ['audioadapter.c', audioconvert_sources = [
'audioconvert2.c', 'audioadapter.c',
'audioconvert.c',
'plugin.c' 'plugin.c'
] ]

4
spa/plugins/audioconvert/plugin.c
View file

@ -26,7 +26,7 @@
#include <spa/support/plugin.h> #include <spa/support/plugin.h>
extern const struct spa_handle_factory spa_audioconvert2_factory; extern const struct spa_handle_factory spa_audioconvert_factory;
extern const struct spa_handle_factory spa_audioadapter_factory; extern const struct spa_handle_factory spa_audioadapter_factory;
SPA_EXPORT SPA_EXPORT
@ -37,7 +37,7 @@ int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t
switch (*index) { switch (*index) {
case 0: case 0:
*factory = &spa_audioconvert2_factory; *factory = &spa_audioconvert_factory;
break; break;
case 1: case 1:
*factory = &spa_audioadapter_factory; *factory = &spa_audioadapter_factory;