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

Merge pull request #3877 from derrod/purge-services 

UI/rtmp-services: Remove Smashcast
master
Rodney 2020-12-21 09:46:53 +01:00 committed by GitHub
parent 8285141ba5 a605770a2b
commit 60fed63d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,8 +373,6 @@ bool AutoConfigStreamPage::validatePage()
if (!wiz->customServer) {
if (wiz->serviceName == "Twitch")
wiz->service = AutoConfig::Service::Twitch;
else if (wiz->serviceName == "Smashcast")
wiz->service = AutoConfig::Service::Smashcast;
else
wiz->service = AutoConfig::Service::Other;
} else {
@ -504,7 +502,7 @@ void AutoConfigStreamPage::ServiceChanged()
return;
std::string service = QT_TO_UTF8(ui->service->currentText());
bool regionBased = service == "Twitch" || service == "Smashcast";
bool regionBased = service == "Twitch";
bool testBandwidth = ui->doBandwidthTest->isChecked();
bool custom = IsCustomService();
@ -928,21 +926,6 @@ bool AutoConfig::CanTestServer(const char *server)
} else if (regionOther) {
return true;
}
} else if (service == Service::Smashcast) {
if (strcmp(server, "Default") == 0) {
return true;
} else if (astrcmp_n(server, "US-West:", 8) == 0 ||
astrcmp_n(server, "US-East:", 8) == 0) {
return regionUS;
} else if (astrcmp_n(server, "EU-", 3) == 0) {
return regionEU;
} else if (astrcmp_n(server, "South Korea:", 12) == 0 ||
astrcmp_n(server, "Asia:", 5) == 0 ||
astrcmp_n(server, "China:", 6) == 0) {
return regionAsia;
} else if (regionOther) {
return true;
}
} else {
return true;
}

1
UI/window-basic-auto-config.hpp
View File

@ -38,7 +38,6 @@ class AutoConfig : public QWizard {
enum class Service {
Twitch,
Smashcast,
Other,
};

4
plugins/rtmp-services/data/package.json
View File

@ -1,10 +1,10 @@
{
"url": "https://obsproject.com/obs2_update/rtmp-services",
"version": 161,
"version": 162,
"files": [
{
"name": "services.json",
"version": 161
"version": 162
}
]
}

55
plugins/rtmp-services/data/services.json
View File

@ -278,61 +278,6 @@
"x264opts": "scenecut=0"
}
},
{
"name": "Smashcast",
"servers": [
{
"name": "Default",
"url": "rtmp://live.hitbox.tv/push"
},
{
"name": "EU-North: Amsterdam, Netherlands",
"url": "rtmp://live.ams.hitbox.tv/push"
},
{
"name": "EU-West: Paris, France",
"url": "rtmp://live.cdg.hitbox.tv/push"
},
{
"name": "EU-South: Milan, Italia",
"url": "rtmp://live.mxp.hitbox.tv/push"
},
{
"name": "Russia: Moscow",
"url": "rtmp://live.dme.hitbox.tv/push"
},
{
"name": "US-East: New York",
"url": "rtmp://live.jfk.hitbox.tv/push"
},
{
"name": "US-West: San Francisco",
"url": "rtmp://live.sfo.hitbox.tv/push"
},
{
"name": "US-West: Los Angeles",
"url": "rtmp://live.lax.hitbox.tv/push"
},
{
"name": "South America: Sao Paulo, Brazil",
"url": "rtmp://live.gru.hitbox.tv/push"
},
{
"name": "Asia: Singapore",
"url": "rtmp://live.sin.hitbox.tv/push"
},
{
"name": "Oceania: Sydney, Australia",
"url": "rtmp://live.syd.hitbox.tv/push"
}
],
"recommended": {
"keyint": 2,
"profile": "high",
"max video bitrate": 3500,
"max audio bitrate": 320
}
},
{
"name": "Mobcrush",
"servers": [