diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 1d407056f0..f0aab1309e 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -270,6 +270,9 @@ struct vlc_param; EXTERN_SYMBOL typedef int (*vlc_set_cb) (void *, void *, int, ...); +/** Plugin entry point prototype */ +typedef int (*vlc_plugin_cb) (vlc_set_cb, void *); + #define vlc_plugin_set(...) vlc_set (opaque, NULL, __VA_ARGS__) #define vlc_module_set(...) vlc_set (opaque, module, __VA_ARGS__) #define vlc_config_set(...) vlc_set (opaque, config, __VA_ARGS__) diff --git a/src/modules/modules.h b/src/modules/modules.h index 14e1c96255..6a95aace6e 100644 --- a/src/modules/modules.h +++ b/src/modules/modules.h @@ -66,9 +66,6 @@ extern struct vlc_plugin_t *vlc_plugins; #define MODULE_SHORTCUT_MAX 20 -/** Plugin entry point prototype */ -typedef int (*vlc_plugin_cb) (vlc_set_cb, void *); - /** Plugin deactivation callback */ typedef void (*vlc_deactivate_cb)(vlc_object_t*); diff --git a/test/iosvlc.m b/test/iosvlc.m index f95fa5fee2..88178d6573 100644 --- a/test/iosvlc.m +++ b/test/iosvlc.m @@ -160,8 +160,5 @@ vlc_module_begin() set_callback(Open) vlc_module_end() -/* Inject the glue interface as a static module */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - __attribute__((visibility("default"))) vlc_plugin_cb vlc_static_modules[] = { vlc_entry__ios_interface, NULL }; diff --git a/test/modules/lua/extension.c b/test/modules/lua/extension.c index 2c7311518b..78574ef575 100644 --- a/test/modules/lua/extension.c +++ b/test/modules/lua/extension.c @@ -127,9 +127,6 @@ vlc_module_begin() set_capability("interface", 0) vlc_module_end() -/* Helper typedef for vlc_static_modules */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - VLC_EXPORT const vlc_plugin_cb vlc_static_modules[] = { VLC_SYMBOL(vlc_entry), NULL diff --git a/test/modules/misc/medialibrary.c b/test/modules/misc/medialibrary.c index 280ca5b62f..b34dd7d4b4 100644 --- a/test/modules/misc/medialibrary.c +++ b/test/modules/misc/medialibrary.c @@ -92,9 +92,6 @@ vlc_module_begin() set_capability("interface", 0) vlc_module_end() -/* Helper typedef for vlc_static_modules */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - VLC_EXPORT const vlc_plugin_cb vlc_static_modules[] = { VLC_SYMBOL(vlc_entry), NULL diff --git a/test/modules/stream_out/transcode.c b/test/modules/stream_out/transcode.c index 28ed1842d6..32d2b96e41 100644 --- a/test/modules/stream_out/transcode.c +++ b/test/modules/stream_out/transcode.c @@ -395,9 +395,6 @@ vlc_module_begin() vlc_module_end() -/* Helper typedef for vlc_static_modules */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - VLC_EXPORT const vlc_plugin_cb vlc_static_modules[] = { VLC_SYMBOL(vlc_entry), NULL diff --git a/test/src/input/decoder/input_decoder.c b/test/src/input/decoder/input_decoder.c index 6c54fdf4ee..d83e7689a0 100644 --- a/test/src/input/decoder/input_decoder.c +++ b/test/src/input/decoder/input_decoder.c @@ -324,9 +324,6 @@ vlc_module_begin() vlc_module_end() -/* Helper typedef for vlc_static_modules */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - VLC_EXPORT vlc_plugin_cb vlc_static_modules[] = { VLC_SYMBOL(vlc_entry), NULL diff --git a/test/src/input/demux-run.c b/test/src/input/demux-run.c index a3bfc5b3e6..4cdd3bba66 100644 --- a/test/src/input/demux-run.c +++ b/test/src/input/demux-run.c @@ -394,7 +394,6 @@ int vlc_demux_process_memory(const struct vlc_run_args *args, #ifdef HAVE_STATIC_MODULES # include -typedef int (*vlc_plugin_cb)(int (*)(void *, void *, int, ...), void *); extern vlc_plugin_cb vlc_static_modules[]; #ifdef HAVE_DECODERS diff --git a/test/src/misc/image.c b/test/src/misc/image.c index 8a1a22e8c9..7173fba26d 100644 --- a/test/src/misc/image.c +++ b/test/src/misc/image.c @@ -140,9 +140,6 @@ vlc_module_begin() vlc_module_end() -/* Helper typedef for vlc_static_modules */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - VLC_EXPORT const vlc_plugin_cb vlc_static_modules[] = { VLC_SYMBOL(vlc_entry), NULL diff --git a/test/src/misc/image_cvpx.c b/test/src/misc/image_cvpx.c index 5fd27c061f..90df69d119 100644 --- a/test/src/misc/image_cvpx.c +++ b/test/src/misc/image_cvpx.c @@ -96,9 +96,6 @@ vlc_module_begin() set_capability("interface", 0) vlc_module_end() -/* Helper typedef for vlc_static_modules */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - VLC_EXPORT const vlc_plugin_cb vlc_static_modules[] = { VLC_SYMBOL(vlc_entry), NULL diff --git a/test/src/video_output/opengl.c b/test/src/video_output/opengl.c index e4c25e6e4a..3d9a51706a 100644 --- a/test/src/video_output/opengl.c +++ b/test/src/video_output/opengl.c @@ -167,9 +167,6 @@ static int OpenOpenGLESOffscreen(vlc_gl_t *gl, unsigned width, unsigned height) { return OpenOpenGLCommon(gl, width, height, true, VLC_OPENGL_ES2); }; -/* Helper typedef for vlc_static_modules */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - /** * Inject the mocked modules as a static plugin: * - decoder device for generating video context and testing release diff --git a/test/src/video_output/video_output.c b/test/src/video_output/video_output.c index 15c701e00e..391c706efd 100644 --- a/test/src/video_output/video_output.c +++ b/test/src/video_output/video_output.c @@ -284,10 +284,6 @@ vlc_module_begin() vlc_module_end() -/* Helper typedef for vlc_static_modules */ -typedef int (*vlc_plugin_cb)(vlc_set_cb, void*); - - VLC_EXPORT const vlc_plugin_cb vlc_static_modules[]; const vlc_plugin_cb vlc_static_modules[] = { VLC_SYMBOL(vlc_entry),