diff --git a/spa/plugins/audioconvert/audioadapter.c b/spa/plugins/audioconvert/audioadapter.c index 5c2db07fa..19b1e1cc5 100644 --- a/spa/plugins/audioconvert/audioadapter.c +++ b/spa/plugins/audioconvert/audioadapter.c @@ -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); } -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; @@ -1520,7 +1520,7 @@ impl_get_size(const struct spa_handle_factory *factory, { 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); return size; @@ -1569,7 +1569,7 @@ impl_init(const struct spa_handle_factory *factory, &impl_node, this); 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, info, support, n_support); diff --git a/spa/plugins/audioconvert/audioconvert2.c b/spa/plugins/audioconvert/audioconvert.c similarity index 99% rename from spa/plugins/audioconvert/audioconvert2.c rename to spa/plugins/audioconvert/audioconvert.c index dcbab6486..47e174f91 100644 --- a/spa/plugins/audioconvert/audioconvert2.c +++ b/spa/plugins/audioconvert/audioconvert.c @@ -52,7 +52,7 @@ #undef SPA_LOG_TOPIC_DEFAULT #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_CHANNELS 2 @@ -2687,7 +2687,7 @@ impl_enum_interface_info(const struct spa_handle_factory *factory, return 1; } -const struct spa_handle_factory spa_audioconvert2_factory = { +const struct spa_handle_factory spa_audioconvert_factory = { SPA_VERSION_HANDLE_FACTORY, SPA_NAME_AUDIO_CONVERT, NULL, diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build index 3f2102f1d..3eb007f9c 100644 --- a/spa/plugins/audioconvert/meson.build +++ b/spa/plugins/audioconvert/meson.build @@ -1,5 +1,6 @@ -audioconvert_sources = ['audioadapter.c', - 'audioconvert2.c', +audioconvert_sources = [ + 'audioadapter.c', + 'audioconvert.c', 'plugin.c' ] diff --git a/spa/plugins/audioconvert/plugin.c b/spa/plugins/audioconvert/plugin.c index 7cb3cd5e8..03c206f89 100644 --- a/spa/plugins/audioconvert/plugin.c +++ b/spa/plugins/audioconvert/plugin.c @@ -26,7 +26,7 @@ #include -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; SPA_EXPORT @@ -37,7 +37,7 @@ int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t switch (*index) { case 0: - *factory = &spa_audioconvert2_factory; + *factory = &spa_audioconvert_factory; break; case 1: *factory = &spa_audioadapter_factory;