Bladeren bron

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.
jp9000 5 jaren geleden
bovenliggende
commit
4f6b4df17e
2 gewijzigde bestanden met toevoegingen van 7 en 3 verwijderingen
  1. 6 3
      UI/window-basic-settings.cpp
  2. 1 0
      libobs/obs-encoder.h

+ 6 - 3
UI/window-basic-settings.cpp

@@ -50,6 +50,9 @@
 #include <util/platform.h>
 #include <util/platform.h>
 #include "ui-config.h"
 #include "ui-config.h"
 
 
+#define ENCODER_HIDE_FLAGS \
+	(OBS_ENCODER_CAP_DEPRECATED | OBS_ENCODER_CAP_INTERNAL)
+
 using namespace std;
 using namespace std;
 
 
 // Used for QVariant in codec comboboxes
 // Used for QVariant in codec comboboxes
@@ -886,7 +889,7 @@ void OBSBasicSettings::LoadEncoderTypes()
 				break;
 				break;
 			}
 			}
 		}
 		}
-		if ((caps & OBS_ENCODER_CAP_DEPRECATED) != 0)
+		if ((caps & ENCODER_HIDE_FLAGS) != 0)
 			continue;
 			continue;
 
 
 		QString qName = QT_UTF8(name);
 		QString qName = QT_UTF8(name);
@@ -1728,7 +1731,7 @@ void OBSBasicSettings::LoadAdvOutputStreamingEncoderProperties()
 
 
 	if (!SetComboByValue(ui->advOutEncoder, type)) {
 	if (!SetComboByValue(ui->advOutEncoder, type)) {
 		uint32_t caps = obs_get_encoder_caps(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);
 			const char *name = obs_encoder_get_display_name(type);
 
 
 			ui->advOutEncoder->insertItem(0, QT_UTF8(name),
 			ui->advOutEncoder->insertItem(0, QT_UTF8(name),
@@ -1821,7 +1824,7 @@ void OBSBasicSettings::LoadAdvOutputRecordingEncoderProperties()
 
 
 	if (!SetComboByValue(ui->advOutRecEncoder, type)) {
 	if (!SetComboByValue(ui->advOutRecEncoder, type)) {
 		uint32_t caps = obs_get_encoder_caps(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);
 			const char *name = obs_encoder_get_display_name(type);
 
 
 			ui->advOutRecEncoder->insertItem(1, QT_UTF8(name),
 			ui->advOutRecEncoder->insertItem(1, QT_UTF8(name),

+ 1 - 0
libobs/obs-encoder.h

@@ -32,6 +32,7 @@ extern "C" {
 #define OBS_ENCODER_CAP_DEPRECATED (1 << 0)
 #define OBS_ENCODER_CAP_DEPRECATED (1 << 0)
 #define OBS_ENCODER_CAP_PASS_TEXTURE (1 << 1)
 #define OBS_ENCODER_CAP_PASS_TEXTURE (1 << 1)
 #define OBS_ENCODER_CAP_DYN_BITRATE (1 << 2)
 #define OBS_ENCODER_CAP_DYN_BITRATE (1 << 2)
+#define OBS_ENCODER_CAP_INTERNAL (1 << 3)
 
 
 /** Specifies the encoder type */
 /** Specifies the encoder type */
 enum obs_encoder_type {
 enum obs_encoder_type {