4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Add setting for Twitch chat add-ons choice

Browse source 
Both BTTV and FFZ are fairly popular however they do occasionally
interfere.  To give users the option to chose whichever one they like
most we add a new setting that allows BTTV, FFZ, both, or neither.

Defaults to "None" for new users.  Existing users will be migrated to
"Both" as that's the previous behavior.
This commit is contained in:
derrod 2019-10-10 03:29:09 +02:00 • committed by jp9000
commit 3e841b221d
8 changed files with 128 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

38
UI/window-basic-settings-stream.cpp
View file

@ -39,6 +39,8 @@ void OBSBasicSettings::InitStreamPage()
ui->connectAccount2->setVisible(false);
ui->disconnectAccount->setVisible(false);
ui->bandwidthTestEnable->setVisible(false);
ui->twitchAddonDropdown->setVisible(false);
ui->twitchAddonLabel->setVisible(false);
int vertSpacing = ui->topStreamLayout->verticalSpacing();
@ -56,6 +58,15 @@ void OBSBasicSettings::InitStreamPage()
LoadServices(false);
ui->twitchAddonDropdown->addItem(
QTStr("Basic.Settings.Stream.TTVAddon.None"));
ui->twitchAddonDropdown->addItem(
QTStr("Basic.Settings.Stream.TTVAddon.BTTV"));
ui->twitchAddonDropdown->addItem(
QTStr("Basic.Settings.Stream.TTVAddon.FFZ"));
ui->twitchAddonDropdown->addItem(
QTStr("Basic.Settings.Stream.TTVAddon.Both"));
connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
SLOT(UpdateServerList()));
connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
@ -98,6 +109,9 @@ void OBSBasicSettings::LoadStream1Settings()
bool bw_test = obs_data_get_bool(settings, "bwtest");
ui->bandwidthTestEnable->setChecked(bw_test);
idx = config_get_int(main->Config(), "Twitch", "AddonChoice");
ui->twitchAddonDropdown->setCurrentIndex(idx);
}
UpdateServerList();
@ -161,6 +175,21 @@ void OBSBasicSettings::SaveStream1Settings()
obs_data_set_bool(settings, "bwtest",
ui->bandwidthTestEnable->isChecked());
if (!!auth && strcmp(auth->service(), "Twitch") == 0) {
bool choiceExists = config_has_user_value(
main->Config(), "Twitch", "AddonChoice");
int currentChoice =
config_get_int(main->Config(), "Twitch", "AddonChoice");
int newChoice = ui->twitchAddonDropdown->currentIndex();
config_set_int(main->Config(), "Twitch", "AddonChoice",
newChoice);
if (choiceExists && currentChoice != newChoice)
forceAuthReload = true;
}
obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));
OBSService newService = obs_service_create(
@ -277,6 +306,8 @@ void OBSBasicSettings::on_service_currentIndexChanged(int)
ui->disconnectAccount->setVisible(false);
ui->bandwidthTestEnable->setVisible(false);
ui->twitchAddonDropdown->setVisible(false);
ui->twitchAddonLabel->setVisible(false);
#ifdef BROWSER_AVAILABLE
if (cef) {
@ -430,8 +461,11 @@ void OBSBasicSettings::OnOAuthStreamKeyConnected()
ui->connectAccount2->setVisible(false);
ui->disconnectAccount->setVisible(true);
if (strcmp(a->service(), "Twitch") == 0)
if (strcmp(a->service(), "Twitch") == 0) {
ui->bandwidthTestEnable->setVisible(true);
ui->twitchAddonLabel->setVisible(true);
ui->twitchAddonDropdown->setVisible(true);
}
}
ui->streamStackWidget->setCurrentIndex((int)Section::StreamKey);
@ -494,6 +528,8 @@ void OBSBasicSettings::on_disconnectAccount_clicked()
ui->connectAccount2->setVisible(true);
ui->disconnectAccount->setVisible(false);
ui->bandwidthTestEnable->setVisible(false);
ui->twitchAddonDropdown->setVisible(false);
ui->twitchAddonLabel->setVisible(false);
ui->key->setText("");
}