From 694a6da7b88a372cfe809c761cd93890bf93cfaf Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 2 Mar 2016 12:31:16 -0800 Subject: [PATCH] UI: Don't draw audio/transition sources in properties --- obs/window-basic-filters.cpp | 9 ++++++++- obs/window-basic-properties.cpp | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/obs/window-basic-filters.cpp b/obs/window-basic-filters.cpp index d58f968af..e9eabd45e 100644 --- a/obs/window-basic-filters.cpp +++ b/obs/window-basic-filters.cpp @@ -109,7 +109,14 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_) OBSBasicFilters::DrawPreview, this); }; - connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDrawCallback); + enum obs_source_type type = obs_source_get_type(source); + uint32_t caps = obs_source_get_output_flags(source); + bool drawable_type = type == OBS_SOURCE_TYPE_INPUT || + type == OBS_SOURCE_TYPE_SCENE; + + if (drawable_type && (caps & OBS_SOURCE_VIDEO) != 0) + connect(ui->preview, &OBSQTDisplay::DisplayCreated, + addDrawCallback); } OBSBasicFilters::~OBSBasicFilters() diff --git a/obs/window-basic-properties.cpp b/obs/window-basic-properties.cpp index 456bf1af0..4594b0006 100644 --- a/obs/window-basic-properties.cpp +++ b/obs/window-basic-properties.cpp @@ -103,7 +103,14 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_) OBSBasicProperties::DrawPreview, this); }; - connect(preview.data(), &OBSQTDisplay::DisplayCreated, addDrawCallback); + enum obs_source_type type = obs_source_get_type(source); + uint32_t caps = obs_source_get_output_flags(source); + bool drawable_type = type == OBS_SOURCE_TYPE_INPUT || + type == OBS_SOURCE_TYPE_SCENE; + + if (drawable_type && (caps & OBS_SOURCE_VIDEO) != 0) + connect(preview.data(), &OBSQTDisplay::DisplayCreated, + addDrawCallback); } OBSBasicProperties::~OBSBasicProperties() -- GitLab