UI: Add Start Streaming settings check on start
When we use the server error to respond to user's failing to start a stream it is slow to return an error and unclear to the user what went wrong. This diff introduces a simple settings check before attempting to stream and catch and explain specific URL/key issues to the user. In the case of preset services we check there is a Stream Key before attempting to start a stream. In the case of "custom" we only verify there is a URL since for some services that's all that is required or the user may use user/password authentication.
This commit is contained in:
parent
c4396e03a7
commit
b78cdc910b
4 changed files with 101 additions and 4 deletions
|
|
@ -6,6 +6,7 @@
|
|||
#include <QPushButton>
|
||||
|
||||
#include <obs-app.hpp>
|
||||
#include <obs-service.h>
|
||||
|
||||
static int CountVideoSources()
|
||||
{
|
||||
|
|
@ -54,3 +55,65 @@ bool UIValidation::NoSourcesConfirmation(QWidget *parent)
|
|||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
StreamSettingsAction
|
||||
UIValidation::StreamSettingsConfirmation(QWidget *parent, OBSService service)
|
||||
{
|
||||
// Custom services can user API key in URL or user/pass combo.
|
||||
// So only check there is a URL
|
||||
char const *serviceType = obs_service_get_type(service);
|
||||
bool isCustomUrlService = (strcmp(serviceType, "rtmp_custom") == 0);
|
||||
|
||||
char const *streamUrl = obs_service_get_url(service);
|
||||
char const *streamKey = obs_service_get_key(service);
|
||||
|
||||
bool hasStreamUrl = (streamUrl != NULL && streamUrl[0] != '\0');
|
||||
bool hasStreamKey = ((streamKey != NULL && streamKey[0] != '\0') ||
|
||||
isCustomUrlService);
|
||||
|
||||
if (hasStreamUrl && hasStreamKey)
|
||||
return StreamSettingsAction::ContinueStream;
|
||||
|
||||
QString msg;
|
||||
|
||||
if (!hasStreamUrl && !hasStreamKey) {
|
||||
msg = QTStr("Basic.Settings.Stream.MissingUrlAndApiKey");
|
||||
} else if (!hasStreamKey) {
|
||||
msg = QTStr("Basic.Settings.Stream.MissingStreamKey");
|
||||
} else {
|
||||
msg = QTStr("Basic.Settings.Stream.MissingUrl");
|
||||
}
|
||||
|
||||
QMessageBox messageBox(parent);
|
||||
messageBox.setWindowTitle(
|
||||
QTStr("Basic.Settings.Stream.MissingSettingAlert"));
|
||||
messageBox.setText(msg);
|
||||
|
||||
QPushButton *cancel;
|
||||
QPushButton *settings;
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define ACCEPT_BUTTON QMessageBox::AcceptRole
|
||||
#define REJECT_BUTTON QMessageBox::ResetRole
|
||||
#else
|
||||
#define ACCEPT_BUTTON QMessageBox::NoRole
|
||||
#define REJECT_BUTTON QMessageBox::NoRole
|
||||
#endif
|
||||
settings = messageBox.addButton(
|
||||
QTStr("Basic.Settings.Stream.StreamSettingsWarning"),
|
||||
ACCEPT_BUTTON);
|
||||
cancel = messageBox.addButton(QTStr("Cancel"), REJECT_BUTTON);
|
||||
|
||||
messageBox.setDefaultButton(settings);
|
||||
messageBox.setEscapeButton(cancel);
|
||||
|
||||
messageBox.setIcon(QMessageBox::Warning);
|
||||
messageBox.exec();
|
||||
|
||||
if (messageBox.clickedButton() == settings)
|
||||
return StreamSettingsAction::OpenSettings;
|
||||
if (messageBox.clickedButton() == cancel)
|
||||
return StreamSettingsAction::Cancel;
|
||||
|
||||
return StreamSettingsAction::ContinueStream;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue