jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Hide encoder if marked internal

Browse Source 
(This commit also modifies libobs)

Hides encoders that are marked as internal.  Same general functionality
as DEPRECATED but not actually deprecated, just internal-only.
This commit is contained in:
jp9000 2020-02-18 21:34:39 -08:00
parent cce734a0aa
commit 4f6b4df17e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
UI/window-basic-settings.cpp
View File

@ -50,6 +50,9 @@
#include <util/platform.h>
#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),

1
libobs/obs-encoder.h
View File

@ -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 {