Skip to content

Commit def15e0

Browse files
authored
Merge pull request #3113 from Digitalone1/master
SOE/SIE: Set pipeline type internally
2 parents fe3c1e8 + e3a815b commit def15e0

6 files changed

+9
-9
lines changed

include/stream_input_effects.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
class StreamInputEffects : public EffectsBase {
2727
public:
28-
StreamInputEffects(PipeManager* pipe_manager, PipelineType pipeline_type);
28+
StreamInputEffects(PipeManager* pipe_manager);
2929
StreamInputEffects(const StreamInputEffects&) = delete;
3030
auto operator=(const StreamInputEffects&) -> StreamInputEffects& = delete;
3131
StreamInputEffects(const StreamInputEffects&&) = delete;

include/stream_output_effects.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
class StreamOutputEffects : public EffectsBase {
2727
public:
28-
StreamOutputEffects(PipeManager* pipe_manager, PipelineType pipeline_type);
28+
StreamOutputEffects(PipeManager* pipe_manager);
2929
StreamOutputEffects(const StreamOutputEffects&) = delete;
3030
auto operator=(const StreamOutputEffects&) -> StreamOutputEffects& = delete;
3131
StreamOutputEffects(const StreamOutputEffects&&) = delete;

src/application.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ void on_startup(GApplication* gapp) {
8787
self->soe_settings = g_settings_new(tags::schema::id_output);
8888

8989
self->pm = new PipeManager();
90-
self->soe = new StreamOutputEffects(self->pm, PipelineType::output);
91-
self->sie = new StreamInputEffects(self->pm, PipelineType::input);
90+
self->soe = new StreamOutputEffects(self->pm);
91+
self->sie = new StreamInputEffects(self->pm);
9292

9393
if (self->settings == nullptr) {
9494
self->settings = g_settings_new(tags::app::id);

src/rnnoise_ui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ void setup(RNNoiseBox* self,
364364
? "last-loaded-input-community-package"
365365
: "last-loaded-output-community-package";
366366

367-
// irs loaded from the convolver menu are always local.
367+
// models loaded from the rnnoise ui are always local.
368368
g_settings_reset(self->data->application->settings, lcp_key);
369369

370370
auto string_object =

src/stream_input_effects.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
#include "tags_schema.hpp"
4242
#include "util.hpp"
4343

44-
StreamInputEffects::StreamInputEffects(PipeManager* pipe_manager, PipelineType pipeline_type)
45-
: EffectsBase("sie: ", tags::schema::id_input, pipe_manager, pipeline_type) {
44+
StreamInputEffects::StreamInputEffects(PipeManager* pipe_manager)
45+
: EffectsBase("sie: ", tags::schema::id_input, pipe_manager, PipelineType::input) {
4646
auto* PULSE_SOURCE = std::getenv("PULSE_SOURCE");
4747

4848
if (PULSE_SOURCE != nullptr && PULSE_SOURCE != tags::pipewire::ee_source_name) {

src/stream_output_effects.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
#include "tags_schema.hpp"
4242
#include "util.hpp"
4343

44-
StreamOutputEffects::StreamOutputEffects(PipeManager* pipe_manager, PipelineType pipeline_type)
45-
: EffectsBase("soe: ", tags::schema::id_output, pipe_manager, pipeline_type) {
44+
StreamOutputEffects::StreamOutputEffects(PipeManager* pipe_manager)
45+
: EffectsBase("soe: ", tags::schema::id_output, pipe_manager, PipelineType::output) {
4646
auto* PULSE_SINK = std::getenv("PULSE_SINK");
4747

4848
if (PULSE_SINK != nullptr && PULSE_SINK != tags::pipewire::ee_sink_name) {

0 commit comments

Comments
 (0)