Skip to content
This repository was archived by the owner on Jun 29, 2026. It is now read-only.

frontend: Auto-discovery of registered services #1

Merged
emilsas merged 2 commits into from
Jan 14, 2026
Merged

frontend: Auto-discovery of registered services #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
005c583
frontend: Auto-discovery of registered services
emilsas Dec 11, 2025
70b50de
frontend: Remove ListOpt and refactor duplicated code OBSBasicSettings
emilsas Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions frontend/settings/OBSBasicSettings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,39 @@ struct OBSTheme;

std::string DeserializeConfigText(const char *value);

// Structured data for service dropdown items
struct ServiceItemData {
enum class Type {
Custom, // rtmp_custom service
ShowAll, // "Show All" option in dropdown
RtmpCommon, // Standard rtmp_common service (Twitch, YouTube, etc.)
CustomServiceType // Custom service types (WHIP, MoQ, etc.)
};

Type type;
QString serviceId; // Service ID: for RtmpCommon this is the service name,
// for CustomServiceType this is the service type ID (e.g., "whip_custom")
QString displayName; // Human-readable display name

ServiceItemData() : type(Type::Custom) {}

ServiceItemData(Type t, const QString &id = QString(), const QString &name = QString())
: type(t),
serviceId(id),
displayName(name)
{
}

// Helper methods for easy type checking
bool isCustom() const { return type == Type::Custom; }
bool isShowAll() const { return type == Type::ShowAll; }
bool isRtmpCommon() const { return type == Type::RtmpCommon; }
bool isCustomServiceType() const { return type == Type::CustomServiceType; }
};

// Register with Qt's meta-type system so it can be stored in QVariant
Q_DECLARE_METATYPE(ServiceItemData)

