Skip to content

Commit 5838c1f

Browse files
committed
frontend: Use vector for filters dialog signals
This adds a vector for most signals in the filters dialog.
1 parent ecb0381 commit 5838c1f

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

frontend/dialogs/OBSBasicFilters.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
4242
: QDialog(parent),
4343
ui(new Ui::OBSBasicFilters),
4444
source(source_),
45-
addSignal(obs_source_get_signal_handler(source), "filter_add", OBSBasicFilters::OBSSourceFilterAdded, this),
46-
removeSignal(obs_source_get_signal_handler(source), "filter_remove", OBSBasicFilters::OBSSourceFilterRemoved,
47-
this),
48-
reorderSignal(obs_source_get_signal_handler(source), "reorder_filters", OBSBasicFilters::OBSSourceReordered,
49-
this),
50-
removeSourceSignal(obs_source_get_signal_handler(source), "remove", OBSBasicFilters::SourceRemoved, this),
51-
renameSourceSignal(obs_source_get_signal_handler(source), "rename", OBSBasicFilters::SourceRenamed, this),
5245
noPreviewMargin(13)
5346
{
47+
signal_handler_t *handler = obs_source_get_signal_handler(source);
48+
sigs.emplace_back(handler, "filter_add", OBSBasicFilters::OBSSourceFilterAdded, this);
49+
sigs.emplace_back(handler, "filter_remove", OBSBasicFilters::OBSSourceFilterRemoved, this);
50+
sigs.emplace_back(handler, "reorder_filters", OBSBasicFilters::OBSSourceReordered, this);
51+
sigs.emplace_back(handler, "remove", OBSBasicFilters::SourceRemoved, this);
52+
sigs.emplace_back(handler, "rename", OBSBasicFilters::SourceRenamed, this);
53+
5454
main = reinterpret_cast<OBSBasic *>(parent);
5555

5656
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

frontend/dialogs/OBSBasicFilters.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,7 @@ class OBSBasicFilters : public QDialog {
3434
OBSSource source;
3535
OBSPropertiesView *view = nullptr;
3636

37-
OBSSignal addSignal;
38-
OBSSignal removeSignal;
39-
OBSSignal reorderSignal;
40-
41-
OBSSignal removeSourceSignal;
42-
OBSSignal renameSourceSignal;
37+
std::vector<OBSSignal> sigs;
4338
OBSSignal updatePropertiesSignal;
4439

4540
inline OBSSource GetFilter(int row, bool async);

0 commit comments

Comments
 (0)