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

Merge pull request #3283 from JohannMG/fb-cdn-streamkey-btn

Browse Source 
UI: Show "Get Stream Key" to users of Facebook CDN
This commit is contained in:
Jim 2020-08-22 09:46:54 -07:00 committed by GitHub
commit fbb419f40d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UI/window-basic-auto-config.cpp
View File

@ -273,6 +273,10 @@ AutoConfigStreamPage::AutoConfigStreamPage(QWidget *parent)
SLOT(ServiceChanged()));
connect(ui->customServer, SIGNAL(textChanged(const QString &)), this,
SLOT(ServiceChanged()));
connect(ui->customServer, SIGNAL(textChanged(const QString &)), this,
SLOT(UpdateKeyLink()));
connect(ui->customServer, SIGNAL(editingFinished()), this,
SLOT(UpdateKeyLink()));
connect(ui->doBandwidthTest, SIGNAL(toggled(bool)), this,
SLOT(ServiceChanged()));
@ -573,12 +577,8 @@ void AutoConfigStreamPage::ServiceChanged()
void AutoConfigStreamPage::UpdateKeyLink()
{
if (IsCustomService()) {
ui->doBandwidthTest->setEnabled(true);
return;
}
QString serviceName = ui->service->currentText();
QString customServer = ui->customServer->text();
bool isYoutube = false;
QString streamKeyLink;
@ -591,7 +591,8 @@ void AutoConfigStreamPage::UpdateKeyLink()
} else if (serviceName.startsWith("Restream.io")) {
streamKeyLink =
"https://restream.io/settings/streaming-setup?from=OBS";
} else if (serviceName == "Facebook Live") {
} else if (serviceName == "Facebook Live" ||
(customServer.contains("fbcdn.net") && IsCustomService())) {
streamKeyLink =
"https://www.facebook.com/live/producer?ref=OBS";
} else if (serviceName.startsWith("Twitter")) {

13
UI/window-basic-settings-stream.cpp
View File

@ -71,6 +71,10 @@ void OBSBasicSettings::InitStreamPage()
SLOT(UpdateServerList()));
connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
SLOT(UpdateKeyLink()));
connect(ui->customServer, SIGNAL(textChanged(const QString &)), this,
SLOT(UpdateKeyLink()));
connect(ui->customServer, SIGNAL(editingFinished(const QString &)),
this, SLOT(UpdateKeyLink()));
}
void OBSBasicSettings::LoadStream1Settings()
@ -208,12 +212,8 @@ void OBSBasicSettings::SaveStream1Settings()
void OBSBasicSettings::UpdateKeyLink()
{
if (IsCustomService()) {
ui->getStreamKeyButton->hide();
return;
}
QString serviceName = ui->service->currentText();
QString customServer = ui->customServer->text();
QString streamKeyLink;
if (serviceName == "Twitch") {
streamKeyLink =
@ -223,7 +223,8 @@ void OBSBasicSettings::UpdateKeyLink()
} else if (serviceName.startsWith("Restream.io")) {
streamKeyLink =
"https://restream.io/settings/streaming-setup?from=OBS";
} else if (serviceName == "Facebook Live") {
} else if (serviceName == "Facebook Live" ||
(customServer.contains("fbcdn.net") && IsCustomService())) {
streamKeyLink =
"https://www.facebook.com/live/producer?ref=OBS";
} else if (serviceName.startsWith("Twitter")) {