diff --git a/libobs/obs-service.c b/libobs/obs-service.c index fb8cbadcee7b4813d8850ec88b4a1880b98bc04c..3feb854750f57ecd002f305897a599002a276905 100644 --- a/libobs/obs-service.c +++ b/libobs/obs-service.c @@ -142,7 +142,7 @@ obs_properties_t *obs_service_properties(const obs_service_t *service) return NULL; } -const char *obs_service_gettype(const obs_service_t *service) +const char *obs_service_get_type(const obs_service_t *service) { return service ? service->info.id : NULL; } diff --git a/libobs/obs.h b/libobs/obs.h index 72ebf0fee95e05fd842ae4d74a61cba7a8ac31ff..7e698aca33b241d119dbbd89e71d84a2ff27cee0 100644 --- a/libobs/obs.h +++ b/libobs/obs.h @@ -1295,7 +1295,7 @@ EXPORT obs_properties_t *obs_get_service_properties(const char *id); EXPORT obs_properties_t *obs_service_properties(const obs_service_t *service); /** Gets the service type */ -EXPORT const char *obs_service_gettype(const obs_service_t *service); +EXPORT const char *obs_service_get_type(const obs_service_t *service); /** Updates the settings of the service context */ EXPORT void obs_service_update(obs_service_t *service, obs_data_t *settings); diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index 70eb0085a816c3a6362d760fc59c3e7de78c9161..a6e0e707080255a5fd457eaa5c0632061653ec40 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -311,7 +311,7 @@ void OBSBasic::SaveService() obs_data_t *data = obs_data_create(); obs_data_t *settings = obs_service_get_settings(service); - obs_data_set_string(data, "type", obs_service_gettype(service)); + obs_data_set_string(data, "type", obs_service_get_type(service)); obs_data_set_obj(data, "settings", settings); const char *json = obs_data_get_json(data); diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp index 7bd6430c67c607dfd49133bb20b1b7046d695b0b..25ba89eacc00ff875c67e212e35156aac8bfcd4d 100644 --- a/obs/window-basic-settings.cpp +++ b/obs/window-basic-settings.cpp @@ -270,7 +270,7 @@ void OBSBasicSettings::LoadServiceTypes() ui->streamType->addItem(qName, qType); } - type = obs_service_gettype(main->GetService()); + type = obs_service_get_type(main->GetService()); SetComboByValue(ui->streamType, type); } @@ -331,7 +331,7 @@ void OBSBasicSettings::LoadStream1Settings() { QLayout *layout = ui->streamContainer->layout(); obs_service_t *service = main->GetService(); - const char *type = obs_service_gettype(service); + const char *type = obs_service_get_type(service); loading = true;