From 6285a477268b56cc573c3d7f2763704dc2a29c1c Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 16 Sep 2015 01:30:51 -0700 Subject: [PATCH] (API Change) libobs: Pass type data to get_name callbacks API changed from: obs_source_info::get_name(void) obs_output_info::get_name(void) obs_encoder_info::get_name(void) obs_service_info::get_name(void) API changed to: obs_source_info::get_name(void *type_data) obs_output_info::get_name(void *type_data) obs_encoder_info::get_name(void *type_data) obs_service_info::get_name(void *type_data) This allows the type data to be used when getting the name of the object (useful for plugin wrappers primarily). NOTE: Though a parameter was added, this is backward-compatible with older plugins due to calling convention. The new parameter will simply be ignored by older plugins, and the stack (if used) will be cleaned up by the caller. --- libobs/obs-encoder.c | 2 +- libobs/obs-encoder.h | 5 +++-- libobs/obs-output.c | 2 +- libobs/obs-output.h | 2 +- libobs/obs-scene.c | 3 ++- libobs/obs-service.c | 2 +- libobs/obs-service.h | 2 +- libobs/obs-source.c | 2 +- libobs/obs-source.h | 5 +++-- plugins/coreaudio-encoder/encoder.cpp | 2 +- plugins/decklink/plugin-main.cpp | 2 +- plugins/image-source/image-source.c | 3 ++- plugins/linux-capture/xcomposite-main.cpp | 2 +- plugins/linux-capture/xshm-input.c | 3 ++- plugins/linux-jack/jack-input.c | 3 ++- plugins/linux-pulseaudio/pulse-input.c | 6 ++++-- plugins/linux-v4l2/v4l2-input.c | 3 ++- plugins/mac-avcapture/av-capture.m | 3 ++- plugins/mac-capture/mac-audio.c | 6 ++++-- plugins/mac-capture/mac-display-capture.m | 3 ++- plugins/mac-capture/mac-window-capture.m | 3 ++- plugins/mac-syphon/syphon.m | 3 ++- plugins/obs-ffmpeg/obs-ffmpeg-aac.c | 3 ++- plugins/obs-ffmpeg/obs-ffmpeg-mux.c | 3 ++- plugins/obs-ffmpeg/obs-ffmpeg-output.c | 3 ++- plugins/obs-ffmpeg/obs-ffmpeg-source.c | 3 ++- plugins/obs-filters/async-delay-filter.c | 3 ++- plugins/obs-filters/chroma-key-filter.c | 3 ++- plugins/obs-filters/color-filter.c | 3 ++- plugins/obs-filters/color-key-filter.c | 3 ++- plugins/obs-filters/crop-filter.c | 3 ++- plugins/obs-filters/gain-filter.c | 3 ++- plugins/obs-filters/mask-filter.c | 3 ++- plugins/obs-filters/noise-gate-filter.c | 3 ++- plugins/obs-filters/scroll-filter.c | 3 ++- plugins/obs-filters/sharpness-filter.c | 3 ++- plugins/obs-libfdk/obs-libfdk.c | 3 ++- plugins/obs-outputs/flv-output.c | 3 ++- plugins/obs-outputs/rtmp-stream.c | 3 ++- plugins/obs-x264/obs-x264.c | 3 ++- plugins/rtmp-services/rtmp-common.c | 3 ++- plugins/rtmp-services/rtmp-custom.c | 3 ++- plugins/text-freetype2/text-freetype2.c | 3 ++- plugins/text-freetype2/text-freetype2.h | 2 +- plugins/win-capture/duplicator-monitor-capture.c | 3 ++- plugins/win-capture/game-capture.c | 3 ++- plugins/win-capture/monitor-capture.c | 3 ++- plugins/win-capture/window-capture.c | 3 ++- plugins/win-dshow/win-dshow-encoder.cpp | 4 ++-- plugins/win-dshow/win-dshow.cpp | 2 +- plugins/win-mf/mf-aac.cpp | 2 +- plugins/win-wasapi/win-wasapi.cpp | 4 ++-- 52 files changed, 98 insertions(+), 58 deletions(-) diff --git a/libobs/obs-encoder.c b/libobs/obs-encoder.c index 949cb2cb4..d82897529 100644 --- a/libobs/obs-encoder.c +++ b/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->get_name() : NULL; + return ei ? ei->get_name(ei->type_data) : NULL; } static bool init_encoder(struct obs_encoder *encoder, const char *name, diff --git a/libobs/obs-encoder.h b/libobs/obs-encoder.h index d60e44e40..deedc64b0 100644 --- a/libobs/obs-encoder.h +++ b/libobs/obs-encoder.h @@ -120,9 +120,10 @@ struct obs_encoder_info { /** * Gets the full translated name of this encoder * - * @return Translated name of the encoder + * @param type_data The type_data variable of this structure + * @return Translated name of the encoder */ - const char *(*get_name)(void); + const char *(*get_name)(void *type_data); /** * Creates the encoder with the specified settings diff --git a/libobs/obs-output.c b/libobs/obs-output.c index 0b3a32e3e..8c87280b4 100644 --- a/libobs/obs-output.c +++ b/libobs/obs-output.c @@ -35,7 +35,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->get_name() : NULL; + return (info != NULL) ? info->get_name(info->type_data) : NULL; } static const char *output_signals[] = { diff --git a/libobs/obs-output.h b/libobs/obs-output.h index 63735fed8..03629e327 100644 --- a/libobs/obs-output.h +++ b/libobs/obs-output.h @@ -36,7 +36,7 @@ struct obs_output_info { uint32_t flags; - const char *(*get_name)(void); + const char *(*get_name)(void *type_data); void *(*create)(obs_data_t *settings, obs_output_t *output); void (*destroy)(void *data); diff --git a/libobs/obs-scene.c b/libobs/obs-scene.c index d3cb8811b..90bc84ff3 100644 --- a/libobs/obs-scene.c +++ b/libobs/obs-scene.c @@ -42,9 +42,10 @@ static inline void signal_item_remove(struct obs_scene_item *item) calldata_free(¶ms); } -static const char *scene_getname(void) +static const char *scene_getname(void *unused) { /* TODO: locale */ + UNUSED_PARAMETER(unused); return "Scene"; } diff --git a/libobs/obs-service.c b/libobs/obs-service.c index cfeb2d547..4a27e5682 100644 --- a/libobs/obs-service.c +++ b/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->get_name() : NULL; + return (info != NULL) ? info->get_name(info->type_data) : NULL; } obs_service_t *obs_service_create(const char *id, const char *name, diff --git a/libobs/obs-service.h b/libobs/obs-service.h index a5d5c158d..2fea234fc 100644 --- a/libobs/obs-service.h +++ b/libobs/obs-service.h @@ -32,7 +32,7 @@ struct obs_service_info { /* required */ const char *id; - const char *(*get_name)(void); + const char *(*get_name)(void *type_data); void *(*create)(obs_data_t *settings, obs_service_t *service); void (*destroy)(void *data); diff --git a/libobs/obs-source.c b/libobs/obs-source.c index e5861103c..b41434b44 100644 --- a/libobs/obs-source.c +++ b/libobs/obs-source.c @@ -112,7 +112,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->get_name() : NULL; + return (info != NULL) ? info->get_name(info->type_data) : NULL; } /* internal initialization */ diff --git a/libobs/obs-source.h b/libobs/obs-source.h index f20f9d33f..74898bce5 100644 --- a/libobs/obs-source.h +++ b/libobs/obs-source.h @@ -133,9 +133,10 @@ struct obs_source_info { /** * Get the translated name of the source type * - * @return The translated name of the source type + * @param type_data The type_data variable of this structure + * @return The translated name of the source type */ - const char *(*get_name)(void); + const char *(*get_name)(void *type_data); /** * Creates the source data for the source diff --git a/plugins/coreaudio-encoder/encoder.cpp b/plugins/coreaudio-encoder/encoder.cpp index 745b5d140..a1b155d13 100644 --- a/plugins/coreaudio-encoder/encoder.cpp +++ b/plugins/coreaudio-encoder/encoder.cpp @@ -213,7 +213,7 @@ static const char *flush_log(DStr &log) CA_CO_LOG(level, format "%s%s", ##__VA_ARGS__, \ log->array ? ":\n" : "", flush_log(log)) -static const char *aac_get_name(void) +static const char *aac_get_name(void*) { return obs_module_text("CoreAudioAAC"); } diff --git a/plugins/decklink/plugin-main.cpp b/plugins/decklink/plugin-main.cpp index 86253e838..0b3697fac 100644 --- a/plugins/decklink/plugin-main.cpp +++ b/plugins/decklink/plugin-main.cpp @@ -57,7 +57,7 @@ static void decklink_get_defaults(obs_data_t *settings) obs_data_set_default_bool(settings, "buffering", true); } -static const char *decklink_get_name() +static const char *decklink_get_name(void*) { return obs_module_text("BlackmagicDevice"); } diff --git a/plugins/image-source/image-source.c b/plugins/image-source/image-source.c index 27bbab9fd..2a9211daa 100644 --- a/plugins/image-source/image-source.c +++ b/plugins/image-source/image-source.c @@ -22,8 +22,9 @@ struct image_source { uint32_t cy; }; -static const char *image_source_get_name(void) +static const char *image_source_get_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("ImageInput"); } diff --git a/plugins/linux-capture/xcomposite-main.cpp b/plugins/linux-capture/xcomposite-main.cpp index b2da7f060..f27132bce 100644 --- a/plugins/linux-capture/xcomposite-main.cpp +++ b/plugins/linux-capture/xcomposite-main.cpp @@ -55,7 +55,7 @@ void xcompcap_update(void *data, obs_data_t *settings) cc->updateSettings(settings); } -static const char* xcompcap_getname(void) +static const char* xcompcap_getname(void*) { return obs_module_text("XCCapture"); } diff --git a/plugins/linux-capture/xshm-input.c b/plugins/linux-capture/xshm-input.c index e5d7e9c6e..8e0fe3cfd 100644 --- a/plugins/linux-capture/xshm-input.c +++ b/plugins/linux-capture/xshm-input.c @@ -132,8 +132,9 @@ static int_fast32_t xshm_update_geometry(struct xshm_data *data) /** * Returns the name of the plugin */ -static const char* xshm_getname(void) +static const char* xshm_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("X11SharedMemoryScreenInput"); } diff --git a/plugins/linux-jack/jack-input.c b/plugins/linux-jack/jack-input.c index 6ceece25a..f147469d8 100644 --- a/plugins/linux-jack/jack-input.c +++ b/plugins/linux-jack/jack-input.c @@ -22,8 +22,9 @@ along with this program. If not, see . /** * Returns the name of the plugin */ -static const char *jack_input_getname(void) +static const char *jack_input_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("JACKInput"); } diff --git a/plugins/linux-pulseaudio/pulse-input.c b/plugins/linux-pulseaudio/pulse-input.c index 4128bc6c0..5c11d2145 100644 --- a/plugins/linux-pulseaudio/pulse-input.c +++ b/plugins/linux-pulseaudio/pulse-input.c @@ -439,13 +439,15 @@ static void pulse_output_defaults(obs_data_t *settings) /** * Returns the name of the plugin */ -static const char *pulse_input_getname(void) +static const char *pulse_input_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("PulseInput"); } -static const char *pulse_output_getname(void) +static const char *pulse_output_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("PulseOutput"); } diff --git a/plugins/linux-v4l2/v4l2-input.c b/plugins/linux-v4l2/v4l2-input.c index 0ef8d572c..e946f8e17 100644 --- a/plugins/linux-v4l2/v4l2-input.c +++ b/plugins/linux-v4l2/v4l2-input.c @@ -217,8 +217,9 @@ exit: return NULL; } -static const char* v4l2_getname(void) +static const char* v4l2_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("V4L2Input"); } diff --git a/plugins/mac-avcapture/av-capture.m b/plugins/mac-avcapture/av-capture.m index 83fdbdf5d..75b890d92 100644 --- a/plugins/mac-avcapture/av-capture.m +++ b/plugins/mac-avcapture/av-capture.m @@ -255,8 +255,9 @@ static void av_capture_enable_buffering(struct av_capture *capture, obs_source_set_flags(source, flags); } -static const char *av_capture_getname(void) +static const char *av_capture_getname(void *unused) { + UNUSED_PARAMETER(unused); return TEXT_AVCAPTURE; } diff --git a/plugins/mac-capture/mac-audio.c b/plugins/mac-capture/mac-audio.c index a83e4ceba..410416780 100644 --- a/plugins/mac-capture/mac-audio.c +++ b/plugins/mac-capture/mac-audio.c @@ -647,13 +647,15 @@ static void coreaudio_uninit(struct coreaudio_data *ca) /* ------------------------------------------------------------------------- */ -static const char *coreaudio_input_getname(void) +static const char *coreaudio_input_getname(void *unused) { + UNUSED_PARAMETER(unused); return TEXT_AUDIO_INPUT; } -static const char *coreaudio_output_getname(void) +static const char *coreaudio_output_getname(void *unused) { + UNUSED_PARAMETER(unused); return TEXT_AUDIO_OUTPUT; } diff --git a/plugins/mac-capture/mac-display-capture.m b/plugins/mac-capture/mac-display-capture.m index 46a230ada..e0727918c 100644 --- a/plugins/mac-capture/mac-display-capture.m +++ b/plugins/mac-capture/mac-display-capture.m @@ -422,8 +422,9 @@ static void display_capture_video_render(void *data, gs_effect_t *effect) gs_technique_end(tech); } -static const char *display_capture_getname(void) +static const char *display_capture_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("DisplayCapture"); } diff --git a/plugins/mac-capture/mac-window-capture.m b/plugins/mac-capture/mac-window-capture.m index 800bfd459..3d1bb9c61 100644 --- a/plugins/mac-capture/mac-window-capture.m +++ b/plugins/mac-capture/mac-window-capture.m @@ -186,8 +186,9 @@ static void window_capture_update(void *data, obs_data_t *settings) } } -static const char *window_capture_getname(void) +static const char *window_capture_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("WindowCapture"); } diff --git a/plugins/mac-syphon/syphon.m b/plugins/mac-syphon/syphon.m index a5a1bfbcb..b48f2a3b9 100644 --- a/plugins/mac-syphon/syphon.m +++ b/plugins/mac-syphon/syphon.m @@ -89,8 +89,9 @@ static inline void handle_application_launch(syphon_t s, NSArray *new) } @end -static const char *syphon_get_name() +static const char *syphon_get_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("Syphon"); } diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-aac.c b/plugins/obs-ffmpeg/obs-ffmpeg-aac.c index d4992335f..ac00e50a2 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-aac.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-aac.c @@ -52,8 +52,9 @@ struct aac_encoder { int frame_size_bytes; }; -static const char *aac_getname(void) +static const char *aac_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("FFmpegAAC"); } diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c index f227f21a5..4fcce09d1 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c @@ -37,8 +37,9 @@ struct ffmpeg_muxer { bool capturing; }; -static const char *ffmpeg_mux_getname(void) +static const char *ffmpeg_mux_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("FFmpegMuxer"); } diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c index 8f6f35c03..182e207e5 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c @@ -518,8 +518,9 @@ fail: /* ------------------------------------------------------------------------- */ -static const char *ffmpeg_output_getname(void) +static const char *ffmpeg_output_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("FFmpegOutput"); } diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-source.c b/plugins/obs-ffmpeg/obs-ffmpeg-source.c index 2a216d40a..62f525040 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-source.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-source.c @@ -517,8 +517,9 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings) } -static const char *ffmpeg_source_getname(void) +static const char *ffmpeg_source_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("FFMpegSource"); } diff --git a/plugins/obs-filters/async-delay-filter.c b/plugins/obs-filters/async-delay-filter.c index b9662e3f9..cbbd86640 100644 --- a/plugins/obs-filters/async-delay-filter.c +++ b/plugins/obs-filters/async-delay-filter.c @@ -33,8 +33,9 @@ struct async_delay_data { bool reset_audio; }; -static const char *async_delay_filter_name(void) +static const char *async_delay_filter_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("AsyncDelayFilter"); } diff --git a/plugins/obs-filters/chroma-key-filter.c b/plugins/obs-filters/chroma-key-filter.c index f78898312..3978b1937 100644 --- a/plugins/obs-filters/chroma-key-filter.c +++ b/plugins/obs-filters/chroma-key-filter.c @@ -52,8 +52,9 @@ struct chroma_key_filter_data { float spill; }; -static const char *chroma_key_name(void) +static const char *chroma_key_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("ChromaKeyFilter"); } diff --git a/plugins/obs-filters/color-filter.c b/plugins/obs-filters/color-filter.c index 240f1db58..56a588394 100644 --- a/plugins/obs-filters/color-filter.c +++ b/plugins/obs-filters/color-filter.c @@ -34,8 +34,9 @@ struct color_filter_data { float gamma; }; -static const char *color_filter_name(void) +static const char *color_filter_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("ColorFilter"); } diff --git a/plugins/obs-filters/color-key-filter.c b/plugins/obs-filters/color-key-filter.c index bacdb94a6..24760e696 100644 --- a/plugins/obs-filters/color-key-filter.c +++ b/plugins/obs-filters/color-key-filter.c @@ -45,8 +45,9 @@ struct color_key_filter_data { float smoothness; }; -static const char *color_key_name(void) +static const char *color_key_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("ColorKeyFilter"); } diff --git a/plugins/obs-filters/crop-filter.c b/plugins/obs-filters/crop-filter.c index 385b1f3d1..4566c75cc 100644 --- a/plugins/obs-filters/crop-filter.c +++ b/plugins/obs-filters/crop-filter.c @@ -19,8 +19,9 @@ struct crop_filter_data { bool absolute; }; -static const char *crop_filter_get_name(void) +static const char *crop_filter_get_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("CropFilter"); } diff --git a/plugins/obs-filters/gain-filter.c b/plugins/obs-filters/gain-filter.c index 6b0b4f483..02c7e1c27 100644 --- a/plugins/obs-filters/gain-filter.c +++ b/plugins/obs-filters/gain-filter.c @@ -19,8 +19,9 @@ struct gain_data { float multiple; }; -static const char *gain_name(void) +static const char *gain_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("Gain"); } diff --git a/plugins/obs-filters/mask-filter.c b/plugins/obs-filters/mask-filter.c index ebf58132b..4d00d2db5 100644 --- a/plugins/obs-filters/mask-filter.c +++ b/plugins/obs-filters/mask-filter.c @@ -22,8 +22,9 @@ struct mask_filter_data { struct vec4 color; }; -static const char *mask_filter_get_name(void) +static const char *mask_filter_get_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("MaskFilter"); } diff --git a/plugins/obs-filters/noise-gate-filter.c b/plugins/obs-filters/noise-gate-filter.c index fd3575328..963113301 100644 --- a/plugins/obs-filters/noise-gate-filter.c +++ b/plugins/obs-filters/noise-gate-filter.c @@ -44,8 +44,9 @@ struct noise_gate_data { #define VOL_MIN -96.0f #define VOL_MAX 0.0f -static const char *noise_gate_name(void) +static const char *noise_gate_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("NoiseGate"); } diff --git a/plugins/obs-filters/scroll-filter.c b/plugins/obs-filters/scroll-filter.c index c3150b0fd..a6710f513 100644 --- a/plugins/obs-filters/scroll-filter.c +++ b/plugins/obs-filters/scroll-filter.c @@ -18,8 +18,9 @@ struct scroll_filter_data { struct vec2 offset; }; -static const char *scroll_filter_get_name(void) +static const char *scroll_filter_get_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("ScrollFilter"); } diff --git a/plugins/obs-filters/sharpness-filter.c b/plugins/obs-filters/sharpness-filter.c index 0b8b38a3b..6def6a927 100644 --- a/plugins/obs-filters/sharpness-filter.c +++ b/plugins/obs-filters/sharpness-filter.c @@ -14,8 +14,9 @@ struct sharpness_data { float texwidth, texheight; }; -static const char *sharpness_getname(void) +static const char *sharpness_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("SharpnessFilter"); } diff --git a/plugins/obs-libfdk/obs-libfdk.c b/plugins/obs-libfdk/obs-libfdk.c index 752f43457..8313aacd7 100644 --- a/plugins/obs-libfdk/obs-libfdk.c +++ b/plugins/obs-libfdk/obs-libfdk.c @@ -59,8 +59,9 @@ typedef struct libfdk_encoder { int packet_buffer_size; } libfdk_encoder_t; -static const char *libfdk_getname(void) +static const char *libfdk_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("LibFDK"); } diff --git a/plugins/obs-outputs/flv-output.c b/plugins/obs-outputs/flv-output.c index 2608d223e..35c5596f7 100644 --- a/plugins/obs-outputs/flv-output.c +++ b/plugins/obs-outputs/flv-output.c @@ -40,8 +40,9 @@ struct flv_output { int64_t last_packet_ts; }; -static const char *flv_output_getname(void) +static const char *flv_output_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("FLVOutput"); } diff --git a/plugins/obs-outputs/rtmp-stream.c b/plugins/obs-outputs/rtmp-stream.c index be4af9ac1..afe1ed673 100644 --- a/plugins/obs-outputs/rtmp-stream.c +++ b/plugins/obs-outputs/rtmp-stream.c @@ -71,8 +71,9 @@ struct rtmp_stream { RTMP rtmp; }; -static const char *rtmp_stream_getname(void) +static const char *rtmp_stream_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("RTMPStream"); } diff --git a/plugins/obs-x264/obs-x264.c b/plugins/obs-x264/obs-x264.c index 0d2c5221f..cd00a08b4 100644 --- a/plugins/obs-x264/obs-x264.c +++ b/plugins/obs-x264/obs-x264.c @@ -56,8 +56,9 @@ struct obs_x264 { /* ------------------------------------------------------------------------- */ -static const char *obs_x264_getname(void) +static const char *obs_x264_getname(void *unused) { + UNUSED_PARAMETER(unused); return "x264"; } diff --git a/plugins/rtmp-services/rtmp-common.c b/plugins/rtmp-services/rtmp-common.c index 13950f01f..b2ad17698 100644 --- a/plugins/rtmp-services/rtmp-common.c +++ b/plugins/rtmp-services/rtmp-common.c @@ -10,8 +10,9 @@ struct rtmp_common { char *key; }; -static const char *rtmp_common_getname(void) +static const char *rtmp_common_getname(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("StreamingServices"); } diff --git a/plugins/rtmp-services/rtmp-custom.c b/plugins/rtmp-services/rtmp-custom.c index da56fa27c..68a6e8595 100644 --- a/plugins/rtmp-services/rtmp-custom.c +++ b/plugins/rtmp-services/rtmp-custom.c @@ -6,8 +6,9 @@ struct rtmp_custom { char *username, *password; }; -static const char *rtmp_custom_name(void) +static const char *rtmp_custom_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("CustomStreamingServer"); } diff --git a/plugins/text-freetype2/text-freetype2.c b/plugins/text-freetype2/text-freetype2.c index a7fd9263d..b26344b26 100644 --- a/plugins/text-freetype2/text-freetype2.c +++ b/plugins/text-freetype2/text-freetype2.c @@ -68,8 +68,9 @@ void obs_module_unload(void) FT_Done_FreeType(ft2_lib); } -static const char *ft2_source_get_name(void) +static const char *ft2_source_get_name(void *unused) { + UNUSED_PARAMETER(unused); return obs_module_text("TextFreetype2"); } diff --git a/plugins/text-freetype2/text-freetype2.h b/plugins/text-freetype2/text-freetype2.h index 9122d736a..8996cb3e2 100644 --- a/plugins/text-freetype2/text-freetype2.h +++ b/plugins/text-freetype2/text-freetype2.h @@ -79,7 +79,7 @@ static uint32_t ft2_source_get_height(void *data); static obs_properties_t *ft2_source_properties(void *unused); -static const char *ft2_source_get_name(void); +static const char *ft2_source_get_name(void *unused); uint32_t get_ft2_text_width(wchar_t *text, struct ft2_source *srcdata); diff --git a/plugins/win-capture/duplicator-monitor-capture.c b/plugins/win-capture/duplicator-monitor-capture.c index f3e2a6569..e721f4ca3 100644 --- a/plugins/win-capture/duplicator-monitor-capture.c +++ b/plugins/win-capture/duplicator-monitor-capture.c @@ -60,8 +60,9 @@ static inline void update_settings(struct duplicator_capture *capture, /* ------------------------------------------------------------------------- */ -static const char *duplicator_capture_getname(void) +static const char *duplicator_capture_getname(void *unused) { + UNUSED_PARAMETER(unused); return TEXT_MONITOR_CAPTURE; } diff --git a/plugins/win-capture/game-capture.c b/plugins/win-capture/game-capture.c index 7efc9c1fd..76772b816 100644 --- a/plugins/win-capture/game-capture.c +++ b/plugins/win-capture/game-capture.c @@ -1369,8 +1369,9 @@ static uint32_t game_capture_height(void *data) return gc->active ? gc->global_hook_info->cy : 0; } -static const char *game_capture_name(void) +static const char *game_capture_name(void *unused) { + UNUSED_PARAMETER(unused); return TEXT_GAME_CAPTURE; } diff --git a/plugins/win-capture/monitor-capture.c b/plugins/win-capture/monitor-capture.c index 48b637ba3..c0adb7fa5 100644 --- a/plugins/win-capture/monitor-capture.c +++ b/plugins/win-capture/monitor-capture.c @@ -88,8 +88,9 @@ static inline void update_settings(struct monitor_capture *capture, /* ------------------------------------------------------------------------- */ -static const char *monitor_capture_getname(void) +static const char *monitor_capture_getname(void *unused) { + UNUSED_PARAMETER(unused); return TEXT_MONITOR_CAPTURE; } diff --git a/plugins/win-capture/window-capture.c b/plugins/win-capture/window-capture.c index a66bb9a1b..e93d63253 100644 --- a/plugins/win-capture/window-capture.c +++ b/plugins/win-capture/window-capture.c @@ -50,8 +50,9 @@ static void update_settings(struct window_capture *wc, obs_data_t *s) /* ------------------------------------------------------------------------- */ -static const char *wc_getname(void) +static const char *wc_getname(void *unused) { + UNUSED_PARAMETER(unused); return TEXT_WINDOW_CAPTURE; } diff --git a/plugins/win-dshow/win-dshow-encoder.cpp b/plugins/win-dshow/win-dshow-encoder.cpp index 7a8cc0789..9da1bd22c 100644 --- a/plugins/win-dshow/win-dshow-encoder.cpp +++ b/plugins/win-dshow/win-dshow-encoder.cpp @@ -42,12 +42,12 @@ struct DShowEncoder { struct encoder_packet *packet, bool *received_packet); }; -static const char *GetC985EncoderName(void) +static const char *GetC985EncoderName(void*) { return obs_module_text("Encoder.C985"); } -static const char *GetC353EncoderName(void) +static const char *GetC353EncoderName(void*) { return obs_module_text("Encoder.C353"); } diff --git a/plugins/win-dshow/win-dshow.cpp b/plugins/win-dshow/win-dshow.cpp index c228c2919..2607d3606 100644 --- a/plugins/win-dshow/win-dshow.cpp +++ b/plugins/win-dshow/win-dshow.cpp @@ -983,7 +983,7 @@ inline void DShowInput::Deactivate() /* ------------------------------------------------------------------------- */ -static const char *GetDShowInputName(void) +static const char *GetDShowInputName(void*) { return TEXT_INPUT_NAME; } diff --git a/plugins/win-mf/mf-aac.cpp b/plugins/win-mf/mf-aac.cpp index 0ca5d0315..cad3ebc4c 100644 --- a/plugins/win-mf/mf-aac.cpp +++ b/plugins/win-mf/mf-aac.cpp @@ -8,7 +8,7 @@ using namespace MFAAC; -static const char *MFAAC_GetName() +static const char *MFAAC_GetName(void*) { return obs_module_text("MFAACEnc"); } diff --git a/plugins/win-wasapi/win-wasapi.cpp b/plugins/win-wasapi/win-wasapi.cpp index cbbe45a6a..fd0286138 100644 --- a/plugins/win-wasapi/win-wasapi.cpp +++ b/plugins/win-wasapi/win-wasapi.cpp @@ -476,12 +476,12 @@ DWORD WINAPI WASAPISource::CaptureThread(LPVOID param) /* ------------------------------------------------------------------------- */ -static const char *GetWASAPIInputName(void) +static const char *GetWASAPIInputName(void*) { return obs_module_text("AudioInput"); } -static const char *GetWASAPIOutputName(void) +static const char *GetWASAPIOutputName(void*) { return obs_module_text("AudioOutput"); }