mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-16 04:28:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5411 from derrod/yt-fixes

Browse Source 
More YouTube fixes
This commit is contained in:
Jim
2021-10-24 00:47:51 -07:00
committed by GitHub
parent c7f095ebd7 9d8a011b78
commit 5a9d4d1b26
4 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
UI/window-basic-main.cpp
View File

@@ -6296,14 +6296,19 @@ void OBSBasic::StartStreaming()
ui->broadcastButton->style()->polish(ui->broadcastButton);
// well, we need to disable button while stream is not active
ui->broadcastButton->setEnabled(false);
} else if (!autoStopBroadcast) {
broadcastActive = true;
ui->broadcastButton->setText(QTStr("Basic.Main.StopBroadcast"));
} else {
if (!autoStopBroadcast) {
ui->broadcastButton->setText(
QTStr("Basic.Main.StopBroadcast"));
} else {
ui->broadcastButton->setText(
QTStr("Basic.Main.AutoStopEnabled"));
ui->broadcastButton->setEnabled(false);
}
ui->broadcastButton->setProperty("broadcastState", "active");
ui->broadcastButton->style()->unpolish(ui->broadcastButton);
ui->broadcastButton->style()->polish(ui->broadcastButton);
} else {
ui->broadcastButton->setEnabled(false);
broadcastActive = true;
}
bool recordWhenStreaming = config_get_bool(
@@ -6337,7 +6342,24 @@ void OBSBasic::BroadcastButtonClicked()
std::shared_ptr<YoutubeApiWrappers> ytAuth =
dynamic_pointer_cast<YoutubeApiWrappers>(auth);
if (ytAuth.get()) {
ytAuth->StartLatestBroadcast();
if (!ytAuth->StartLatestBroadcast()) {
auto last_error = ytAuth->GetLastError();
if (last_error.isEmpty())
last_error = QTStr(
"YouTube.Actions.Error.YouTubeApi");
if (!ytAuth->GetTranslatedError(last_error))
last_error =
QTStr("YouTube.Actions.Error.BroadcastTransitionFailed")
.arg(last_error,
ytAuth->GetBroadcastId());
OBSMessageBox::warning(
this,
QTStr("Output.BroadcastStartFailed"),
last_error, true);
ui->broadcastButton->setChecked(false);
return;
}
}
#endif
broadcastActive = true;
@@ -6375,7 +6397,22 @@ void OBSBasic::BroadcastButtonClicked()
std::shared_ptr<YoutubeApiWrappers> ytAuth =
dynamic_pointer_cast<YoutubeApiWrappers>(auth);
if (ytAuth.get()) {
ytAuth->StopLatestBroadcast();
if (!ytAuth->StopLatestBroadcast()) {
auto last_error = ytAuth->GetLastError();
if (last_error.isEmpty())
last_error = QTStr(
"YouTube.Actions.Error.YouTubeApi");
if (!ytAuth->GetTranslatedError(last_error))
last_error =
QTStr("YouTube.Actions.Error.BroadcastTransitionFailed")
.arg(last_error,
ytAuth->GetBroadcastId());
OBSMessageBox::warning(
this,
QTStr("Output.BroadcastStopFailed"),
last_error, true);
}
}
#endif
broadcastActive = false;