class OBSBasicSettings : public QDialog {
Q_OBJECT
Q_PROPERTY(QIcon generalIcon READ GetGeneralIcon WRITE SetGeneralIcon DESIGNABLE true)
Expand Down Expand Up @@ -204,7 +237,10 @@ class OBSBasicSettings : public QDialog {
/* stream */
void InitStreamPage();
bool IsCustomService() const;
bool IsCustomServiceType() const;
QString GetCustomServiceTypeId() const;
inline bool IsWHIP() const;
int FindService(const std::function<bool(const ServiceItemData &)> &predicate);
void LoadServices(bool showAll);
void OnOAuthStreamKeyConnected();
void OnAuthConnected();
Expand Down
157 changes: 121 additions & 36 deletions frontend/settings/OBSBasicSettings_Stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,51 @@ extern QCef *cef;
extern QCefCookieManager *panel_cookies;
extern bool cef_js_avail;

enum class ListOpt : int {
ShowAll = 1,
Custom,
WHIP,
};

enum class Section : int {
Connect,
StreamKey,
};

bool OBSBasicSettings::IsCustomService() const
{
return ui->service->currentData().toInt() == (int)ListOpt::Custom;
QVariant data = ui->service->currentData();
ServiceItemData serviceData = data.value<ServiceItemData>();
return serviceData.isCustom();
}

bool OBSBasicSettings::IsCustomServiceType() const
{
QVariant data = ui->service->currentData();
ServiceItemData serviceData = data.value<ServiceItemData>();
return serviceData.isCustomServiceType();
}

QString OBSBasicSettings::GetCustomServiceTypeId() const
{
QVariant data = ui->service->currentData();
ServiceItemData serviceData = data.value<ServiceItemData>();
if (serviceData.isCustomServiceType())
return serviceData.serviceId;
return QString();
}

inline bool OBSBasicSettings::IsWHIP() const
{
return ui->service->currentData().toInt() == (int)ListOpt::WHIP;
return GetCustomServiceTypeId() == "whip_custom";
}

int OBSBasicSettings::FindService(const std::function<bool(const ServiceItemData &)> &predicate)
{
for (int i = 0; i < ui->service->count(); i++) {
QVariant data = ui->service->itemData(i);
if (data.canConvert<ServiceItemData>()) {
ServiceItemData serviceData = data.value<ServiceItemData>();
if (predicate(serviceData)) {
return i;
}
}
}
return -1;
}

void OBSBasicSettings::InitStreamPage()
Expand Down Expand Up @@ -113,12 +139,15 @@ void OBSBasicSettings::LoadStream1Settings()
protocol = QT_UTF8(obs_service_get_protocol(service_obj));
const char *bearer_token = obs_data_get_string(settings, "bearer_token");

if (is_rtmp_custom || is_whip)
if (!is_rtmp_common)
ui->customServer->setText(server);

if (is_rtmp_custom) {
ui->service->setCurrentIndex(0);
lastServiceIdx = 0;
auto idx = FindService([](const ServiceItemData &serviceData) { return serviceData.isCustom(); });
if (idx == -1)
idx = 0;
ui->service->setCurrentIndex(idx);
lastServiceIdx = idx;
lastCustomServer = ui->customServer->text();

bool use_auth = obs_data_get_bool(settings, "use_auth");
Expand All @@ -127,11 +156,16 @@ void OBSBasicSettings::LoadStream1Settings()
ui->authUsername->setText(QT_UTF8(username));
ui->authPw->setText(QT_UTF8(password));
ui->useAuth->setChecked(use_auth);
} else {
int idx = ui->service->findText(service);
} else if (is_rtmp_common) {
auto idx = FindService([&](const ServiceItemData &serviceData) {
return serviceData.isRtmpCommon() && serviceData.serviceId == service;
});

if (idx == -1) {
if (service && *service)
ui->service->insertItem(1, service);
if (service && *service) {
ServiceItemData newService(ServiceItemData::Type::RtmpCommon, service, service);
ui->service->insertItem(1, service, QVariant::fromValue(newService));
}
idx = 1;
}
ui->service->setCurrentIndex(idx);
Expand All @@ -142,6 +176,23 @@ void OBSBasicSettings::LoadStream1Settings()

idx = config_get_int(main->Config(), "Twitch", "AddonChoice");
ui->twitchAddonDropdown->setCurrentIndex(idx);
} else {
auto idx = FindService([&](const ServiceItemData &serviceData) {
return serviceData.isCustomServiceType() && serviceData.serviceId == type;
});

if (idx == -1) {
const char *display_name = obs_service_get_display_name(type);
if (!display_name)
display_name = type;
ServiceItemData newService(ServiceItemData::Type::CustomServiceType, QString(type),
QT_UTF8(display_name));
ui->service->insertItem(1, QT_UTF8(display_name), QVariant::fromValue(newService));
idx = 1;
}

ui->service->setCurrentIndex(idx);
lastServiceIdx = idx;
}

ui->enableMultitrackVideo->setChecked(config_get_bool(main->Config(), "Stream1", "EnableMultitrackVideo"));
Expand Down Expand Up @@ -255,21 +306,23 @@ void OBSBasicSettings::SwapMultiTrack(const char *protocol)
void OBSBasicSettings::SaveStream1Settings()
{
bool customServer = IsCustomService();
bool whip = IsWHIP();
QString customServiceTypeId = GetCustomServiceTypeId();
const char *service_id = "rtmp_common";
QByteArray serviceIdUtf8;

if (customServer) {
service_id = "rtmp_custom";
} else if (whip) {
service_id = "whip_custom";
} else if (!customServiceTypeId.isEmpty()) {
serviceIdUtf8 = customServiceTypeId.toUtf8();
service_id = serviceIdUtf8.constData();
}

obs_service_t *oldService = main->GetService();
OBSDataAutoRelease hotkeyData = obs_hotkeys_save_service(oldService);

OBSDataAutoRelease settings = obs_data_create();

if (!customServer && !whip) {
if (!customServer && customServiceTypeId.isEmpty()) {
obs_data_set_string(settings, "service", QT_TO_UTF8(ui->service->currentText()));
obs_data_set_string(settings, "protocol", QT_TO_UTF8(protocol));
if (ui->server->currentData() == CustomServerUUID()) {
Expand Down Expand Up @@ -303,8 +356,7 @@ void OBSBasicSettings::SaveStream1Settings()
obs_data_set_bool(settings, "bwtest", false);
}

if (whip) {
obs_data_set_string(settings, "service", "WHIP");
if (IsWHIP()) {
obs_data_set_string(settings, "bearer_token", QT_TO_UTF8(ui->key->text()));
} else {
obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));
Expand Down Expand Up @@ -363,7 +415,7 @@ void OBSBasicSettings::SaveStream1Settings()

void OBSBasicSettings::UpdateMoreInfoLink()
{
if (IsCustomService() || IsWHIP()) {
if (IsCustomService() || IsCustomServiceType()) {
ui->moreInfoButton->hide();
return;
}
Expand Down Expand Up @@ -469,19 +521,47 @@ void OBSBasicSettings::LoadServices(bool showAll)
if (showAll)
names.sort(Qt::CaseInsensitive);

for (QString &name : names)
ui->service->addItem(name);
// Add rtmp_common services with ServiceItemData
for (QString &name : names) {
ServiceItemData data(ServiceItemData::Type::RtmpCommon, name, name);
ui->service->addItem(name, QVariant::fromValue(data));
}

// Enumerate all available service types loaded in OBS
size_t idx = 0;
const char *service_id;
while (obs_enum_service_types(idx++, &service_id)) {
// Skip rtmp_common and rtmp_custom as they're handled separately
if (strcmp(service_id, "rtmp_common") == 0 || strcmp(service_id, "rtmp_custom") == 0)
continue;

if (obs_is_output_protocol_registered("WHIP")) {
ui->service->addItem(QTStr("WHIP"), QVariant((int)ListOpt::WHIP));
// Get the display name for the service
const char *display_name = obs_service_get_display_name(service_id);
if (!display_name)
display_name = service_id;

// Check if the service has a registered protocol
OBSServiceAutoRelease temp_service = obs_service_create(service_id, "temp", nullptr, nullptr);
if (temp_service) {
const char *protocol = obs_service_get_protocol(temp_service);
if (protocol && obs_is_output_protocol_registered(protocol)) {
// Add the service to the dropdown with ServiceItemData
ServiceItemData data(ServiceItemData::Type::CustomServiceType, QString(service_id),
QT_UTF8(display_name));
ui->service->addItem(QT_UTF8(display_name), QVariant::fromValue(data));
}
}
}

if (!showAll) {
ServiceItemData showAllData(ServiceItemData::Type::ShowAll);
ui->service->addItem(QTStr("Basic.AutoConfig.StreamPage.Service.ShowAll"),
QVariant((int)ListOpt::ShowAll));
QVariant::fromValue(showAllData));
}

ui->service->insertItem(0, QTStr("Basic.AutoConfig.StreamPage.Service.Custom"), QVariant((int)ListOpt::Custom));
ServiceItemData customData(ServiceItemData::Type::Custom);
ui->service->insertItem(0, QTStr("Basic.AutoConfig.StreamPage.Service.Custom"),
QVariant::fromValue(customData));

if (!lastService.isEmpty()) {
int idx = ui->service->findText(lastService);
Expand Down Expand Up @@ -558,7 +638,10 @@ void OBSBasicSettings::UseStreamKeyAdvClicked()

void OBSBasicSettings::on_service_currentIndexChanged(int idx)
{
if (ui->service->currentData().toInt() == (int)ListOpt::ShowAll) {
// Check if "Show All" was selected
QVariant data = ui->service->currentData();
ServiceItemData serviceData = data.value<ServiceItemData>();
if (serviceData.isShowAll()) {
LoadServices(true);
ui->service->showPopup();
return;
Expand Down Expand Up @@ -608,7 +691,7 @@ void OBSBasicSettings::ServiceChanged(bool resetFields)
{
std::string service = QT_TO_UTF8(ui->service->currentText());
bool custom = IsCustomService();
bool whip = IsWHIP();
bool customServiceType = IsCustomServiceType();

ui->disconnectAccount->setVisible(false);
ui->bandwidthTestEnable->setVisible(false);
Expand All @@ -629,7 +712,7 @@ void OBSBasicSettings::ServiceChanged(bool resetFields)
ui->authPwLabel->setVisible(custom);
ui->authPwWidget->setVisible(custom);

if (custom || whip) {
if (custom || customServiceType) {
ui->destinationLayout->insertRow(1, ui->serverLabel, ui->serverStackedWidget);

ui->serverStackedWidget->setCurrentIndex(1);
Expand Down Expand Up @@ -751,25 +834,27 @@ void OBSBasicSettings::on_authPwShow_clicked()
OBSService OBSBasicSettings::SpawnTempService()
{
bool custom = IsCustomService();
bool whip = IsWHIP();
QString customServiceTypeId = GetCustomServiceTypeId();
const char *service_id = "rtmp_common";
QByteArray serviceIdUtf8;

if (custom) {
service_id = "rtmp_custom";
} else if (whip) {
service_id = "whip_custom";
} else if (!customServiceTypeId.isEmpty()) {
serviceIdUtf8 = customServiceTypeId.toUtf8();
service_id = serviceIdUtf8.constData();
}

OBSDataAutoRelease settings = obs_data_create();

if (!custom && !whip) {
if (!custom && customServiceTypeId.isEmpty()) {
obs_data_set_string(settings, "service", QT_TO_UTF8(ui->service->currentText()));
obs_data_set_string(settings, "server", QT_TO_UTF8(ui->server->currentData().toString()));
} else {
obs_data_set_string(settings, "server", QT_TO_UTF8(ui->customServer->text().trimmed()));
}

if (whip)
if (IsWHIP())
obs_data_set_string(settings, "bearer_token", QT_TO_UTF8(ui->key->text()));
else
obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));
Expand Down