From 4f6b4df17e22ec12498f41addbd482ca1c8747ae Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 18 Feb 2020 21:34:39 -0800 Subject: [PATCH] UI: Hide encoder if marked internal (This commit also modifies libobs) Hides encoders that are marked as internal. Same general functionality as DEPRECATED but not actually deprecated, just internal-only. --- UI/window-basic-settings.cpp | 9 ++++++--- libobs/obs-encoder.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index d001d1c91..e742a9223 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -50,6 +50,9 @@ #include #include "ui-config.h" +#define ENCODER_HIDE_FLAGS \ + (OBS_ENCODER_CAP_DEPRECATED | OBS_ENCODER_CAP_INTERNAL) + using namespace std; // Used for QVariant in codec comboboxes @@ -886,7 +889,7 @@ void OBSBasicSettings::LoadEncoderTypes() break; } } - if ((caps & OBS_ENCODER_CAP_DEPRECATED) != 0) + if ((caps & ENCODER_HIDE_FLAGS) != 0) continue; QString qName = QT_UTF8(name); @@ -1728,7 +1731,7 @@ void OBSBasicSettings::LoadAdvOutputStreamingEncoderProperties() if (!SetComboByValue(ui->advOutEncoder, type)) { uint32_t caps = obs_get_encoder_caps(type); - if ((caps & OBS_ENCODER_CAP_DEPRECATED) != 0) { + if ((caps & ENCODER_HIDE_FLAGS) != 0) { const char *name = obs_encoder_get_display_name(type); ui->advOutEncoder->insertItem(0, QT_UTF8(name), @@ -1821,7 +1824,7 @@ void OBSBasicSettings::LoadAdvOutputRecordingEncoderProperties() if (!SetComboByValue(ui->advOutRecEncoder, type)) { uint32_t caps = obs_get_encoder_caps(type); - if ((caps & OBS_ENCODER_CAP_DEPRECATED) != 0) { + if ((caps & ENCODER_HIDE_FLAGS) != 0) { const char *name = obs_encoder_get_display_name(type); ui->advOutRecEncoder->insertItem(1, QT_UTF8(name), diff --git a/libobs/obs-encoder.h b/libobs/obs-encoder.h index 1c7daa6c6..f5eeb13ef 100644 --- a/libobs/obs-encoder.h +++ b/libobs/obs-encoder.h @@ -32,6 +32,7 @@ extern "C" { #define OBS_ENCODER_CAP_DEPRECATED (1 << 0) #define OBS_ENCODER_CAP_PASS_TEXTURE (1 << 1) #define OBS_ENCODER_CAP_DYN_BITRATE (1 << 2) +#define OBS_ENCODER_CAP_INTERNAL (1 << 3) /** Specifies the encoder type */ enum obs_encoder_type {