(API Change) Unsquish libobs API callback names

Renamed:                    To:
-------------------------------------------------------
obs_source_info::getname    obs_source_info::get_name
obs_source_info::getwidth   obs_source_info::get_width
obs_source_info::getheight  obs_source_info::get_height
obs_output_info::getname    obs_output_info::get_name
obs_encoder_info::getname   obs_encoder_info::get_name
obs_service_info::getname   obs_service_info::get_name

libobs/obs-encoder.c

@@ -33,7 +33,7 @@ struct obs_encoder_info *find_encoder(const char *id)
 const char *obs_encoder_get_display_name(const char *id)
 {
 	struct obs_encoder_info *ei = find_encoder(id);
-	return ei ? ei->getname() : NULL;
+	return ei ? ei->get_name() : NULL;
 }
 
 static bool init_encoder(struct obs_encoder *encoder, const char *name,

libobs/obs-encoder.h

@@ -104,7 +104,7 @@ struct obs_encoder_info {
 	 *
 	 * @return         Translated name of the encoder
 	 */
-	const char *(*getname)(void);
+	const char *(*get_name)(void);
 
 	/**
 	 * Creates the encoder with the specified settings

libobs/obs-module.c

@@ -450,15 +450,15 @@ void obs_register_source_s(const struct obs_source_info *info, size_t size)
 		return;
 	}
 
-	CHECK_REQUIRED_VAL(info, getname, obs_register_source);
-	CHECK_REQUIRED_VAL(info, create,  obs_register_source);
-	CHECK_REQUIRED_VAL(info, destroy, obs_register_source);
+	CHECK_REQUIRED_VAL(info, get_name, obs_register_source);
+	CHECK_REQUIRED_VAL(info, create,   obs_register_source);
+	CHECK_REQUIRED_VAL(info, destroy,  obs_register_source);
 
 	if (info->type == OBS_SOURCE_TYPE_INPUT          &&
 	    (info->output_flags & OBS_SOURCE_VIDEO) != 0 &&
 	    (info->output_flags & OBS_SOURCE_ASYNC) == 0) {
-		CHECK_REQUIRED_VAL(info, getwidth,  obs_register_source);
-		CHECK_REQUIRED_VAL(info, getheight, obs_register_source);
+		CHECK_REQUIRED_VAL(info, get_width,  obs_register_source);
+		CHECK_REQUIRED_VAL(info, get_height, obs_register_source);
 	}
 
 	memcpy(&data, info, size);
@@ -474,11 +474,11 @@ void obs_register_output_s(const struct obs_output_info *info, size_t size)
 		return;
 	}
 
-	CHECK_REQUIRED_VAL(info, getname, obs_register_output);
-	CHECK_REQUIRED_VAL(info, create,  obs_register_output);
-	CHECK_REQUIRED_VAL(info, destroy, obs_register_output);
-	CHECK_REQUIRED_VAL(info, start,   obs_register_output);
-	CHECK_REQUIRED_VAL(info, stop,    obs_register_output);
+	CHECK_REQUIRED_VAL(info, get_name, obs_register_output);
+	CHECK_REQUIRED_VAL(info, create,   obs_register_output);
+	CHECK_REQUIRED_VAL(info, destroy,  obs_register_output);
+	CHECK_REQUIRED_VAL(info, start,    obs_register_output);
+	CHECK_REQUIRED_VAL(info, stop,     obs_register_output);
 
 	if (info->flags & OBS_OUTPUT_ENCODED) {
 		CHECK_REQUIRED_VAL(info, encoded_packet, obs_register_output);
@@ -503,10 +503,10 @@ void obs_register_encoder_s(const struct obs_encoder_info *info, size_t size)
 		return;
 	}
 
-	CHECK_REQUIRED_VAL(info, getname, obs_register_encoder);
-	CHECK_REQUIRED_VAL(info, create,  obs_register_encoder);
-	CHECK_REQUIRED_VAL(info, destroy, obs_register_encoder);
-	CHECK_REQUIRED_VAL(info, encode,  obs_register_encoder);
+	CHECK_REQUIRED_VAL(info, get_name, obs_register_encoder);
+	CHECK_REQUIRED_VAL(info, create,   obs_register_encoder);
+	CHECK_REQUIRED_VAL(info, destroy,  obs_register_encoder);
+	CHECK_REQUIRED_VAL(info, encode,   obs_register_encoder);
 
 	if (info->type == OBS_ENCODER_AUDIO)
 		CHECK_REQUIRED_VAL(info, frame_size, obs_register_encoder);
@@ -522,9 +522,9 @@ void obs_register_service_s(const struct obs_service_info *info, size_t size)
 		return;
 	}
 
-	CHECK_REQUIRED_VAL(info, getname, obs_register_service);
-	CHECK_REQUIRED_VAL(info, create,  obs_register_service);
-	CHECK_REQUIRED_VAL(info, destroy, obs_register_service);
+	CHECK_REQUIRED_VAL(info, get_name, obs_register_service);
+	CHECK_REQUIRED_VAL(info, create,   obs_register_service);
+	CHECK_REQUIRED_VAL(info, destroy,  obs_register_service);
 
 	REGISTER_OBS_DEF(size, obs_service_info, obs->service_types, info);
 }

libobs/obs-output.c

@@ -34,7 +34,7 @@ const struct obs_output_info *find_output(const char *id)
 const char *obs_output_get_display_name(const char *id)
 {
 	const struct obs_output_info *info = find_output(id);
-	return (info != NULL) ? info->getname() : NULL;
+	return (info != NULL) ? info->get_name() : NULL;
 }
 
 static const char *output_signals[] = {

libobs/obs-output.h

@@ -31,7 +31,7 @@ struct obs_output_info {
 
 	uint32_t flags;
 
-	const char *(*getname)(void);
+	const char *(*get_name)(void);
 
 	void *(*create)(obs_data_t settings, obs_output_t output);
 	void (*destroy)(void *data);

libobs/obs-scene.c

@@ -438,18 +438,18 @@ static uint32_t scene_getheight(void *data)
 
 const struct obs_source_info scene_info =
 {
-	.id           = "scene",
-	.type         = OBS_SOURCE_TYPE_INPUT,
-	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
-	.getname      = scene_getname,
-	.create       = scene_create,
-	.destroy      = scene_destroy,
-	.video_render = scene_video_render,
-	.getwidth     = scene_getwidth,
-	.getheight    = scene_getheight,
-	.load         = scene_load,
-	.save         = scene_save,
-	.enum_sources = scene_enum_sources
+	.id            = "scene",
+	.type          = OBS_SOURCE_TYPE_INPUT,
+	.output_flags  = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
+	.get_name      = scene_getname,
+	.create        = scene_create,
+	.destroy       = scene_destroy,
+	.video_render  = scene_video_render,
+	.get_width     = scene_getwidth,
+	.get_height    = scene_getheight,
+	.load          = scene_load,
+	.save          = scene_save,
+	.enum_sources  = scene_enum_sources
 };
 
 obs_scene_t obs_scene_create(const char *name)

libobs/obs-service.c

@@ -30,7 +30,7 @@ const struct obs_service_info *find_service(const char *id)
 const char *obs_service_get_display_name(const char *id)
 {
 	const struct obs_service_info *info = find_service(id);
-	return (info != NULL) ? info->getname() : NULL;
+	return (info != NULL) ? info->get_name() : NULL;
 }
 
 obs_service_t obs_service_create(const char *id, const char *name,

libobs/obs-service.h

@@ -21,7 +21,7 @@ struct obs_service_info {
 	/* required */
 	const char *id;
 
-	const char *(*getname)(void);
+	const char *(*get_name)(void);
 	void *(*create)(obs_data_t settings, obs_service_t service);
 	void (*destroy)(void *data);
 

libobs/obs-source.c

@@ -99,7 +99,7 @@ const char *obs_source_get_display_name(enum obs_source_type type,
 		const char *id)
 {
 	const struct obs_source_info *info = get_source_info(type, id);
-	return (info != NULL) ? info->getname() : NULL;
+	return (info != NULL) ? info->get_name() : NULL;
 }
 
 /* internal initialization */
@@ -1115,8 +1115,8 @@ uint32_t obs_source_get_width(obs_source_t source)
 {
 	if (!source_valid(source)) return 0;
 
-	if (source->info.getwidth)
-		return source->info.getwidth(source->context.data);
+	if (source->info.get_width)
+		return source->info.get_width(source->context.data);
 	return source->async_width;
 }
 
@@ -1124,8 +1124,8 @@ uint32_t obs_source_get_height(obs_source_t source)
 {
 	if (!source_valid(source)) return 0;
 
-	if (source->info.getheight)
-		return source->info.getheight(source->context.data);
+	if (source->info.get_height)
+		return source->info.get_height(source->context.data);
 	return source->async_height;
 }
 

libobs/obs-source.h

@@ -120,7 +120,7 @@ struct obs_source_info {
 	 *
 	 * @return         The translated name of the source type
 	 */
-	const char *(*getname)(void);
+	const char *(*get_name)(void);
 
 	/**
 	 * Creates the source data for the source
@@ -141,11 +141,11 @@ struct obs_source_info {
 
 	/** Returns the width of the source.  Required if this is an input
 	 * source and has non-async video */
-	uint32_t (*getwidth)(void *data);
+	uint32_t (*get_width)(void *data);
 
 	/** Returns the height of the source.  Required if this is an input
 	 * source and has non-async video */
-	uint32_t (*getheight)(void *data);
+	uint32_t (*get_height)(void *data);
 
 	/* ----------------------------------------------------------------- */
 	/* Optional implementation */

plugins/image-source/image-source.c

@@ -110,12 +110,12 @@ static struct obs_source_info image_source_info = {
 	.id           = "image_source",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_VIDEO,
-	.getname      = image_source_get_name,
+	.get_name     = image_source_get_name,
 	.create       = image_source_create,
 	.destroy      = image_source_destroy,
 	.update       = image_source_update,
-	.getwidth     = image_source_getwidth,
-	.getheight    = image_source_getheight,
+	.get_width    = image_source_getwidth,
+	.get_height   = image_source_getheight,
 	.video_render = image_source_render,
 	.properties   = image_source_properties
 };

plugins/linux-pulseaudio/pulse-input.c

@@ -445,7 +445,7 @@ struct obs_source_info pulse_input_capture = {
 	.id           = "pulse_input_capture",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_AUDIO,
-	.getname      = pulse_input_getname,
+	.get_name     = pulse_input_getname,
 	.create       = pulse_create,
 	.destroy      = pulse_destroy,
 	.update       = pulse_update,
@@ -457,7 +457,7 @@ struct obs_source_info pulse_output_capture = {
 	.id           = "pulse_output_capture",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_AUDIO,
-	.getname      = pulse_output_getname,
+	.get_name     = pulse_output_getname,
 	.create       = pulse_create,
 	.destroy      = pulse_destroy,
 	.update       = pulse_update,

plugins/linux-v4l2/v4l2-input.c

@@ -852,7 +852,7 @@ struct obs_source_info v4l2_input = {
 	.id           = "v4l2_input",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_ASYNC_VIDEO,
-	.getname      = v4l2_getname,
+	.get_name     = v4l2_getname,
 	.create       = v4l2_create,
 	.destroy      = v4l2_destroy,
 	.update       = v4l2_update,

plugins/linux-xcomposite/plugin-main.cpp

@@ -72,7 +72,7 @@ bool obs_module_load(void)
 	sinfo.id = "xcomposite_input";
 	sinfo.output_flags = OBS_SOURCE_VIDEO;
 
-	sinfo.getname      = xcompcap_getname;
+	sinfo.get_name     = xcompcap_getname;
 	sinfo.create       = xcompcap_create;
 	sinfo.destroy      = xcompcap_destroy;
 	sinfo.properties   = xcompcap_props;
@@ -80,8 +80,8 @@ bool obs_module_load(void)
 	sinfo.update       = xcompcap_update;
 	sinfo.video_tick   = xcompcap_video_tick;
 	sinfo.video_render = xcompcap_video_render;
-	sinfo.getwidth     = xcompcap_getwidth;
-	sinfo.getheight    = xcompcap_getheight;
+	sinfo.get_width    = xcompcap_getwidth;
+	sinfo.get_height   = xcompcap_getheight;
 
 	obs_register_source(&sinfo);
 

plugins/linux-xshm/xshm-input.c

@@ -301,7 +301,7 @@ struct obs_source_info xshm_input = {
 	.id           = "xshm_input",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_VIDEO,
-	.getname      = xshm_getname,
+	.get_name     = xshm_getname,
 	.create       = xshm_create,
 	.destroy      = xshm_destroy,
 	.update       = xshm_update,
@@ -309,6 +309,6 @@ struct obs_source_info xshm_input = {
 	.properties   = xshm_properties,
 	.video_tick   = xshm_video_tick,
 	.video_render = xshm_video_render,
-	.getwidth     = xshm_getwidth,
-	.getheight    = xshm_getheight
+	.get_width    = xshm_getwidth,
+	.get_height   = xshm_getheight
 };

plugins/mac-avcapture/av-capture.m

@@ -837,7 +837,7 @@ struct obs_source_info av_capture_info = {
 	.id           = "av_capture_input",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_ASYNC_VIDEO,
-	.getname      = av_capture_getname,
+	.get_name     = av_capture_getname,
 	.create       = av_capture_create,
 	.destroy      = av_capture_destroy,
 	.defaults     = av_capture_defaults,

plugins/mac-capture/mac-audio.c

@@ -746,7 +746,7 @@ struct obs_source_info coreaudio_input_capture_info = {
 	.id           = "coreaudio_input_capture",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_AUDIO,
-	.getname      = coreaudio_input_getname,
+	.get_name     = coreaudio_input_getname,
 	.create       = coreaudio_create_input_capture,
 	.destroy      = coreaudio_destroy,
 	.defaults     = coreaudio_defaults,
@@ -757,7 +757,7 @@ struct obs_source_info coreaudio_output_capture_info = {
 	.id           = "coreaudio_output_capture",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_AUDIO,
-	.getname      = coreaudio_output_getname,
+	.get_name     = coreaudio_output_getname,
 	.create       = coreaudio_create_output_capture,
 	.destroy      = coreaudio_destroy,
 	.defaults     = coreaudio_defaults,

plugins/mac-capture/mac-display-capture.m

@@ -322,7 +322,7 @@ static obs_properties_t display_capture_properties(void)
 struct obs_source_info display_capture_info = {
 	.id           = "display_capture",
 	.type         = OBS_SOURCE_TYPE_INPUT,
-	.getname      = display_capture_getname,
+	.get_name     = display_capture_getname,
 
 	.create       = display_capture_create,
 	.destroy      = display_capture_destroy,
@@ -331,8 +331,8 @@ struct obs_source_info display_capture_info = {
 	.video_tick   = display_capture_video_tick,
 	.video_render = display_capture_video_render,
 
-	.getwidth     = display_capture_getwidth,
-	.getheight    = display_capture_getheight,
+	.get_width    = display_capture_getwidth,
+	.get_height   = display_capture_getheight,
 
 	.defaults     = display_capture_defaults,
 	.properties   = display_capture_properties,

plugins/obs-ffmpeg/obs-ffmpeg-aac.c

@@ -277,7 +277,7 @@ struct obs_encoder_info aac_encoder_info = {
 	.id         = "ffmpeg_aac",
 	.type       = OBS_ENCODER_AUDIO,
 	.codec      = "AAC",
-	.getname    = aac_getname,
+	.get_name   = aac_getname,
 	.create     = aac_create,
 	.destroy    = aac_destroy,
 	.encode     = aac_encode,

plugins/obs-ffmpeg/obs-ffmpeg-output.c

@@ -807,7 +807,7 @@ static void ffmpeg_output_stop(void *data)
 struct obs_output_info ffmpeg_output = {
 	.id        = "ffmpeg_output",
 	.flags     = OBS_OUTPUT_AUDIO | OBS_OUTPUT_VIDEO,
-	.getname   = ffmpeg_output_getname,
+	.get_name  = ffmpeg_output_getname,
 	.create    = ffmpeg_output_create,
 	.destroy   = ffmpeg_output_destroy,
 	.start     = ffmpeg_output_start,

plugins/obs-libfdk/obs-libfdk.c

@@ -292,7 +292,7 @@ struct obs_encoder_info obs_libfdk_encoder = {
 	.id         = "libfdk_aac",
 	.type       = OBS_ENCODER_AUDIO,
 	.codec      = "AAC",
-	.getname    = libfdk_getname,
+	.get_name   = libfdk_getname,
 	.create     = libfdk_create,
 	.destroy    = libfdk_destroy,
 	.encode     = libfdk_encode,

plugins/obs-outputs/flv-output.c

@@ -201,7 +201,7 @@ static obs_properties_t flv_output_properties(void)
 struct obs_output_info flv_output_info = {
 	.id             = "flv_output",
 	.flags          = OBS_OUTPUT_AV | OBS_OUTPUT_ENCODED,
-	.getname        = flv_output_getname,
+	.get_name       = flv_output_getname,
 	.create         = flv_output_create,
 	.destroy        = flv_output_destroy,
 	.start          = flv_output_start,

plugins/obs-outputs/rtmp-stream.c

@@ -592,7 +592,7 @@ struct obs_output_info rtmp_output_info = {
 	.flags          = OBS_OUTPUT_AV |
 	                  OBS_OUTPUT_ENCODED |
 	                  OBS_OUTPUT_SERVICE,
-	.getname        = rtmp_stream_getname,
+	.get_name       = rtmp_stream_getname,
 	.create         = rtmp_stream_create,
 	.destroy        = rtmp_stream_destroy,
 	.start          = rtmp_stream_start,

plugins/obs-x264/obs-x264.c

@@ -514,7 +514,7 @@ struct obs_encoder_info obs_x264_encoder = {
 	.id         = "obs_x264",
 	.type       = OBS_ENCODER_VIDEO,
 	.codec      = "h264",
-	.getname    = obs_x264_getname,
+	.get_name   = obs_x264_getname,
 	.create     = obs_x264_create,
 	.destroy    = obs_x264_destroy,
 	.encode     = obs_x264_encode,

plugins/rtmp-services/rtmp-common.c

@@ -332,7 +332,7 @@ static const char *rtmp_common_key(void *data)
 
 struct obs_service_info rtmp_common_service = {
 	.id         = "rtmp_common",
-	.getname    = rtmp_common_getname,
+	.get_name   = rtmp_common_getname,
 	.create     = rtmp_common_create,
 	.destroy    = rtmp_common_destroy,
 	.update     = rtmp_common_update,

plugins/rtmp-services/rtmp-custom.c

@@ -63,7 +63,7 @@ static const char *rtmp_custom_key(void *data)
 
 struct obs_service_info rtmp_custom_service = {
 	.id         = "rtmp_custom",
-	.getname    = rtmp_custom_name,
+	.get_name   = rtmp_custom_name,
 	.create     = rtmp_custom_create,
 	.destroy    = rtmp_custom_destroy,
 	.update     = rtmp_custom_update,

plugins/win-capture/monitor-capture.c

@@ -161,11 +161,11 @@ struct obs_source_info monitor_capture_info = {
 	.id           = "monitor_capture",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
-	.getname      = monitor_capture_getname,
+	.get_name     = monitor_capture_getname,
 	.create       = monitor_capture_create,
 	.destroy      = monitor_capture_destroy,
-	.getwidth     = monitor_capture_width,
-	.getheight    = monitor_capture_height,
+	.get_width    = monitor_capture_width,
+	.get_height   = monitor_capture_height,
 	.defaults     = monitor_capture_defaults,
 	.video_render = monitor_capture_render,
 	.video_tick   = monitor_capture_tick

plugins/win-capture/window-capture.c

@@ -453,12 +453,12 @@ struct obs_source_info window_capture_info = {
 	.id           = "window_capture",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
-	.getname      = wc_getname,
+	.get_name     = wc_getname,
 	.create       = wc_create,
 	.destroy      = wc_destroy,
 	.update       = wc_update,
-	.getwidth     = wc_width,
-	.getheight    = wc_height,
+	.get_width    = wc_width,
+	.get_height   = wc_height,
 	.defaults     = wc_defaults,
 	.properties   = wc_properties,
 	.video_render = wc_render,

plugins/win-dshow/win-dshow.cpp

@@ -1198,11 +1198,11 @@ bool obs_module_load(void)
 	info.type            = OBS_SOURCE_TYPE_INPUT;
 	info.output_flags    = OBS_SOURCE_VIDEO |
 	                       OBS_SOURCE_ASYNC;
-	info.getname         = GetDShowInputName;
+	info.get_name        = GetDShowInputName;
 	info.create          = CreateDShowInput;
 	info.destroy         = DestroyDShowInput;
-	info.getwidth        = GetDShowWidth;
-	info.getheight       = GetDShowHeight;
+	info.get_width       = GetDShowWidth;
+	info.get_height      = GetDShowHeight;
 	info.update          = UpdateDShowInput;
 	info.defaults        = GetDShowDefaults;
 	info.properties      = GetDShowProperties;

plugins/win-wasapi/win-wasapi.cpp

@@ -512,7 +512,7 @@ void RegisterWASAPIInput()
 	info.id              = "wasapi_input_capture";
 	info.type            = OBS_SOURCE_TYPE_INPUT;
 	info.output_flags    = OBS_SOURCE_AUDIO;
-	info.getname         = GetWASAPIInputName;
+	info.get_name        = GetWASAPIInputName;
 	info.create          = CreateWASAPIInput;
 	info.destroy         = DestroyWASAPISource;
 	info.update          = UpdateWASAPISource;
@@ -527,7 +527,7 @@ void RegisterWASAPIOutput()
 	info.id              = "wasapi_output_capture";
 	info.type            = OBS_SOURCE_TYPE_INPUT;
 	info.output_flags    = OBS_SOURCE_AUDIO;
-	info.getname         = GetWASAPIOutputName;
+	info.get_name        = GetWASAPIOutputName;
 	info.create          = CreateWASAPIOutput;
 	info.destroy         = DestroyWASAPISource;
 	info.update          = UpdateWASAPISource;

test/test-input/test-filter.c

@@ -60,7 +60,7 @@ struct obs_source_info test_filter = {
 	.id           = "test_filter",
 	.type         = OBS_SOURCE_TYPE_FILTER,
 	.output_flags = OBS_SOURCE_VIDEO,
-	.getname      = filter_getname,
+	.get_name     = filter_getname,
 	.create       = filter_create,
 	.destroy      = filter_destroy,
 	.video_render = filter_render

test/test-input/test-random.c

@@ -100,7 +100,7 @@ struct obs_source_info test_random = {
 	.id           = "random",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_ASYNC_VIDEO,
-	.getname      = random_getname,
+	.get_name     = random_getname,
 	.create       = random_create,
 	.destroy      = random_destroy,
 };

test/test-input/test-sinewave.c

@@ -104,7 +104,7 @@ struct obs_source_info test_sinewave = {
 	.id           = "test_sinewave",
 	.type         = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_AUDIO,
-	.getname      = sinewave_getname,
+	.get_name     = sinewave_getname,
 	.create       = sinewave_create,
 	.destroy      = sinewave_destroy,
 };