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

UI: Hide network features if a non-RTMP service is set

Browse source 
Reimplementation of bc80d0c and f2e6122, because they have to be
reverted by 0b9a8aa.
This commit is contained in:
tytan652 2022-07-19 07:44:12 +02:00 • committed by Jim
commit fc7af80f84
5 changed files with 57 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,6 +96,11 @@ void OBSBasicSettings::InitStreamPage()
SLOT(UpdateResFPSLimits()));
connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
SLOT(UpdateMoreInfoLink()));
connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
SLOT(UpdateAdvNetworkGroup()));
connect(ui->customServer, SIGNAL(textChanged(const QString &)), this,
SLOT(UpdateAdvNetworkGroup()));
}
void OBSBasicSettings::LoadStream1Settings()
@ -1155,3 +1160,20 @@ void OBSBasicSettings::UpdateResFPSLimits()
lastIgnoreRecommended = (int)ignoreRecommended;
lastServiceIdx = idx;
}
bool OBSBasicSettings::IsServiceOutputHasNetworkFeatures()
{
if (IsCustomService())
return ui->customServer->text().startsWith("rtmp");
OBSServiceAutoRelease service = SpawnTempService();
const char *output = obs_service_get_output_type(service);
if (!output)
return true;
if (strcmp(output, "rtmp_output") == 0)
return true;
return false;
}