Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
  • abdsaber000/vlc
404 results
Show changes
Commits on Source (8)
Showing
with 46 additions and 81 deletions
......@@ -233,6 +233,8 @@ enum vlc_config_subcat
/* I need to do _this_ to change « foo bar » to « module_foo_bar » ! */
#define CONCATENATE( y, z ) CRUDE_HACK( y, z )
#define CRUDE_HACK( y, z ) y##__##z
#define STRINGIFY_NAME_( z ) #z
#define STRINGIFY_NAME( z ) STRINGIFY_NAME_( z )
#if defined(__cplusplus)
#define EXTERN_SYMBOL extern "C"
......@@ -240,9 +242,13 @@ enum vlc_config_subcat
#define EXTERN_SYMBOL
#endif
#if !defined(MODULE_STRING) && defined(MODULE_NAME)
# define MODULE_STRING STRINGIFY_NAME(MODULE_NAME)
#endif
/* If the module is built-in, then we need to define foo_InitModule instead
* of InitModule. Same for Activate- and DeactivateModule. */
#ifdef __PLUGIN__
#ifdef VLC_DYNAMIC_PLUGIN
# define VLC_SYMBOL(symbol) symbol
# define VLC_MODULE_NAME_HIDDEN_SYMBOL \
EXTERN_SYMBOL const char vlc_module_name[] = MODULE_STRING;
......@@ -252,7 +258,7 @@ enum vlc_config_subcat
#endif
#define CDECL_SYMBOL
#if defined (__PLUGIN__)
#if defined (VLC_DYNAMIC_PLUGIN)
# if defined (_WIN32)
# define DLL_SYMBOL __declspec(dllexport)
# undef CDECL_SYMBOL
......@@ -270,6 +276,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__)
......@@ -404,7 +413,7 @@ VLC_METADATA_EXPORTS
#define set_section( text, longtext ) \
add_typedesc_inner( CONFIG_SECTION, text, longtext )
#ifndef __PLUGIN__
#ifndef VLC_DYNAMIC_PLUGIN
#define add_category_hint(text, longtext) \
add_typedesc_inner( CONFIG_HINT_CATEGORY, text, longtext )
#endif
......@@ -435,7 +444,7 @@ VLC_METADATA_EXPORTS
add_string_inner(CONFIG_ITEM_MODULE_LIST, name, text, longtext, value) \
vlc_config_set (VLC_CONFIG_CAPABILITY, VLC_CHECKED_TYPE(const char *, cap));
#ifndef __PLUGIN__
#ifndef VLC_DYNAMIC_PLUGIN
#define add_module_cat(name, subcategory, value, text, longtext) \
add_string_inner(CONFIG_ITEM_MODULE_CAT, name, text, longtext, value) \
change_integer_range (subcategory /* gruik */, 0);
......
......@@ -20,7 +20,7 @@ MODULE_NAME = $$(p="$@"; p=$$(echo "$$p"|sed 's/lib//g'); p="$${p%_plugin*}"; p=
AM_CPPFLAGS = -DMODULE_STRING=\"$(MODULE_STRING)\"
if HAVE_DYNAMIC_PLUGINS
AM_CPPFLAGS += -D__PLUGIN__
AM_CPPFLAGS += -DVLC_DYNAMIC_PLUGIN
else
AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_NAME)
endif
......
......@@ -282,7 +282,7 @@ foreach module : vlc_modules
common_args = [
'-DMODULE_STRING="@0@"'.format(module['name']),
'-D__PLUGIN__'
'-DVLC_DYNAMIC_PLUGIN'
]
library(module['name'] + '_plugin',
......
......@@ -24,6 +24,7 @@
# define LIBVLC_MODULES_H 1
# include <stdatomic.h>
# include <vlc_plugin.h>
struct vlc_param;
......@@ -65,14 +66,11 @@ extern struct vlc_plugin_t *vlc_plugins;
#define MODULE_SHORTCUT_MAX 20
/** Plugin entry point prototype */
typedef int (*vlc_plugin_cb) (int (*)(void *, void *, int, ...), void *);
/** Plugin deactivation callback */
typedef void (*vlc_deactivate_cb)(vlc_object_t*);
/** Core module */
int vlc_entry__core (int (*)(void *, void *, int, ...), void *);
int vlc_entry__core (vlc_set_cb, void *);
/**
* Internal module descriptor
......
......@@ -13,7 +13,7 @@ Name: VLC plugin API
Description: VLC media player plugin interface
Version: @VERSION@
Cflags: -I${includedir} -I${pkgincludedir}/plugins \
-D__PLUGIN__ \
-DVLC_DYNAMIC_PLUGIN \
-D_FILE_OFFSET_BITS=64 \
@DEFS_BIGENDIAN@
Libs: -L${libdir} -lvlccore
......
......@@ -25,6 +25,10 @@
# include "config.h"
#endif
#define MODULE_NAME ios_interface
#define MODULE_STRING "ios_interface"
#undef VLC_DYNAMIC_PLUGINS
#import <UIKit/UIKit.h>
#include <vlc/vlc.h>
......@@ -153,15 +157,12 @@ static int Open(vlc_object_t *obj)
return VLC_SUCCESS;
}
#define MODULE_NAME ios_interface
#define MODULE_STRING "ios_interface"
vlc_module_begin()
set_capability("interface", 0)
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 };
VLC_EXPORT const vlc_plugin_cb vlc_static_modules[] = {
VLC_SYMBOL(vlc_entry),
NULL
};
......@@ -27,7 +27,7 @@
/* Define a builtin module for mocked parts */
#define MODULE_NAME test_lua_extension
#define MODULE_STRING "test_lua_extension"
#undef __PLUGIN__
#undef VLC_DYNAMIC_PLUGIN
const char vlc_module_name[] = MODULE_STRING;
#include "../../libvlc/test.h"
......@@ -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
......
......@@ -27,7 +27,7 @@
/* Define a builtin module for mocked parts */
#define MODULE_NAME test_misc_medialibrary
#define MODULE_STRING "test_misc_medialibrary"
#undef __PLUGIN__
#undef VLC_DYNAMIC_PLUGIN
const char vlc_module_name[] = MODULE_STRING;
#include "../../libvlc/test.h"
......@@ -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
......
......@@ -27,7 +27,7 @@
/* Define a builtin module for mocked parts */
#define MODULE_NAME test_transcode_mock
#define MODULE_STRING "test_transcode_mock"
#undef __PLUGIN__
#undef VLC_DYNAMIC_PLUGIN
static const char dec_dev_arg[] = "--dec-dev=" MODULE_STRING;
......@@ -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
......
......@@ -20,10 +20,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#define MODULE_NAME test_transcode_mock
#define MODULE_STRING "test_transcode_mock"
#undef __PLUGIN__
#include <vlc_fourcc.h>
#define TEST_FLAG_CONVERTER 0x01
......
......@@ -24,10 +24,6 @@
# include "config.h"
#endif
#define MODULE_NAME test_transcode_mock
#define MODULE_STRING "test_transcode_mock"
#undef __PLUGIN__
#include <vlc_common.h>
#include <vlc_frame.h>
......
......@@ -27,7 +27,7 @@
/* Define a builtin module for mocked parts */
#define MODULE_NAME test_input_decoder_mock
#define MODULE_STRING "test_input_decoder_mock"
#undef __PLUGIN__
#undef VLC_DYNAMIC_PLUGIN
const char vlc_module_name[] = MODULE_STRING;
......@@ -324,10 +324,7 @@ 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_EXPORT const vlc_plugin_cb vlc_static_modules[] = {
VLC_SYMBOL(vlc_entry),
NULL
};
......
......@@ -24,9 +24,7 @@
# include "config.h"
#endif
#define MODULE_NAME test_input_decoder_mock
#define MODULE_STRING "test_input_decoder_mock"
#undef __PLUGIN__
#include <vlc_common.h>
#include <vlc_messages.h>
......
......@@ -394,9 +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
#define DECODER_PLUGINS(f) \
f(codec_adpcm) \
......@@ -481,13 +478,15 @@ extern vlc_plugin_cb vlc_static_modules[];
#endif
#define DECL_PLUGIN(p) \
int vlc_entry__##p(int (*)(void *, void *, int, ...), void *);
vlc_plugin_cb CONCATENATE(vlc_entry,p);
#define FUNC_PLUGIN(p) \
vlc_entry__##p,
CONCATENATE(vlc_entry,p),
PLUGINS(DECL_PLUGIN)
__attribute__((visibility("default")))
vlc_plugin_cb vlc_static_modules[] = { PLUGINS(FUNC_PLUGIN) NULL };
VLC_EXPORT const vlc_plugin_cb vlc_static_modules[] = {
PLUGINS(FUNC_PLUGIN)
NULL
};
#endif /* HAVE_STATIC_MODULES */
......@@ -27,7 +27,7 @@
/* Define a builtin module for mocked parts */
#define MODULE_NAME test_misc_image
#define MODULE_STRING "test_misc_image"
#undef __PLUGIN__
#undef VLC_DYNAMIC_PLUGIN
const char vlc_module_name[] = MODULE_STRING;
#include "../../libvlc/test.h"
......@@ -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
......
......@@ -27,7 +27,7 @@
/* Define a builtin module for mocked parts */
#define MODULE_NAME test_misc_image_cvpx
#define MODULE_STRING "test_misc_image_cvpx"
#undef __PLUGIN__
#undef VLC_DYNAMIC_PLUGIN
const char vlc_module_name[] = MODULE_STRING;
#include "../../libvlc/test.h"
......@@ -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
......
......@@ -25,7 +25,7 @@
/* Define a builtin module for mocked parts */
#define MODULE_NAME test_offscreen_mock
#define MODULE_STRING "test_offscreen_mock"
#undef __PLUGIN__
#undef VLC_DYNAMIC_PLUGIN
#include "../../libvlc/test.h"
#include "../../../lib/libvlc_internal.h"
......@@ -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
......@@ -201,8 +198,10 @@ vlc_module_begin()
set_capability("opengl es2 offscreen", 1)
vlc_module_end()
VLC_EXPORT vlc_plugin_cb
vlc_static_modules[] = { vlc_entry__test_offscreen_mock, NULL };
VLC_EXPORT vlc_plugin_cb vlc_static_modules[] = {
VLC_SYMBOL(vlc_entry),
NULL
};
static void test_opengl_offscreen(vlc_object_t *root, enum vlc_gl_api_type api_type)
{
......
......@@ -27,7 +27,7 @@
/* Define a builtin module for mocked parts */
#define MODULE_NAME test_vout_mock
#define MODULE_STRING "test_vout_mock"
#undef __PLUGIN__
#undef VLC_DYNAMIC_PLUGIN
static const char dec_dev_arg[] = "--dec-dev=" MODULE_STRING;
......@@ -284,12 +284,7 @@ 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_EXPORT const vlc_plugin_cb vlc_static_modules[] = {
VLC_SYMBOL(vlc_entry),
NULL
};
......
......@@ -20,10 +20,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#define MODULE_NAME test_vout_mock
#define MODULE_STRING "test_vout_mock"
#undef __PLUGIN__
#include <vlc_fourcc.h>
#include <vlc_vout_display.h>
......
......@@ -24,10 +24,6 @@
# include "config.h"
#endif
#define MODULE_NAME test_vout_mock
#define MODULE_STRING "test_vout_mock"
#undef __PLUGIN__
#include <vlc_common.h>
#include "video_output.h"
......