[vlc-devel] [PATCH 2/2] Use set_callback() where applicable
Rémi Denis-Courmont
remi at remlab.net
Wed Jul 17 22:26:32 CEST 2019
---
include/vlc_renderer_discovery.h | 2 +-
include/vlc_services_discovery.h | 2 +-
modules/access/idummy.c | 2 +-
modules/access/sdp.c | 2 +-
modules/access/timecode.c | 2 +-
modules/access_output/dummy.c | 2 +-
modules/arm_neon/chroma_yuv.c | 2 +-
modules/arm_neon/volume.c | 2 +-
modules/arm_neon/yuv_rgb.c | 2 +-
modules/audio_filter/channel_mixer/simple.c | 2 +-
modules/audio_filter/converter/format.c | 2 +-
modules/audio_filter/karaoke.c | 2 +-
modules/audio_filter/resampler/ugly.c | 4 ++--
modules/audio_mixer/float.c | 2 +-
modules/audio_mixer/integer.c | 2 +-
modules/audio_output/adummy.c | 2 +-
modules/audio_output/directsound.c | 2 +-
modules/audio_output/file.c | 2 +-
modules/audio_output/wasapi.c | 2 +-
modules/codec/araw.c | 2 +-
modules/codec/avcodec/d3d11va.c | 2 +-
modules/codec/avcodec/dxva2.c | 2 +-
modules/codec/avcodec/vaapi.c | 2 +-
modules/codec/g711.c | 2 +-
modules/codec/rtpvideo.c | 2 +-
modules/codec/spdif.c | 2 +-
modules/codec/substx3g.c | 2 +-
modules/codec/xwd.c | 2 +-
modules/control/dummy.c | 2 +-
modules/demux/aiff.c | 2 +-
modules/demux/au.c | 2 +-
modules/demux/cdg.c | 2 +-
modules/demux/directory.c | 2 +-
modules/demux/filter/noseek.c | 2 +-
modules/demux/mjpeg.c | 2 +-
modules/demux/playlist/playlist.c | 24 ++++++++++-----------
modules/demux/voc.c | 2 +-
modules/demux/xa.c | 2 +-
modules/gui/macosx/main/macosx.m | 2 +-
modules/gui/minimal_macosx/macosx.c | 2 +-
modules/gui/qt/qt.cpp | 2 +-
modules/gui/skins2/src/skin_main.cpp | 2 +-
modules/hw/vdpau/avcodec.c | 2 +-
modules/hw/vdpau/chroma.c | 2 +-
modules/keystore/keychain.m | 2 +-
modules/logger/android.c | 2 +-
modules/logger/console.c | 2 +-
modules/logger/file.c | 2 +-
modules/logger/journal.c | 2 +-
modules/logger/syslog.c | 2 +-
modules/lua/vlc.c | 6 +++---
modules/meta_engine/folder.c | 2 +-
modules/meta_engine/taglib.cpp | 4 ++--
modules/misc/addons/vorepository.c | 2 +-
modules/misc/gnutls.c | 4 ++--
modules/misc/playlist/export.c | 8 +++----
modules/misc/securetransport.c | 4 ++--
modules/misc/stats.c | 8 +++----
modules/services_discovery/os2drive.c | 2 +-
modules/services_discovery/windrive.c | 2 +-
modules/stream_filter/accesstweaks.c | 2 +-
modules/stream_filter/adf.c | 2 +-
modules/stream_out/chromecast/cast.cpp | 2 +-
modules/stream_out/dummy.c | 2 +-
modules/text_renderer/tdummy.c | 2 +-
modules/video_chroma/grey_yuv.c | 2 +-
modules/video_chroma/i420_yuy2.c | 2 +-
modules/video_chroma/i422_i420.c | 2 +-
modules/video_chroma/i422_yuy2.c | 2 +-
modules/video_chroma/omxdl.c | 2 +-
modules/video_chroma/rv32.c | 2 +-
modules/video_chroma/yuy2_i420.c | 2 +-
modules/video_chroma/yuy2_i422.c | 2 +-
modules/video_filter/scale.c | 2 +-
modules/video_filter/wave.c | 2 +-
modules/video_output/android/window.c | 2 +-
modules/video_output/drawable.c | 2 +-
modules/video_output/vdummy.c | 4 ++--
modules/video_output/wayland/xdg-shell.c | 2 +-
modules/video_output/wdummy.c | 2 +-
modules/video_output/wextern.c | 2 +-
modules/video_output/win32/window.c | 2 +-
modules/video_output/xcb/window.c | 4 ++--
83 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/include/vlc_renderer_discovery.h b/include/vlc_renderer_discovery.h
index 8c13a4a9da..e703551e5f 100644
--- a/include/vlc_renderer_discovery.h
+++ b/include/vlc_renderer_discovery.h
@@ -212,7 +212,7 @@ static int vlc_rd_probe_open(vlc_object_t *obj) \
#define VLC_RD_PROBE_SUBMODULE \
add_submodule() \
set_capability("renderer probe", 100) \
- set_callbacks(vlc_rd_probe_open, NULL)
+ set_callback(vlc_rd_probe_open)
/** @} @} */
diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index e7b0e7b6e1..4b308d6bc7 100644
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -223,7 +223,7 @@ VLC_API int vlc_sd_probe_Add(vlc_probe_t *, const char *, const char *, int cate
#define VLC_SD_PROBE_SUBMODULE \
add_submodule() \
set_capability( "services probe", 100 ) \
- set_callbacks( vlc_sd_probe_Open, NULL )
+ set_callback( vlc_sd_probe_Open)
#define VLC_SD_PROBE_HELPER(name, longname, cat) \
static int vlc_sd_probe_Open (vlc_object_t *obj) \
diff --git a/modules/access/idummy.c b/modules/access/idummy.c
index 1b599257f0..7dad806f0e 100644
--- a/modules/access/idummy.c
+++ b/modules/access/idummy.c
@@ -40,7 +40,7 @@ vlc_module_begin ()
set_shortname( N_("Dummy") )
set_description( N_("Dummy input") )
set_capability( "access", 0 )
- set_callbacks( OpenDemux, NULL )
+ set_callback( OpenDemux)
add_shortcut( "dummy", "vlc" )
vlc_module_end ()
diff --git a/modules/access/sdp.c b/modules/access/sdp.c
index 2600411e18..c30a84b9ea 100644
--- a/modules/access/sdp.c
+++ b/modules/access/sdp.c
@@ -38,7 +38,7 @@ vlc_module_begin ()
set_subcategory (SUBCAT_INPUT_ACCESS)
set_capability ("access", 0)
- set_callbacks (Open, NULL)
+ set_callback(Open)
add_shortcut ("sdp")
vlc_module_end()
diff --git a/modules/access/timecode.c b/modules/access/timecode.c
index d2c5819d84..a365a1a557 100644
--- a/modules/access/timecode.c
+++ b/modules/access/timecode.c
@@ -44,7 +44,7 @@ vlc_module_begin ()
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
set_capability ("access", 0)
- set_callbacks (Open, NULL)
+ set_callback(Open)
add_string ("timecode-fps", "25/1", FPS_TEXT, FPS_TEXT, false)
change_string_list (fps_values, fps_texts)
diff --git a/modules/access_output/dummy.c b/modules/access_output/dummy.c
index 863953228a..ec26b3609b 100644
--- a/modules/access_output/dummy.c
+++ b/modules/access_output/dummy.c
@@ -45,7 +45,7 @@ vlc_module_begin ()
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_ACO )
add_shortcut( "dummy" )
- set_callbacks( Open, NULL )
+ set_callback( Open)
vlc_module_end ()
diff --git a/modules/arm_neon/chroma_yuv.c b/modules/arm_neon/chroma_yuv.c
index ae971bef08..53fe0f86f5 100644
--- a/modules/arm_neon/chroma_yuv.c
+++ b/modules/arm_neon/chroma_yuv.c
@@ -34,7 +34,7 @@ static int Open (vlc_object_t *);
vlc_module_begin ()
set_description (N_("ARM NEON video chroma conversions"))
set_capability ("video converter", 250)
- set_callbacks (Open, NULL)
+ set_callback(Open)
vlc_module_end ()
#define DEFINE_PACK(pack, pict) \
diff --git a/modules/arm_neon/volume.c b/modules/arm_neon/volume.c
index 3497387032..314df7ad42 100644
--- a/modules/arm_neon/volume.c
+++ b/modules/arm_neon/volume.c
@@ -37,7 +37,7 @@ vlc_module_begin()
set_subcategory(SUBCAT_AUDIO_MISC)
set_description(N_("ARM NEON audio volume"))
set_capability("audio volume", 10)
- set_callbacks(Probe, NULL)
+ set_callback(Probe)
vlc_module_end()
static void AmplifyFloat(audio_volume_t *, block_t *, float);
diff --git a/modules/arm_neon/yuv_rgb.c b/modules/arm_neon/yuv_rgb.c
index d710d309ab..84b5328d76 100644
--- a/modules/arm_neon/yuv_rgb.c
+++ b/modules/arm_neon/yuv_rgb.c
@@ -35,7 +35,7 @@ static int Open (vlc_object_t *);
vlc_module_begin ()
set_description (N_("ARM NEON video chroma YUV->RGBA"))
set_capability ("video converter", 250)
- set_callbacks (Open, NULL)
+ set_callback(Open)
vlc_module_end ()
/*
diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 8b3feb7a31..3112625a6c 100644
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -43,7 +43,7 @@ vlc_module_begin ()
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_capability( "audio converter", 10 )
- set_callbacks( OpenFilter, NULL );
+ set_callback( OpenFilter);
vlc_module_end ()
static block_t *Filter( filter_t *, block_t * );
diff --git a/modules/audio_filter/converter/format.c b/modules/audio_filter/converter/format.c
index 2178668b31..d50d095a37 100644
--- a/modules/audio_filter/converter/format.c
+++ b/modules/audio_filter/converter/format.c
@@ -49,7 +49,7 @@ vlc_module_begin()
set_category(CAT_AUDIO)
set_subcategory(SUBCAT_AUDIO_MISC)
set_capability("audio converter", 1)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end()
/*****************************************************************************
diff --git a/modules/audio_filter/karaoke.c b/modules/audio_filter/karaoke.c
index cd89e1c5e6..62967e5cec 100644
--- a/modules/audio_filter/karaoke.c
+++ b/modules/audio_filter/karaoke.c
@@ -36,7 +36,7 @@ vlc_module_begin ()
set_subcategory (SUBCAT_AUDIO_AFILTER)
set_capability ("audio filter", 0)
- set_callbacks (Open, NULL)
+ set_callback(Open)
vlc_module_end ()
static block_t *Process (filter_t *, block_t *);
diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index a802cc9ae3..f724589c79 100644
--- a/modules/audio_filter/resampler/ugly.c
+++ b/modules/audio_filter/resampler/ugly.c
@@ -49,11 +49,11 @@ vlc_module_begin ()
set_capability( "audio converter", 2 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_RESAMPLER )
- set_callbacks( Create, NULL )
+ set_callback( Create)
add_submodule()
set_capability( "audio resampler", 2 )
- set_callbacks( CreateResampler, NULL )
+ set_callback( CreateResampler)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/audio_mixer/float.c b/modules/audio_mixer/float.c
index a747ceb47e..a35874ddda 100644
--- a/modules/audio_mixer/float.c
+++ b/modules/audio_mixer/float.c
@@ -47,7 +47,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_AUDIO_MISC )
set_description( N_("Single precision audio volume") )
set_capability( "audio volume", 10 )
- set_callbacks( Create, NULL )
+ set_callback( Create)
vlc_module_end ()
/**
diff --git a/modules/audio_mixer/integer.c b/modules/audio_mixer/integer.c
index 73f3f0303e..4388062bc2 100644
--- a/modules/audio_mixer/integer.c
+++ b/modules/audio_mixer/integer.c
@@ -37,7 +37,7 @@ vlc_module_begin ()
set_subcategory (SUBCAT_AUDIO_MISC)
set_description (N_("Integer audio volume"))
set_capability ("audio volume", 9)
- set_callbacks (Activate, NULL)
+ set_callback(Activate)
vlc_module_end ()
static void FilterS32N (audio_volume_t *vol, block_t *block, float volume)
diff --git a/modules/audio_output/adummy.c b/modules/audio_output/adummy.c
index 0a804b9eb0..8f467eb4f5 100644
--- a/modules/audio_output/adummy.c
+++ b/modules/audio_output/adummy.c
@@ -35,7 +35,7 @@ vlc_module_begin ()
set_shortname( N_("Dummy") )
set_description( N_("Dummy audio output") )
set_capability( "audio output", 0 )
- set_callbacks( Open, NULL )
+ set_callback( Open)
add_shortcut( "dummy" )
vlc_module_end ()
diff --git a/modules/audio_output/directsound.c b/modules/audio_output/directsound.c
index fe8ca09ef3..d06ac2510f 100644
--- a/modules/audio_output/directsound.c
+++ b/modules/audio_output/directsound.c
@@ -90,7 +90,7 @@ vlc_module_begin ()
add_submodule()
set_capability( "aout stream", 30 )
- set_callbacks( StreamStart, NULL )
+ set_callback( StreamStart)
vlc_module_end ()
typedef struct aout_stream_sys
diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 906b228548..68b0a65ab6 100644
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -125,7 +125,7 @@ vlc_module_begin ()
set_capability( "audio output", 0 )
add_shortcut( "file", "audiofile" )
- set_callbacks( Open, NULL )
+ set_callback( Open)
vlc_module_end ()
static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 4f5ef0fd1d..c479f8b5bd 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -647,5 +647,5 @@ vlc_module_begin()
set_capability("aout stream", 50)
set_category(CAT_AUDIO)
set_subcategory(SUBCAT_AUDIO_AOUT)
- set_callbacks(Start, NULL)
+ set_callback(Start)
vlc_module_end()
diff --git a/modules/codec/araw.c b/modules/codec/araw.c
index c73deded85..09293c7e76 100644
--- a/modules/codec/araw.c
+++ b/modules/codec/araw.c
@@ -58,7 +58,7 @@ vlc_module_begin ()
add_submodule ()
set_description( N_("Raw audio encoder") )
set_capability( "encoder", 150 )
- set_callbacks( EncoderOpen, NULL )
+ set_callback( EncoderOpen)
#endif
vlc_module_end ()
diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 9ceea6c32d..6823b8d2fb 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -66,7 +66,7 @@ vlc_module_begin()
set_capability("hw decoder", 110)
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_VCODEC)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end()
/*
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 7c521d4575..ca45421d3c 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -53,7 +53,7 @@ vlc_module_begin()
set_capability("hw decoder", 100)
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_VCODEC)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end()
#include <initguid.h> /* must be last included to not redefine existing GUIDs */
diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 44f4891248..5b45e153f2 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -218,7 +218,7 @@ error:
vlc_module_begin ()
set_description( N_("VA-API video decoder") )
set_capability( "hw decoder", 100 )
- set_callbacks( Create, NULL )
+ set_callback( Create)
add_shortcut( "vaapi" )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_VCODEC )
diff --git a/modules/codec/g711.c b/modules/codec/g711.c
index 57dfdf9a68..1a9386d232 100644
--- a/modules/codec/g711.c
+++ b/modules/codec/g711.c
@@ -52,7 +52,7 @@ vlc_module_begin ()
add_submodule ()
set_description( N_("G.711 encoder") )
set_capability( "encoder", 150 )
- set_callbacks( EncoderOpen, NULL )
+ set_callback( EncoderOpen)
#endif
vlc_module_end ()
diff --git a/modules/codec/rtpvideo.c b/modules/codec/rtpvideo.c
index 8ce4de8238..e10321e6c9 100644
--- a/modules/codec/rtpvideo.c
+++ b/modules/codec/rtpvideo.c
@@ -45,7 +45,7 @@ vlc_module_begin ()
set_capability( "encoder", 50 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_VCODEC )
- set_callbacks( OpenEncoder, NULL )
+ set_callback( OpenEncoder)
add_shortcut( "rtpvideo" )
vlc_module_end ()
diff --git a/modules/codec/spdif.c b/modules/codec/spdif.c
index edb3e899e4..093d862c7b 100644
--- a/modules/codec/spdif.c
+++ b/modules/codec/spdif.c
@@ -35,7 +35,7 @@ vlc_module_begin()
set_subcategory(SUBCAT_INPUT_ACODEC)
set_description(N_("S/PDIF pass-through decoder"))
set_capability("audio decoder", 120)
- set_callbacks(OpenDecoder, NULL)
+ set_callback(OpenDecoder)
vlc_module_end()
static int
diff --git a/modules/codec/substx3g.c b/modules/codec/substx3g.c
index ebb650a0b8..157736e25b 100644
--- a/modules/codec/substx3g.c
+++ b/modules/codec/substx3g.c
@@ -54,7 +54,7 @@ vlc_module_begin ()
set_description( N_("tx3g subtitles encoder") )
set_shortname( N_("tx3g subtitles encoder") )
set_capability( "encoder", 101 )
- set_callbacks( OpenEncoder, NULL )
+ set_callback( OpenEncoder)
#endif
vlc_module_end ()
diff --git a/modules/codec/xwd.c b/modules/codec/xwd.c
index ba54bf7343..eb3bb55564 100644
--- a/modules/codec/xwd.c
+++ b/modules/codec/xwd.c
@@ -39,7 +39,7 @@ vlc_module_begin()
set_capability("video decoder", 50)
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_VCODEC)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end()
static int Decode(decoder_t *, block_t *);
diff --git a/modules/control/dummy.c b/modules/control/dummy.c
index cf0836e433..1cbe42dc37 100644
--- a/modules/control/dummy.c
+++ b/modules/control/dummy.c
@@ -39,7 +39,7 @@ vlc_module_begin ()
set_shortname( N_("Dummy") )
set_description( N_("Dummy interface") )
set_capability( "interface", 0 )
- set_callbacks( Open, NULL )
+ set_callback( Open)
#if defined(_WIN32) && !VLC_WINSTORE_APP
add_obsolete_bool( "dummy-quiet" )
#endif
diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c
index 857ccd0482..b5ffc90369 100644
--- a/modules/demux/aiff.c
+++ b/modules/demux/aiff.c
@@ -47,7 +47,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_DEMUX )
set_description( N_("AIFF demuxer" ) )
set_capability( "demux", 10 )
- set_callbacks( Open, NULL )
+ set_callback( Open)
add_shortcut( "aiff" )
vlc_module_end ()
diff --git a/modules/demux/au.c b/modules/demux/au.c
index 0a09f31d35..fbf0f88942 100644
--- a/modules/demux/au.c
+++ b/modules/demux/au.c
@@ -48,7 +48,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_DEMUX )
set_description( N_("AU demuxer") )
set_capability( "demux", 10 )
- set_callbacks( Open, NULL )
+ set_callback( Open)
add_shortcut( "au" )
vlc_module_end ()
diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c
index 21005d95b2..c371414c83 100644
--- a/modules/demux/cdg.c
+++ b/modules/demux/cdg.c
@@ -42,7 +42,7 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
set_capability( "demux", 3 )
- set_callbacks( Open, NULL )
+ set_callback( Open)
add_shortcut( "cdg", "subtitle" )
vlc_module_end ()
diff --git a/modules/demux/directory.c b/modules/demux/directory.c
index 874760ea08..58f406482c 100644
--- a/modules/demux/directory.c
+++ b/modules/demux/directory.c
@@ -92,5 +92,5 @@ vlc_module_begin()
set_description( N_("Directory import") )
add_shortcut( "directory" )
set_capability( "demux", 10 )
- set_callbacks( Import_Dir, NULL )
+ set_callback( Import_Dir)
vlc_module_end()
diff --git a/modules/demux/filter/noseek.c b/modules/demux/filter/noseek.c
index 23ae9f2d45..906da61f78 100644
--- a/modules/demux/filter/noseek.c
+++ b/modules/demux/filter/noseek.c
@@ -76,5 +76,5 @@ vlc_module_begin ()
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_STREAM_FILTER)
set_capability("demux_filter", 0)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end()
diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index bdbaea2e93..f17cfbd149 100644
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -50,7 +50,7 @@ vlc_module_begin ()
set_shortname( "MJPEG")
set_description( N_("M-JPEG camera demuxer") )
set_capability( "demux", 5 )
- set_callbacks( Open, NULL )
+ set_callback( Open)
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
add_float( "mjpeg-fps", 0.0, FPS_TEXT, FPS_LONGTEXT, false )
diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 30dcfa4733..ce28549d9d 100644
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -66,30 +66,30 @@ vlc_module_begin ()
set_description( N_("M3U playlist import") )
add_shortcut( "m3u", "m3u8" )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_M3U, NULL )
+ set_callback( Import_M3U)
add_submodule ()
set_description( N_("RAM playlist import") )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_RAM, NULL )
+ set_callback( Import_RAM)
add_submodule ()
set_description( N_("PLS playlist import") )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_PLS, NULL )
+ set_callback( Import_PLS)
add_submodule ()
set_description( N_("B4S playlist import") )
add_shortcut( "shout-b4s" )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_B4S, NULL )
+ set_callback( Import_B4S)
add_submodule ()
set_description( N_("DVB playlist import") )
add_shortcut( "dvb" )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_DVB, NULL )
+ set_callback( Import_DVB)
add_submodule ()
set_description( N_("Podcast parser") )
add_shortcut( "podcast" )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_podcast, NULL )
+ set_callback( Import_podcast)
add_submodule ()
set_description( N_("XSPF playlist import") )
set_capability( "stream_filter", 310 )
@@ -97,7 +97,7 @@ vlc_module_begin ()
add_submodule ()
set_description( N_("ASX playlist import") )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_ASX, NULL )
+ set_callback( Import_ASX)
add_submodule ()
set_description( N_("Kasenna MediaBase parser") )
add_shortcut( "sgimb" )
@@ -107,24 +107,24 @@ vlc_module_begin ()
set_description( N_("QuickTime Media Link importer") )
add_shortcut( "qtl" )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_QTL, NULL )
+ set_callback( Import_QTL)
add_submodule ()
set_description( N_("Dummy IFO demux") )
set_capability( "stream_filter", 312 )
- set_callbacks( Import_IFO, NULL )
+ set_callback( Import_IFO)
add_submodule ()
set_description( N_("Dummy BDMV demux") )
set_capability( "stream_filter", 312 )
- set_callbacks( Import_BDMV, NULL )
+ set_callback( Import_BDMV)
add_submodule ()
set_description( N_("iTunes Music Library importer") )
add_shortcut( "itml" )
set_capability( "stream_filter", 310 )
- set_callbacks( Import_iTML, NULL )
+ set_callback( Import_iTML)
add_submodule()
set_description(N_("Windows Media Server metafile import") )
set_capability("stream_filter", 310)
- set_callbacks(Import_WMS, NULL)
+ set_callback(Import_WMS)
add_submodule ()
set_description( N_("WPL playlist import") )
add_shortcut( "wpl" )
diff --git a/modules/demux/voc.c b/modules/demux/voc.c
index 242308cb94..87381dd65e 100644
--- a/modules/demux/voc.c
+++ b/modules/demux/voc.c
@@ -44,7 +44,7 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
set_capability( "demux", 10 )
- set_callbacks( Open, NULL )
+ set_callback( Open)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/demux/xa.c b/modules/demux/xa.c
index d90d057890..0108e21203 100644
--- a/modules/demux/xa.c
+++ b/modules/demux/xa.c
@@ -43,7 +43,7 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
set_capability( "demux", 10 )
- set_callbacks( Open, NULL )
+ set_callback( Open)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/gui/macosx/main/macosx.m b/modules/gui/macosx/main/macosx.m
index 924920b356..e2f70de333 100644
--- a/modules/gui/macosx/main/macosx.m
+++ b/modules/gui/macosx/main/macosx.m
@@ -177,7 +177,7 @@ vlc_module_begin()
add_submodule()
set_description("Mac OS X Video Output Provider")
set_capability("vout window", 100)
- set_callbacks(WindowOpen, NULL)
+ set_callback(WindowOpen)
set_section(N_("Video output"), 0)
add_integer("macosx-vdev", 0, VDEV_TEXT, VDEV_LONGTEXT, false)
diff --git a/modules/gui/minimal_macosx/macosx.c b/modules/gui/minimal_macosx/macosx.c
index d0e2a98a08..a1016f17d0 100644
--- a/modules/gui/minimal_macosx/macosx.c
+++ b/modules/gui/minimal_macosx/macosx.c
@@ -62,6 +62,6 @@ vlc_module_begin ()
/* Will be loaded even without interface module. see voutgl.m */
set_description( "Minimal Mac OS X Video Output Provider" )
set_capability( "vout window", 50 )
- set_callbacks( WindowOpen, NULL )
+ set_callback( WindowOpen)
vlc_module_end ()
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index 9546a2e275..070ae5827d 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -369,7 +369,7 @@ vlc_module_begin ()
add_submodule ()
set_capability( "vout window", 0 )
- set_callbacks( WindowOpen, NULL )
+ set_callback( WindowOpen)
vlc_module_end ()
diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 9286a21420..110aba9057 100644
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -531,6 +531,6 @@ vlc_module_begin ()
add_submodule ()
set_capability( "vout window", 51 )
- set_callbacks( WindowOpen, NULL )
+ set_callback( WindowOpen)
vlc_module_end ()
diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index 6604625215..92fe0a65f6 100644
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -230,6 +230,6 @@ vlc_module_begin()
set_capability("hw decoder", 100)
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_VCODEC)
- set_callbacks(Open, NULL)
+ set_callback(Open)
add_shortcut("vdpau")
vlc_module_end()
diff --git a/modules/hw/vdpau/chroma.c b/modules/hw/vdpau/chroma.c
index f0a97ebde9..e2791eced4 100644
--- a/modules/hw/vdpau/chroma.c
+++ b/modules/hw/vdpau/chroma.c
@@ -948,5 +948,5 @@ vlc_module_begin()
N_("Scaling quality"), N_("High quality scaling level"), true)
add_submodule()
- set_callbacks(YCbCrOpen, NULL)
+ set_callback(YCbCrOpen)
vlc_module_end()
diff --git a/modules/keystore/keychain.m b/modules/keystore/keychain.m
index aa42203e6b..66c4824332 100644
--- a/modules/keystore/keychain.m
+++ b/modules/keystore/keychain.m
@@ -84,7 +84,7 @@ vlc_module_begin()
change_integer_list(accessibility_list, accessibility_list_text)
add_string("keychain-access-group", NULL, ACCESS_GROUP_TEXT, ACCESS_GROUP_LONGTEXT, true)
set_capability("keystore", 100)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end ()
static NSMutableDictionary * CreateQuery(vlc_keystore *p_keystore)
diff --git a/modules/logger/android.c b/modules/logger/android.c
index 99070f2c47..c5ddd5cdce 100644
--- a/modules/logger/android.c
+++ b/modules/logger/android.c
@@ -89,5 +89,5 @@ vlc_module_begin()
set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_MISC)
set_capability("logger", 30)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end ()
diff --git a/modules/logger/console.c b/modules/logger/console.c
index 3f50ae5e7e..8266906a4d 100644
--- a/modules/logger/console.c
+++ b/modules/logger/console.c
@@ -170,7 +170,7 @@ vlc_module_begin()
set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_MISC)
set_capability("logger", 10)
- set_callbacks(Open, NULL)
+ set_callback(Open)
add_bool("quiet", false, QUIET_TEXT, QUIET_LONGTEXT, false)
change_short('q')
diff --git a/modules/logger/file.c b/modules/logger/file.c
index 53259eddd8..b31acde506 100644
--- a/modules/logger/file.c
+++ b/modules/logger/file.c
@@ -234,7 +234,7 @@ vlc_module_begin()
set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_MISC)
set_capability("logger", 15)
- set_callbacks(Open, NULL)
+ set_callback(Open)
add_bool("file-logging", false, FILE_LOG_TEXT, FILE_LOG_LONGTEXT, false)
add_savefile("logfile", NULL, LOGFILE_NAME_TEXT, LOGFILE_NAME_LONGTEXT)
diff --git a/modules/logger/journal.c b/modules/logger/journal.c
index 9e0f6a624e..f28c57892d 100644
--- a/modules/logger/journal.c
+++ b/modules/logger/journal.c
@@ -81,6 +81,6 @@ vlc_module_begin()
set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_MISC)
set_capability("logger", 30)
- set_callbacks(Open, NULL)
+ set_callback(Open)
add_shortcut("journal")
vlc_module_end()
diff --git a/modules/logger/syslog.c b/modules/logger/syslog.c
index b544357c3b..d9506a30aa 100644
--- a/modules/logger/syslog.c
+++ b/modules/logger/syslog.c
@@ -156,7 +156,7 @@ vlc_module_begin()
set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_MISC)
set_capability("logger", 20)
- set_callbacks(Open, NULL)
+ set_callback(Open)
add_bool("syslog", false, SYSLOG_TEXT, SYSLOG_LONGTEXT,
false)
diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index 94412355c0..717a627ea1 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -112,13 +112,13 @@ vlc_module_begin ()
set_shortname( N_( "Lua Meta Fetcher" ) )
set_description( N_("Fetch meta data using lua scripts") )
set_capability( "meta fetcher", 10 )
- set_callbacks( FetchMeta, NULL )
+ set_callback( FetchMeta)
add_submodule ()
set_shortname( N_( "Lua Meta Reader" ) )
set_description( N_("Read meta data using lua scripts") )
set_capability( "meta reader", 10 )
- set_callbacks( ReadMeta, NULL )
+ set_callback( ReadMeta)
add_submodule ()
add_shortcut( "luaplaylist" )
@@ -131,7 +131,7 @@ vlc_module_begin ()
set_shortname( N_( "Lua Art" ) )
set_description( N_("Fetch artwork using lua scripts") )
set_capability( "art finder", 10 )
- set_callbacks( FindArt, NULL )
+ set_callback( FindArt)
add_submodule ()
set_shortname( N_("Lua Extension") )
diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 0fc62fa958..be8013e169 100644
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -69,7 +69,7 @@ vlc_module_begin ()
add_loadfile("album-art-filename", NULL, N_("Album art filename"),
N_("Filename to look for album art in current directory"))
set_capability( "art finder", 90 )
- set_callbacks( FindMeta, NULL )
+ set_callback( FindMeta)
vlc_module_end ()
static bool ProbeArtFile(input_item_t *item,
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index c04bbd316a..e1c49b5cb0 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -143,10 +143,10 @@ static int WriteMeta ( vlc_object_t * );
vlc_module_begin ()
set_capability( "meta reader", 1000 )
- set_callbacks( ReadMeta, NULL )
+ set_callback( ReadMeta)
add_submodule ()
set_capability( "meta writer", 50 )
- set_callbacks( WriteMeta, NULL )
+ set_callback( WriteMeta)
vlc_module_end ()
class VlcIostream : public IOStream
diff --git a/modules/misc/addons/vorepository.c b/modules/misc/addons/vorepository.c
index 4d5d4857b8..06f02ce239 100644
--- a/modules/misc/addons/vorepository.c
+++ b/modules/misc/addons/vorepository.c
@@ -71,7 +71,7 @@ add_submodule ()
add_shortcut(ADDONS_MODULE_SHORTCUT".vlp")
set_description(N_("single .vlp archive addons finder"))
set_capability("addons finder", 101)
- set_callbacks(OpenDesignated, NULL)
+ set_callback(OpenDesignated)
vlc_module_end ()
struct addons_finder_sys_t
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 8466000274..5ed762c9ba 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -755,7 +755,7 @@ vlc_module_begin ()
set_shortname( "GNU TLS" )
set_description( N_("GNU TLS transport layer security") )
set_capability( "tls client", 1 )
- set_callbacks(OpenClient, NULL)
+ set_callback(OpenClient)
set_category( CAT_ADVANCED )
set_subcategory( SUBCAT_ADVANCED_NETWORK )
add_bool("gnutls-system-trust", true, SYSTEM_TRUST_TEXT,
@@ -771,6 +771,6 @@ vlc_module_begin ()
set_capability( "tls server", 1 )
set_category( CAT_ADVANCED )
set_subcategory( SUBCAT_ADVANCED_NETWORK )
- set_callbacks(OpenServer, NULL)
+ set_callback(OpenServer)
#endif
vlc_module_end ()
diff --git a/modules/misc/playlist/export.c b/modules/misc/playlist/export.c
index f0ba3d4419..9617ed1cef 100644
--- a/modules/misc/playlist/export.c
+++ b/modules/misc/playlist/export.c
@@ -50,24 +50,24 @@ vlc_module_begin ()
set_description( N_("M3U playlist export") )
add_shortcut( "export-m3u" )
set_capability( "playlist export" , 0 )
- set_callbacks( Export_M3U , NULL )
+ set_callback( Export_M3U )
add_submodule ()
set_description( N_("M3U8 playlist export") )
add_shortcut( "export-m3u8" )
set_capability( "playlist export" , 0 )
- set_callbacks( Export_M3U8, NULL )
+ set_callback( Export_M3U8)
add_submodule ()
set_description( N_("XSPF playlist export") )
add_shortcut( "export-xspf" )
set_capability( "playlist export" , 0 )
- set_callbacks( xspf_export_playlist , NULL )
+ set_callback( xspf_export_playlist )
add_submodule ()
set_description( N_("HTML playlist export") )
add_shortcut( "export-html" )
set_capability( "playlist export", 0 )
- set_callbacks( Export_HTML, NULL )
+ set_callback( Export_HTML)
vlc_module_end ()
diff --git a/modules/misc/securetransport.c b/modules/misc/securetransport.c
index fdf5adbabf..8a40756557 100644
--- a/modules/misc/securetransport.c
+++ b/modules/misc/securetransport.c
@@ -95,7 +95,7 @@ static int OpenClient (vlc_tls_client_t *);
vlc_module_begin ()
set_description(N_("TLS support for OS X and iOS"))
set_capability("tls client", 2)
- set_callbacks(OpenClient, NULL)
+ set_callback(OpenClient)
set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_NETWORK)
@@ -108,7 +108,7 @@ vlc_module_begin ()
add_submodule()
set_description(N_("TLS server support for OS X"))
set_capability("tls server", 2)
- set_callbacks(OpenServer, NULL)
+ set_callback(OpenServer)
set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_NETWORK)
#endif /* !TARGET_OS_IPHONE */
diff --git a/modules/misc/stats.c b/modules/misc/stats.c
index e99402a2b8..7c7adbd1c3 100644
--- a/modules/misc/stats.c
+++ b/modules/misc/stats.c
@@ -215,26 +215,26 @@ vlc_module_begin ()
set_description( N_("Stats encoder function") )
set_capability( "encoder", 0 )
add_shortcut( "stats" )
- set_callbacks( OpenEncoder, NULL )
+ set_callback( OpenEncoder)
add_submodule ()
#endif
set_section( N_( "Stats decoder" ), NULL )
set_description( N_("Stats decoder function") )
set_capability( "video decoder", 0 )
add_shortcut( "stats" )
- set_callbacks( OpenDecoder, NULL )
+ set_callback( OpenDecoder)
add_submodule()
set_section( N_( "Stats decoder" ), NULL )
set_description( N_("Stats decoder function") )
set_capability( "audio decoder", 0 )
add_shortcut( "stats" )
- set_callbacks( OpenDecoder, NULL )
+ set_callback( OpenDecoder)
add_submodule()
set_section( N_( "Stats decoder" ), NULL )
set_description( N_("Stats decoder function") )
set_capability( "spu decoder", 0 )
add_shortcut( "stats" )
- set_callbacks( OpenDecoder, NULL )
+ set_callback( OpenDecoder)
add_submodule ()
set_section( N_( "Stats demux" ), NULL )
set_description( N_("Stats demux function") )
diff --git a/modules/services_discovery/os2drive.c b/modules/services_discovery/os2drive.c
index ffc87aa539..0934ba2d3e 100644
--- a/modules/services_discovery/os2drive.c
+++ b/modules/services_discovery/os2drive.c
@@ -45,7 +45,7 @@ vlc_module_begin ()
set_category (CAT_PLAYLIST)
set_subcategory (SUBCAT_PLAYLIST_SD)
set_capability ("services_discovery", 0)
- set_callbacks (Open, NULL)
+ set_callback(Open)
add_shortcut ("disc")
VLC_SD_PROBE_SUBMODULE
diff --git a/modules/services_discovery/windrive.c b/modules/services_discovery/windrive.c
index 5fcde88a50..1e361bf38c 100644
--- a/modules/services_discovery/windrive.c
+++ b/modules/services_discovery/windrive.c
@@ -42,7 +42,7 @@ vlc_module_begin ()
set_category (CAT_PLAYLIST)
set_subcategory (SUBCAT_PLAYLIST_SD)
set_capability ("services_discovery", 0)
- set_callbacks (Open, NULL)
+ set_callback(Open)
add_shortcut ("disc")
VLC_SD_PROBE_SUBMODULE
diff --git a/modules/stream_filter/accesstweaks.c b/modules/stream_filter/accesstweaks.c
index 493b79ba68..6e2c313759 100644
--- a/modules/stream_filter/accesstweaks.c
+++ b/modules/stream_filter/accesstweaks.c
@@ -39,7 +39,7 @@ vlc_module_begin ()
set_capability ("stream_filter", 301)
/* Developers only module, no translation please */
set_description ("Access controls tweaking")
- set_callbacks(Open, NULL)
+ set_callback(Open)
add_bool("seek", true, "Expose seeking capability", NULL, false)
change_volatile ()
diff --git a/modules/stream_filter/adf.c b/modules/stream_filter/adf.c
index 73172ea0dc..d9f7235fea 100644
--- a/modules/stream_filter/adf.c
+++ b/modules/stream_filter/adf.c
@@ -40,7 +40,7 @@ vlc_module_begin()
set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
set_capability( "stream_filter", 330 )
set_description( N_( "ADF stream filter" ) )
- set_callbacks( Open, NULL )
+ set_callback( Open)
vlc_module_end()
static int Control( stream_t *p_stream, int i_query, va_list args )
diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp
index e9bba17f98..c435f8ae69 100644
--- a/modules/stream_out/chromecast/cast.cpp
+++ b/modules/stream_out/chromecast/cast.cpp
@@ -234,7 +234,7 @@ vlc_module_begin ()
/* sout proxy that start the cc input when all streams are loaded */
add_shortcut("chromecast-proxy")
set_capability("sout stream", 0)
- set_callbacks(ProxyOpen, NULL)
+ set_callback(ProxyOpen)
add_submodule()
set_subcategory(SUBCAT_SOUT_ACO)
add_shortcut("chromecast-http")
diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c
index 6b8b33a214..19438fbb99 100644
--- a/modules/stream_out/dummy.c
+++ b/modules/stream_out/dummy.c
@@ -49,7 +49,7 @@ vlc_module_begin ()
set_description( N_("Dummy stream output") )
set_capability( "sout stream", 50 )
add_shortcut( "dummy", "drop" )
- set_callbacks( Open, NULL )
+ set_callback( Open)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/text_renderer/tdummy.c b/modules/text_renderer/tdummy.c
index 3ff2089da0..ad50b69dec 100644
--- a/modules/text_renderer/tdummy.c
+++ b/modules/text_renderer/tdummy.c
@@ -34,7 +34,7 @@ vlc_module_begin ()
set_shortname( N_("Dummy") )
set_description( N_("Dummy font renderer") )
set_capability( "text renderer", 1 )
- set_callbacks( OpenRenderer, NULL )
+ set_callback( OpenRenderer)
vlc_module_end ()
diff --git a/modules/video_chroma/grey_yuv.c b/modules/video_chroma/grey_yuv.c
index 40060a5c9a..cdcb87a98e 100644
--- a/modules/video_chroma/grey_yuv.c
+++ b/modules/video_chroma/grey_yuv.c
@@ -53,7 +53,7 @@ static picture_t *GREY_YUY2_Filter( filter_t *, picture_t * );
vlc_module_begin ()
set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_capability( "video converter", 80 )
- set_callbacks( Activate, NULL )
+ set_callback( Activate)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index 34fae3eb74..44af482001 100644
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -99,7 +99,7 @@ vlc_module_begin ()
set_capability( "video converter", 250 )
# define vlc_CPU_capable() vlc_CPU_ALTIVEC()
#endif
- set_callbacks( Activate, NULL )
+ set_callback( Activate)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_chroma/i422_i420.c b/modules/video_chroma/i422_i420.c
index 486d5dab48..eed0020d16 100644
--- a/modules/video_chroma/i422_i420.c
+++ b/modules/video_chroma/i422_i420.c
@@ -55,7 +55,7 @@ static picture_t *I422_YUVA_Filter( filter_t *, picture_t * );
vlc_module_begin ()
set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_capability( "video converter", 60 )
- set_callbacks( Activate, NULL )
+ set_callback( Activate)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index bc19810eb3..6c9f799f59 100644
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -82,7 +82,7 @@ vlc_module_begin ()
# define vlc_CPU_capable() vlc_CPU_SSE2()
# define VLC_TARGET VLC_SSE
#endif
- set_callbacks( Activate, NULL )
+ set_callback( Activate)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_chroma/omxdl.c b/modules/video_chroma/omxdl.c
index adca69a7d1..292fe950ea 100644
--- a/modules/video_chroma/omxdl.c
+++ b/modules/video_chroma/omxdl.c
@@ -35,7 +35,7 @@ static int OpenScaler (vlc_object_t *);
vlc_module_begin ()
set_description (N_("OpenMAX DL image processing"))
set_capability ("video converter", 90)
- set_callbacks (Open, NULL)
+ set_callback(Open)
vlc_module_end ()
#define SRC_WIDTH (filter->fmt_in.video.i_width)
diff --git a/modules/video_chroma/rv32.c b/modules/video_chroma/rv32.c
index 6f211c0c8d..58a1464bf4 100644
--- a/modules/video_chroma/rv32.c
+++ b/modules/video_chroma/rv32.c
@@ -44,7 +44,7 @@ static picture_t *Filter( filter_t *, picture_t * );
vlc_module_begin ()
set_description( N_("RV32 conversion filter") )
set_capability( "video converter", 1 )
- set_callbacks( OpenFilter, NULL )
+ set_callback( OpenFilter)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_chroma/yuy2_i420.c b/modules/video_chroma/yuy2_i420.c
index d8c93a6fb5..47a27fa8f2 100644
--- a/modules/video_chroma/yuy2_i420.c
+++ b/modules/video_chroma/yuy2_i420.c
@@ -55,7 +55,7 @@ static picture_t *UYVY_I420_Filter ( filter_t *, picture_t * );
vlc_module_begin ()
set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_capability( "video converter", 80 )
- set_callbacks( Activate, NULL )
+ set_callback( Activate)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_chroma/yuy2_i422.c b/modules/video_chroma/yuy2_i422.c
index 1352e9d9c4..2e1d2be632 100644
--- a/modules/video_chroma/yuy2_i422.c
+++ b/modules/video_chroma/yuy2_i422.c
@@ -54,7 +54,7 @@ static picture_t *UYVY_I422_Filter ( filter_t *, picture_t * );
vlc_module_begin ()
set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_capability( "video converter", 80 )
- set_callbacks( Activate, NULL )
+ set_callback( Activate)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c
index 9961c4c6b8..d33b0c93a8 100644
--- a/modules/video_filter/scale.c
+++ b/modules/video_filter/scale.c
@@ -46,7 +46,7 @@ static picture_t *Filter( filter_t *, picture_t * );
vlc_module_begin ()
set_description( N_("Video scaling filter") )
set_capability( "video converter", 10 )
- set_callbacks( OpenFilter, NULL )
+ set_callback( OpenFilter)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index 9631a90db4..b38dd8f992 100644
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -55,7 +55,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_VIDEO_VFILTER )
add_shortcut( "wave" )
- set_callbacks( Create, NULL )
+ set_callback( Create)
vlc_module_end ()
/*****************************************************************************
diff --git a/modules/video_output/android/window.c b/modules/video_output/android/window.c
index e175315b3a..6cf1b94c07 100644
--- a/modules/video_output/android/window.c
+++ b/modules/video_output/android/window.c
@@ -49,7 +49,7 @@ vlc_module_begin()
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_capability("vout window", 10)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end()
diff --git a/modules/video_output/drawable.c b/modules/video_output/drawable.c
index 26c99245fb..a21c40ca0a 100644
--- a/modules/video_output/drawable.c
+++ b/modules/video_output/drawable.c
@@ -48,7 +48,7 @@ vlc_module_begin ()
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout window", 70)
- set_callbacks (Open, NULL)
+ set_callback(Open)
add_shortcut ("embed-hwnd")
add_integer ("drawable-hwnd", 0, HWND_TEXT, HWND_LONGTEXT, true)
diff --git a/modules/video_output/vdummy.c b/modules/video_output/vdummy.c
index a2ae8dad44..2e026ef4e9 100644
--- a/modules/video_output/vdummy.c
+++ b/modules/video_output/vdummy.c
@@ -47,7 +47,7 @@ vlc_module_begin ()
set_shortname( N_("Dummy") )
set_description( N_("Dummy video output") )
set_capability( "vout display", 0 )
- set_callbacks( OpenDummy, NULL )
+ set_callback( OpenDummy)
add_shortcut( "dummy" )
set_category( CAT_VIDEO )
@@ -58,7 +58,7 @@ vlc_module_begin ()
set_description( N_("Statistics video output") )
set_capability( "vout display", 0 )
add_shortcut( "stats" )
- set_callbacks( OpenStats, NULL )
+ set_callback( OpenStats)
vlc_module_end ()
diff --git a/modules/video_output/wayland/xdg-shell.c b/modules/video_output/wayland/xdg-shell.c
index fe7e54f9e6..a0288d9bdd 100644
--- a/modules/video_output/wayland/xdg-shell.c
+++ b/modules/video_output/wayland/xdg-shell.c
@@ -712,7 +712,7 @@ vlc_module_begin()
#else
set_capability("vout window", 10)
#endif
- set_callbacks(Open, NULL)
+ set_callback(Open)
add_string("wl-display", NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
add_integer("wl-output", 0, OUTPUT_TEXT, OUTPUT_LONGTEXT, true)
diff --git a/modules/video_output/wdummy.c b/modules/video_output/wdummy.c
index 8f5668517f..a71dc961f0 100644
--- a/modules/video_output/wdummy.c
+++ b/modules/video_output/wdummy.c
@@ -54,6 +54,6 @@ vlc_module_begin()
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_capability("vout window", 1)
- set_callbacks(Open, NULL)
+ set_callback(Open)
add_shortcut("dummy")
vlc_module_end()
diff --git a/modules/video_output/wextern.c b/modules/video_output/wextern.c
index a767f738a4..f062ce7e45 100644
--- a/modules/video_output/wextern.c
+++ b/modules/video_output/wextern.c
@@ -44,7 +44,7 @@ vlc_module_begin()
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_capability("vout window", 0)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end()
typedef struct {
diff --git a/modules/video_output/win32/window.c b/modules/video_output/win32/window.c
index ff25b11dde..50e172b9b4 100644
--- a/modules/video_output/win32/window.c
+++ b/modules/video_output/win32/window.c
@@ -785,5 +785,5 @@ vlc_module_begin()
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_capability("vout window", 10)
- set_callbacks(Open, NULL)
+ set_callback(Open)
vlc_module_end()
diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 231d652050..cdd68f7dcb 100644
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -943,7 +943,7 @@ vlc_module_begin ()
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout window", 10)
- set_callbacks(Open, NULL)
+ set_callback(Open)
/* Obsolete since 1.1.0: */
add_obsolete_bool ("x11-altfullscreen")
@@ -957,7 +957,7 @@ vlc_module_begin ()
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout window", 70)
- set_callbacks(EmOpen, NULL)
+ set_callback(EmOpen)
add_shortcut ("embed-xid")
add_string ("x11-display", NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
--
2.22.0
More information about the vlc-devel
mailing list