UI: Pre-stream wizard show & hide button correctly

Show pre-stream wizard only when in simple mode since it only operates on simple mode for now. Later, will look into expanding capability. Additionally, fix a bug where was making a copy of a QPair instead of creating a reference so settings were not being written.
obsproject · Oct 8, 2020 · 5414d37 · 5414d37
1 parent b191c7c
commit 5414d37
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 40 deletions.
diff --git a/UI/common-settings.cpp b/UI/common-settings.cpp
@@ -2,7 +2,7 @@
 
 #include "audio-encoders.hpp"
 
-static bool IsAdvancedMode(config_t *config)
+bool CommonSettings::IsAdvancedMode(config_t *config)
 {
 	const char *outputMode = config_get_string(config, "Output", "Mode");
 	return (strcmp(outputMode, "Advanced") == 0);

diff --git a/UI/common-settings.hpp b/UI/common-settings.hpp
@@ -10,6 +10,7 @@
 class CommonSettings {
 
 public:
+	static bool IsAdvancedMode(config_t *config);
 	/* Shared Utility Functions --------------------------*/
 	static OBSData GetDataFromJsonFile(const char *jsonFile);
 

diff --git a/UI/pre-stream-wizard/page-select-settings.cpp b/UI/pre-stream-wizard/page-select-settings.cpp
@@ -3,7 +3,6 @@
 #include <QSpacerItem>
 #include <QPushButton>
 #include <QDesktopServices>
-#include <QDebug>
 #include <QVariant>
 #include <QPair>
 
@@ -167,8 +166,7 @@ void SelectionPage::setSettingsMap(QSharedPointer<SettingsMap> settingsMap)
 		QVariant data =
 			mapInfo->value(SettingsResponseKeys.streamBufferSize)
 				.first;
-		QString bufferSizeString =
-			QString::number(data.toInt()) + " Kb";
+		QString bufferSizeString = QString::number(data.toInt()) + "Kb";
 		addRow(QTStr("Basic.Settings.Output.Mode.StreamBuffer"),
 		       bufferSizeString, SettingsResponseKeys.streamBufferSize);
 	}
@@ -192,12 +190,11 @@ void SelectionPage::checkboxRowChanged(const char *propertyKey, bool selected)
 	}
 
 	SettingsMap *mapInfo = settingsMap_.data();
-
 	if (mapInfo == nullptr || !mapInfo->contains(propertyKey)) {
 		return;
 	}
 
-	QPair dataPair = mapInfo->value(propertyKey);
+	QPair<QVariant, bool> &dataPair = (*mapInfo)[propertyKey];
 	dataPair.second = selected;
 }
 

diff --git a/UI/streaming-settings-util.cpp b/UI/streaming-settings-util.cpp
@@ -5,34 +5,6 @@
 
 #include <QPair>
 
-/*
-  We are detecting the stream settings so if they're using a large canvas but
-  already have the rescaler on, they will be streaming correctly. 
-*/
-void UpdateStreamingResolution(int *resolutionXY, bool isRescaled,
-			       config_t *config)
-{
-
-	// If scaled, that's the stream resolution sent to servers
-	if (isRescaled) {
-		// Only use if there is a resolution in text
-		const char *rescaleRes =
-			config_get_string(config, "AdvOut", "RescaleRes");
-		if (rescaleRes && *rescaleRes) {
-			int count = sscanf(rescaleRes, "%ux%u",
-					   &resolutionXY[0], &resolutionXY[1]);
-			// If text was valid, exit
-			if (count == 2) {
-				return;
-			}
-		}
-	}
-
-	// Resolution is not rescaled, use "output resolution" from video tab
-	resolutionXY[0] = (int)config_get_uint(config, "Video", "OutputCX");
-	resolutionXY[1] = (int)config_get_uint(config, "Video", "OutputCY");
-};
-
 QSharedPointer<StreamWizard::EncoderSettingsRequest>
 StreamingSettingsUtility::makeEncoderSettingsFromCurrentState(config_t *config)
 {
@@ -45,11 +17,10 @@ StreamingSettingsUtility::makeEncoderSettingsFromCurrentState(config_t *config)
 	// only live and rmpts is supported for now
 	currentSettings->protocol = StreamWizard::StreamProtocol::rtmps;
 	/* Video */
-	bool isRescaled = config_get_bool(config, "AdvOut", "Rescale");
-	int resolutionXY[2] = {0, 0};
-	UpdateStreamingResolution(resolutionXY, isRescaled, config);
-	currentSettings->videoWidth = resolutionXY[0];
-	currentSettings->videoHeight = resolutionXY[1];
+	currentSettings->videoWidth =
+		(int)config_get_uint(config, "Video", "OutputCX");
+	currentSettings->videoHeight =
+		(int)config_get_uint(config, "Video", "OutputCY");
 	currentSettings->framerate = CommonSettings::GetConfigFPSDouble(config);
 
 	currentSettings->videoBitrate =

diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
@@ -249,6 +249,8 @@ void OBSBasicSettings::UpdateKeyLink()
 		ui->getStreamKeyButton->setTargetUrl(QUrl(streamKeyLink));
 		ui->getStreamKeyButton->show();
 	}
+
+	hasStreamWizard &= ui->outputMode->currentText().contains("Simple");
 	ui->settingWizardBtn->setHidden(!hasStreamWizard);
 }
 
@@ -267,6 +269,9 @@ void OBSBasicSettings::preStreamWizardLaunch()
 		return;
 	}
 
+	// Save any changes so far since we'll refrence them from config files
+	SaveSettings();
+
 	QSharedPointer<StreamWizard::EncoderSettingsRequest> currentSettings =
 		StreamingSettingsUtility::makeEncoderSettingsFromCurrentState(
 			main->Config());
@@ -287,10 +292,11 @@ void OBSBasicSettings::preStreamWizardApplySettings(
 {
 	blog(LOG_INFO, "OBSBasicSettings::preStreamWizardApplySettings");
 
-	// Apply and reload
+	// Apply
 	StreamingSettingsUtility::applyWizardSettings(newSettings,
 						      main->Config());
 
+	// Reload
 	LoadSettings(false);
 }
 

diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
@@ -660,6 +660,8 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
 		SLOT(UpdateStreamDelayEstimate()));
 	connect(ui->outputMode, SIGNAL(currentIndexChanged(int)), this,
 		SLOT(UpdateStreamDelayEstimate()));
+	connect(ui->outputMode, SIGNAL(currentIndexChanged(int)), this,
+		SLOT(UpdateKeyLink()));
 	connect(ui->simpleOutputVBitrate, SIGNAL(valueChanged(int)), this,
 		SLOT(UpdateStreamDelayEstimate()));
 	connect(ui->simpleOutputABitrate, SIGNAL(currentIndexChanged(int)),