Browse Source

vlc_plugin: make vlc_plugin_cb public

This will avoid defining it in all test files. They all include vlc_plugin.h
because they need vlc_set_cb.
pull/144/head
Steve Lhomme 3 years ago
parent
commit
a8ad45a9a2
  1. 3
      include/vlc_plugin.h
  2. 3
      src/modules/modules.h
  3. 3
      test/iosvlc.m
  4. 3
      test/modules/lua/extension.c
  5. 3
      test/modules/misc/medialibrary.c
  6. 3
      test/modules/stream_out/transcode.c
  7. 3
      test/src/input/decoder/input_decoder.c
  8. 1
      test/src/input/demux-run.c
  9. 3
      test/src/misc/image.c
  10. 3
      test/src/misc/image_cvpx.c
  11. 3
      test/src/video_output/opengl.c
  12. 4
      test/src/video_output/video_output.c

3
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__)

3
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*);

3
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 };

3
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

3
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

3
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

3
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

1
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 <vlc_plugin.h>
typedef int (*vlc_plugin_cb)(int (*)(void *, void *, int, ...), void *);
extern vlc_plugin_cb vlc_static_modules[];
#ifdef HAVE_DECODERS

3
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

3
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

3
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

4
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),

Loading…
Cancel
Save