mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-07-18 03:04:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Test first 3 closest Twitch ingests in auto-config

Browse Source 
If auto is available, test the first 3 closest Twitch ingests rather
than using a region-based selection.
This commit is contained in:
jp9000
2017-08-02 14:33:12 -07:00
parent c0b8bdf89e
commit 8a5cf99aa7
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,6 +370,10 @@ void AutoConfigStreamPage::ServiceChanged()
bool testBandwidth = ui->doBandwidthTest->isChecked();
bool custom = ui->streamType->currentIndex() == 1;
/* Test three closest servers if "Auto" is available for Twitch */
if (service == "Twitch" && wiz->twitchAuto)
regionBased = false;
ui->service->setVisible(!custom);
ui->serviceLabel->setVisible(!custom);
@@ -565,6 +569,23 @@ AutoConfig::AutoConfig(QWidget *parent)
baseResolutionCX = ovi.base_width;
baseResolutionCY = ovi.base_height;
/* ----------------------------------------- */
/* check to see if Twitch's "auto" available */
OBSData twitchSettings = obs_data_create();
obs_data_release(twitchSettings);
obs_data_set_string(twitchSettings, "service", "Twitch");
obs_properties_t *props = obs_get_service_properties("rtmp_common");
obs_properties_apply_settings(props, twitchSettings);
obs_property_t *p = obs_properties_get(props, "server");
const char *first = obs_property_list_item_string(p, 0);
twitchAuto = strcmp(first, "auto") == 0;
obs_properties_destroy(props);
/* ----------------------------------------- */
/* load service/servers */