Forráskód Böngészése

(API Change) Fix obs_service_gettype func name

Before:                After:
obs_service_gettype    obs_service_get_type

It seems there was an API function that was missed when we were doing
our big API consistency update.  Unsquishes obs_service_gettype to
obs_service_get_type.
jp9000 10 éve
szülő
commit
b72e68afe7
4 módosított fájl, 5 hozzáadás és 5 törlés
  1. 1 1
      libobs/obs-service.c
  2. 1 1
      libobs/obs.h
  3. 1 1
      obs/window-basic-main.cpp
  4. 2 2
      obs/window-basic-settings.cpp

+ 1 - 1
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;
 }

+ 1 - 1
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);

+ 1 - 1
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);

+ 2 - 2
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;