From 05492281965ed211badf7e1f4c2220be720d3356 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 29 Oct 2008 21:59:01 +0200 Subject: [PATCH] Remove most stray semi-colons in module descriptions Those multi-lines are still to be done (it's going to be fun...) See also 5af4cc854bcc7ec083195b41e555dac5988feabb. --- include/vlc_plugin.h | 2 +- modules/access/bda/bda.c | 52 +- modules/access/cdda.c | 36 +- modules/access/cdda/cdda.c | 24 +- modules/access/dc1394.c | 12 +- modules/access/directory.c | 22 +- modules/access/dshow/dshow.cpp | 40 +- modules/access/dv.c | 24 +- modules/access/dvb/access.c | 44 +- modules/access/dvdnav.c | 20 +- modules/access/dvdread.c | 22 +- modules/access/eyetv.m | 18 +- modules/access/fake.c | 22 +- modules/access/file.c | 24 +- modules/access/ftp.c | 34 +- modules/access/gnomevfs.c | 20 +- modules/access/http.c | 28 +- modules/access/jack.c | 18 +- modules/access/mmap.c | 18 +- modules/access/mms/mms.c | 28 +- modules/access/pvr.c | 22 +- modules/access/qtcapture.m | 18 +- modules/access/rtmp/access.c | 18 +- modules/access/rtsp/access.c | 22 +- modules/access/screen/screen.c | 28 +- modules/access/smb.c | 18 +- modules/access/tcp.c | 18 +- modules/access/udp.c | 28 +- modules/access/v4l.c | 28 +- modules/access/v4l2/v4l2.c | 36 +- modules/access/vcd/vcd.c | 24 +- modules/access/vcdx/vcd.c | 20 +- modules/access_filter/bandwidth.c | 18 +- modules/access_filter/dump.c | 18 +- modules/access_filter/timeshift.c | 20 +- modules/access_output/dummy.c | 18 +- modules/access_output/file.c | 20 +- modules/access_output/http.c | 22 +- modules/access_output/rtmp.c | 18 +- modules/access_output/shout.c | 18 +- modules/access_output/udp.c | 24 +- modules/audio_filter/channel_mixer/dolby.c | 16 +- .../audio_filter/channel_mixer/headphone.c | 28 +- modules/audio_filter/channel_mixer/mono.c | 16 +- modules/audio_filter/channel_mixer/simple.c | 24 +- modules/audio_filter/channel_mixer/trivial.c | 14 +- modules/audio_filter/converter/a52tofloat32.c | 30 +- modules/audio_filter/converter/a52tospdif.c | 14 +- modules/audio_filter/converter/dtstofloat32.c | 28 +- modules/audio_filter/converter/dtstospdif.c | 14 +- modules/audio_filter/converter/fixed.c | 24 +- modules/audio_filter/converter/float.c | 60 +-- .../audio_filter/converter/mpgatofixed32.c | 24 +- modules/audio_filter/equalizer.c | 18 +- modules/audio_filter/format.c | 14 +- modules/audio_filter/normvol.c | 18 +- modules/audio_filter/param_eq.c | 28 +- modules/audio_filter/resampler/bandlimited.c | 24 +- modules/audio_filter/resampler/linear.c | 24 +- modules/audio_filter/resampler/trivial.c | 14 +- modules/audio_filter/resampler/ugly.c | 14 +- modules/audio_filter/scaletempo.c | 16 +- .../audio_filter/spatializer/spatializer.cpp | 30 +- modules/audio_mixer/float32.c | 14 +- modules/audio_mixer/spdif.c | 14 +- modules/audio_mixer/trivial.c | 14 +- modules/audio_output/alsa.c | 20 +- modules/audio_output/arts.c | 16 +- modules/audio_output/auhal.c | 18 +- modules/audio_output/directx.c | 18 +- modules/audio_output/esd.c | 20 +- modules/audio_output/file.c | 22 +- modules/audio_output/hd1000a.cpp | 16 +- modules/audio_output/jack.c | 16 +- modules/audio_output/oss.c | 22 +- modules/audio_output/portaudio.c | 18 +- modules/audio_output/pulse.c | 20 +- modules/audio_output/sdl.c | 18 +- modules/audio_output/waveout.c | 24 +- modules/codec/a52.c | 24 +- modules/codec/adpcm.c | 14 +- modules/codec/aes3.c | 22 +- modules/codec/araw.c | 22 +- modules/codec/avcodec/avcodec.c | 56 +-- modules/codec/cc.c | 12 +- modules/codec/cdg.c | 16 +- modules/codec/cmml/cmml.c | 20 +- modules/codec/csri.c | 16 +- modules/codec/cvdsub.c | 20 +- modules/codec/dirac.c | 26 +- modules/codec/dmo/dmo.c | 24 +- modules/codec/dts.c | 20 +- modules/codec/dvbsub.c | 36 +- modules/codec/faad.c | 14 +- modules/codec/fake.c | 18 +- modules/codec/flac.c | 32 +- modules/codec/fluidsynth.c | 14 +- modules/codec/kate.c | 28 +- modules/codec/libass.c | 16 +- modules/codec/libmpeg2.c | 16 +- modules/codec/lpcm.c | 22 +- modules/codec/mash.cpp | 14 +- modules/codec/mpeg_audio.c | 24 +- modules/codec/png.c | 16 +- modules/codec/quicktime.c | 16 +- modules/codec/rawvideo.c | 24 +- modules/codec/realaudio.c | 14 +- modules/codec/realvideo.c | 14 +- modules/codec/schroedinger.c | 16 +- modules/codec/sdl_image.c | 18 +- modules/codec/speex.c | 34 +- modules/codec/spudec/spudec.c | 24 +- modules/codec/subtitles/subsdec.c | 16 +- modules/codec/subtitles/subsusf.c | 16 +- modules/codec/subtitles/t140.c | 12 +- modules/codec/svcdsub.c | 24 +- modules/codec/tarkin.c | 16 +- modules/codec/telx.c | 16 +- modules/codec/theora.c | 38 +- modules/codec/twolame.c | 16 +- modules/codec/vorbis.c | 34 +- modules/codec/x264.c | 80 +-- modules/codec/xvmc/xxmc.c | 12 +- modules/codec/zvbi.c | 18 +- modules/control/dbus.c | 16 +- modules/control/gestures.c | 16 +- modules/control/hotkeys.c | 12 +- modules/control/http/http.c | 36 +- modules/control/lirc.c | 16 +- modules/control/motion.c | 14 +- modules/control/netsync.c | 16 +- modules/control/ntservice.c | 16 +- modules/control/rc.c | 26 +- modules/control/showintf.c | 16 +- modules/control/signals.c | 16 +- modules/control/telnet.c | 18 +- modules/demux/aiff.c | 16 +- modules/demux/asf/asf.c | 16 +- modules/demux/au.c | 16 +- modules/demux/avformat/avformat.c | 24 +- modules/demux/avi/avi.c | 16 +- modules/demux/cdg.c | 18 +- modules/demux/decomp.c | 18 +- modules/demux/demuxdump.c | 18 +- modules/demux/flac.c | 16 +- modules/demux/gme.cpp | 18 +- modules/demux/live555.cpp | 34 +- modules/demux/mjpeg.c | 18 +- modules/demux/mkv/mkv.cpp | 20 +- modules/demux/mod.c | 18 +- modules/demux/mp4/mp4.c | 14 +- modules/demux/mpc.c | 18 +- modules/demux/mpeg/es.c | 32 +- modules/demux/mpeg/h264.c | 20 +- modules/demux/mpeg/m4v.c | 20 +- modules/demux/mpeg/mpgv.c | 16 +- modules/demux/nsc.c | 14 +- modules/demux/nsv.c | 16 +- modules/demux/nuv.c | 16 +- modules/demux/ogg.c | 18 +- modules/demux/playlist/playlist.c | 148 +++--- modules/demux/ps.c | 24 +- modules/demux/pva.c | 16 +- modules/demux/rawdv.c | 20 +- modules/demux/rawvid.c | 24 +- modules/demux/real.c | 18 +- modules/demux/rtp.c | 36 +- modules/demux/smf.c | 14 +- modules/demux/subtitle.c | 18 +- modules/demux/subtitle_asa.c | 18 +- modules/demux/ts.c | 38 +- modules/demux/tta.c | 20 +- modules/demux/ty.c | 20 +- modules/demux/vc1.c | 20 +- modules/demux/vobsub.c | 18 +- modules/demux/voc.c | 14 +- modules/demux/wav.c | 14 +- modules/demux/xa.c | 14 +- modules/gui/beos/BeOS.cpp | 30 +- modules/gui/fbosd.c | 30 +- modules/gui/macosx/macosx.m | 26 +- modules/gui/minimal_macosx/macosx.c | 32 +- modules/gui/ncurses.c | 20 +- modules/gui/pda/pda.c | 18 +- modules/gui/pda/pda_support.c | 2 +- modules/gui/qnx/qnx.c | 20 +- modules/gui/qt4/qt4.cpp | 42 +- modules/gui/skins2/src/skin_main.cpp | 44 +- modules/gui/wince/wince.cpp | 28 +- modules/gui/wxwidgets/wxwidgets.cpp | 54 +- modules/meta_engine/folder.c | 12 +- modules/meta_engine/id3tag.c | 10 +- modules/meta_engine/taglib.cpp | 20 +- modules/misc/audioscrobbler.c | 16 +- modules/misc/dummy/dummy.c | 98 ++-- modules/misc/freetype.c | 18 +- modules/misc/gnutls.c | 40 +- modules/misc/gtk_main.c | 24 +- modules/misc/inhibit.c | 10 +- modules/misc/logger.c | 16 +- modules/misc/lua/vlc.c | 58 +-- modules/misc/memcpy/memcpy.c | 46 +- modules/misc/memcpy/memcpyaltivec.c | 18 +- modules/misc/notify/growl.m | 16 +- modules/misc/notify/growl_udp.c | 16 +- modules/misc/notify/msn.c | 16 +- modules/misc/notify/notify.c | 16 +- modules/misc/notify/telepathy.c | 16 +- modules/misc/notify/xosd.c | 20 +- modules/misc/osd/parser.c | 28 +- modules/misc/playlist/export.c | 48 +- modules/misc/probe/hal.c | 10 +- modules/misc/qte_main.cpp | 14 +- modules/misc/quartztext.c | 18 +- modules/misc/rtsp.c | 20 +- modules/misc/screensaver.c | 10 +- modules/misc/stats/stats.c | 44 +- modules/misc/svg.c | 16 +- modules/misc/testsuite/test1.c | 6 +- modules/misc/testsuite/test2.cpp | 6 +- modules/misc/testsuite/test3.m | 6 +- modules/misc/testsuite/test4.c | 6 +- modules/misc/win32text.c | 18 +- modules/misc/xml/libxml.c | 10 +- modules/misc/xml/xtag.c | 10 +- modules/mux/asf.c | 20 +- modules/mux/avi.c | 16 +- modules/mux/dummy.c | 20 +- modules/mux/mp4.c | 22 +- modules/mux/mpeg/ps.c | 22 +- modules/mux/mpeg/ts.c | 24 +- modules/mux/mpjpeg.c | 20 +- modules/mux/ogg.c | 18 +- modules/mux/wav.c | 16 +- modules/packetizer/copy.c | 14 +- modules/packetizer/h264.c | 14 +- modules/packetizer/mpeg4audio.c | 14 +- modules/packetizer/mpeg4video.c | 14 +- modules/packetizer/mpegvideo.c | 14 +- modules/packetizer/vc1.c | 14 +- modules/services_discovery/bonjour.c | 16 +- modules/services_discovery/hal.c | 14 +- modules/services_discovery/podcast.c | 18 +- modules/services_discovery/sap.c | 26 +- modules/services_discovery/shout.c | 68 +-- modules/services_discovery/upnp_cc.cpp | 16 +- modules/services_discovery/upnp_intel.cpp | 16 +- modules/stream_out/autodel.c | 14 +- modules/stream_out/bridge.c | 38 +- modules/stream_out/description.c | 12 +- modules/stream_out/display.c | 18 +- modules/stream_out/dummy.c | 14 +- modules/stream_out/duplicate.c | 18 +- modules/stream_out/es.c | 26 +- modules/stream_out/gather.c | 12 +- modules/stream_out/mosaic_bridge.c | 18 +- modules/stream_out/record.c | 16 +- modules/stream_out/rtp.c | 18 +- modules/stream_out/standard.c | 22 +- modules/stream_out/switcher.c | 12 +- modules/stream_out/transcode.c | 28 +- modules/stream_out/transrate/transrate.c | 16 +- modules/video_chroma/grey_yuv.c | 10 +- modules/video_chroma/i420_rgb.c | 16 +- modules/video_chroma/i420_ymga.c | 16 +- modules/video_chroma/i420_yuy2.c | 26 +- modules/video_chroma/i422_i420.c | 10 +- modules/video_chroma/i422_yuy2.c | 22 +- modules/video_chroma/yuy2_i420.c | 10 +- modules/video_chroma/yuy2_i422.c | 10 +- modules/video_filter/adjust.c | 18 +- modules/video_filter/alphamask.c | 22 +- modules/video_filter/atmo/atmo.cpp | 34 +- modules/video_filter/blend.c | 10 +- modules/video_filter/blendbench.c | 24 +- modules/video_filter/bluescreen.c | 20 +- modules/video_filter/canvas.c | 10 +- modules/video_filter/chain.c | 10 +- modules/video_filter/clone.c | 26 +- modules/video_filter/colorthres.c | 16 +- modules/video_filter/crop.c | 18 +- modules/video_filter/croppadd.c | 14 +- modules/video_filter/deinterlace.c | 30 +- .../dynamicoverlay/dynamicoverlay.c | 18 +- modules/video_filter/erase.c | 22 +- modules/video_filter/extract.c | 18 +- modules/video_filter/gaussianblur.c | 16 +- modules/video_filter/gradient.c | 18 +- modules/video_filter/grain.c | 18 +- modules/video_filter/imgresample.c | 10 +- modules/video_filter/invert.c | 18 +- modules/video_filter/logo.c | 40 +- modules/video_filter/magnify.c | 18 +- modules/video_filter/marq.c | 44 +- modules/video_filter/mosaic.c | 20 +- modules/video_filter/motionblur.c | 18 +- modules/video_filter/motiondetect.c | 20 +- modules/video_filter/noise.c | 20 +- modules/video_filter/opencv_example.cpp | 18 +- modules/video_filter/opencv_wrapper.c | 18 +- modules/video_filter/osdmenu.c | 22 +- modules/video_filter/panoramix.c | 68 +-- modules/video_filter/postproc.c | 22 +- modules/video_filter/psychedelic.c | 20 +- modules/video_filter/puzzle.c | 16 +- modules/video_filter/remoteosd.c | 18 +- modules/video_filter/ripple.c | 20 +- modules/video_filter/rotate.c | 18 +- modules/video_filter/rss.c | 44 +- modules/video_filter/rv32.c | 10 +- modules/video_filter/scale.c | 10 +- modules/video_filter/scene.c | 16 +- modules/video_filter/sharpen.c | 18 +- modules/video_filter/swscale.c | 16 +- modules/video_filter/transform.c | 18 +- modules/video_filter/wall.c | 26 +- modules/video_filter/wave.c | 20 +- modules/video_filter/yuvp.c | 10 +- modules/video_output/aa.c | 18 +- modules/video_output/caca.c | 16 +- modules/video_output/directfb.c | 18 +- modules/video_output/fb.c | 18 +- modules/video_output/ggi.c | 12 +- modules/video_output/hd1000v.cpp | 12 +- modules/video_output/mga.c | 10 +- modules/video_output/msw/direct3d.c | 20 +- modules/video_output/msw/directx.c | 22 +- modules/video_output/msw/glwin32.c | 20 +- modules/video_output/msw/wingdi.c | 22 +- modules/video_output/opengl.c | 20 +- modules/video_output/opengllayer.m | 18 +- modules/video_output/qte/qte.cpp | 20 +- modules/video_output/sdl.c | 22 +- modules/video_output/snapshot.c | 24 +- modules/video_output/svgalib.c | 18 +- modules/video_output/vmem.c | 36 +- modules/video_output/x11/glx.c | 28 +- modules/video_output/x11/x11.c | 24 +- modules/video_output/x11/xvideo.c | 28 +- modules/video_output/x11/xvmc.c | 28 +- modules/video_output/yuv.c | 16 +- modules/visualization/galaktos/plugin.c | 12 +- modules/visualization/goom.c | 18 +- modules/visualization/visual/visual.c | 24 +- src/libvlc-module.c | 470 +++++++++--------- 345 files changed, 3920 insertions(+), 3920 deletions(-) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 0cb3ea9fe8..41e3374a4f 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -396,7 +396,7 @@ enum vlc_config_properties /* Modifier macros for the config options (used for fine tuning) */ #define add_deprecated_alias( name ) \ - vlc_config_set (p_config, VLC_CONFIG_OLDNAME, (const char *)(name)) + vlc_config_set (p_config, VLC_CONFIG_OLDNAME, (const char *)(name)); #define change_short( ch ) \ vlc_config_set (p_config, VLC_CONFIG_SHORTCUT, (int)(ch)); diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c index 8773162cf6..c74e89ab4e 100644 --- a/modules/access/bda/bda.c +++ b/modules/access/bda/bda.c @@ -168,11 +168,11 @@ static const char *const ppsz_polar_text[] = { N_("Horizontal"), N_("Vertical"), N_("Circular Left"), N_("Circular Right") }; -vlc_module_begin(); - set_shortname( N_("DVB") ); - set_description( N_("DirectShow DVB input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("DVB") ) + set_description( N_("DirectShow DVB input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); @@ -184,7 +184,7 @@ vlc_module_begin(); false ); add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, true ); - add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true ); + add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true ) add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT, true ); # endif @@ -223,7 +223,7 @@ vlc_module_begin(); add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, true ); - add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true ); + add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true ) add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT, false ); @@ -242,7 +242,7 @@ vlc_module_begin(); add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, true ); change_integer_list( i_band_list, ppsz_band_text, NULL ); - add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, true ); + add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, true ) change_integer_list( i_guard_list, ppsz_guard_text, NULL ); add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT, TRANSMISSION_LONGTEXT, true ); @@ -251,29 +251,29 @@ vlc_module_begin(); true ); change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL ); - set_capability( "access", 0 ); - add_shortcut( "dvb" ); /* Generic name */ + set_capability( "access", 0 ) + add_shortcut( "dvb" ) /* Generic name */ - add_shortcut( "dvb-s" ); /* Satellite */ - add_shortcut( "dvbs" ); - add_shortcut( "qpsk" ); - add_shortcut( "satellite" ); + add_shortcut( "dvb-s" ) /* Satellite */ + add_shortcut( "dvbs" ) + add_shortcut( "qpsk" ) + add_shortcut( "satellite" ) - add_shortcut( "dvb-c" ); /* Cable */ - add_shortcut( "dvbc" ); - add_shortcut( "qam" ); - add_shortcut( "cable" ); + add_shortcut( "dvb-c" ) /* Cable */ + add_shortcut( "dvbc" ) + add_shortcut( "qam" ) + add_shortcut( "cable" ) - add_shortcut( "dvbt" ); /* Terrestrial */ - add_shortcut( "dvb-t" ); - add_shortcut( "ofdm" ); - add_shortcut( "terrestrial" ); + add_shortcut( "dvbt" ) /* Terrestrial */ + add_shortcut( "dvb-t" ) + add_shortcut( "ofdm" ) + add_shortcut( "terrestrial" ) - add_shortcut( "atsc" ); /* Atsc */ - add_shortcut( "usdigital" ); + add_shortcut( "atsc" ) /* Atsc */ + add_shortcut( "usdigital" ) - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 3d1cadb6b3..cae7367346 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -68,24 +68,24 @@ static void Close( vlc_object_t * ); "Default caching value for Audio CDs. This " \ "value should be set in milliseconds." ) -vlc_module_begin(); - set_shortname( N_("Audio CD")); - set_description( N_("Audio CD input") ); - set_capability( "access", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - set_callbacks( Open, Close ); - - add_usage_hint( N_("[cdda:][device][@[track]]") ); +vlc_module_begin () + set_shortname( N_("Audio CD")) + set_description( N_("Audio CD input") ) + set_capability( "access", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + set_callbacks( Open, Close ) + + add_usage_hint( N_("[cdda:][device][@[track]]") ) add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - add_integer( "cdda-track", -1 , NULL, NULL, NULL, true ); - change_internal(); - add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true ); - change_internal(); - add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, true ); - change_internal(); + add_integer( "cdda-track", -1 , NULL, NULL, NULL, true ) + change_internal () + add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true ) + change_internal () + add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, true ) + change_internal () add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ), @@ -93,9 +93,9 @@ vlc_module_begin(); add_integer( "cddb-port", 8880, NULL, N_( "CDDB port" ), N_( "CDDB Server port to use." ), true ); - add_shortcut( "cdda" ); - add_shortcut( "cddasimple" ); -vlc_module_end(); + add_shortcut( "cdda" ) + add_shortcut( "cddasimple" ) +vlc_module_end () /* how many blocks VCDRead will read in each loop */ diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c index 9bbcc29217..c16272ad20 100644 --- a/modules/access/cdda/cdda.c +++ b/modules/access/cdda/cdda.c @@ -109,16 +109,16 @@ static const char *const psz_paranoia_list_text[] = { N_("none"), N_("overlap"), * Module descriptor *****************************************************************************/ -vlc_module_begin(); - add_usage_hint( N_("cddax://[device-or-file][@[T]track]") ); - set_description( N_("Compact Disc Digital Audio (CD-DA) input") ); - set_capability( "access", 10 /* compare with priority of cdda */ ); - set_shortname( N_("Audio Compact Disc")); - set_callbacks( CDDAOpen, CDDAClose ); - add_shortcut( "cddax" ); - add_shortcut( "cd" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + add_usage_hint( N_("cddax://[device-or-file][@[T]track]") ) + set_description( N_("Compact Disc Digital Audio (CD-DA) input") ) + set_capability( "access", 10 /* compare with priority of cdda */ ) + set_shortname( N_("Audio Compact Disc")) + set_callbacks( CDDAOpen, CDDAClose ) + add_shortcut( "cddax" ) + add_shortcut( "cd" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) /* Configuration options */ add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB, @@ -172,7 +172,7 @@ vlc_module_begin(); #endif /* LIBCDIO_VERSION_NUM >= 72 */ #ifdef HAVE_LIBCDDB - set_section( N_("CDDB" ), 0 ); + set_section( N_("CDDB" ), 0 ) add_string( MODULE_STRING "-cddb-title-format", "Track %T. %t - %p %A", NULL, N_("Format to use in playlist \"title\" field when using CDDB"), @@ -228,4 +228,4 @@ vlc_module_begin(); false ); #endif /*HAVE_LIBCDDB*/ -vlc_module_end(); +vlc_module_end () diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c index 381e14a730..abd1bed295 100644 --- a/modules/access/dc1394.c +++ b/modules/access/dc1394.c @@ -63,12 +63,12 @@ static void Close( vlc_object_t * ); static void OpenAudioDev( demux_t *p_demux ); static inline void CloseAudioDev( demux_t *p_demux ); -vlc_module_begin(); - set_description( N_("dc1394 input") ); - set_capability( "access_demux", 10 ); - add_shortcut( "dc1394" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("dc1394 input") ) + set_capability( "access_demux", 10 ) + add_shortcut( "dc1394" ) + set_callbacks( Open, Close ) +vlc_module_end () typedef struct __dc_camera { diff --git a/modules/access/directory.c b/modules/access/directory.c index aba105f148..1fffcefe76 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -78,22 +78,22 @@ static const char *const psz_recursive_list_text[] = { "This is useful if you add directories that contain playlist files " \ "for instance. Use a comma-separated list of extensions." ) -vlc_module_begin(); - set_category( CAT_INPUT ); - set_shortname( N_("Directory" ) ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - set_description( N_("Standard filesystem directory input") ); - set_capability( "access", 55 ); - add_shortcut( "directory" ); - add_shortcut( "dir" ); - add_shortcut( "file" ); +vlc_module_begin () + set_category( CAT_INPUT ) + set_shortname( N_("Directory" ) ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + set_description( N_("Standard filesystem directory input") ) + set_capability( "access", 55 ) + add_shortcut( "directory" ) + add_shortcut( "dir" ) + add_shortcut( "file" ) add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT, RECURSIVE_LONGTEXT, false ); change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ); add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue", NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 7b2e96a321..f7c7e36756 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -182,25 +182,25 @@ static void AccessClose( vlc_object_t * ); static int DemuxOpen ( vlc_object_t * ); static void DemuxClose ( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("DirectShow") ); - set_description( N_("DirectShow input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("DirectShow") ) + set_description( N_("DirectShow input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dshow-caching", (mtime_t)(0.2*CLOCK_FREQ) / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - add_string( "dshow-vdev", NULL, NULL, VDEV_TEXT, VDEV_LONGTEXT, false); + add_string( "dshow-vdev", NULL, NULL, VDEV_TEXT, VDEV_LONGTEXT, false) change_string_list( ppsz_vdev, ppsz_vdev_text, FindDevicesCallback ); - change_action_add( FindDevicesCallback, N_("Refresh list") ); - change_action_add( ConfigDevicesCallback, N_("Configure") ); + change_action_add( FindDevicesCallback, N_("Refresh list") ) + change_action_add( ConfigDevicesCallback, N_("Configure") ) - add_string( "dshow-adev", NULL, NULL, ADEV_TEXT, ADEV_LONGTEXT, false); + add_string( "dshow-adev", NULL, NULL, ADEV_TEXT, ADEV_LONGTEXT, false) change_string_list( ppsz_adev, ppsz_adev_text, FindDevicesCallback ); - change_action_add( FindDevicesCallback, N_("Refresh list") ); - change_action_add( ConfigDevicesCallback, N_("Configure") ); + change_action_add( FindDevicesCallback, N_("Refresh list") ) + change_action_add( ConfigDevicesCallback, N_("Configure") ) - add_string( "dshow-size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, false); + add_string( "dshow-size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, false) add_string( "dshow-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ); @@ -247,16 +247,16 @@ vlc_module_begin(); add_integer( "dshow-audio-bitspersample", 0, NULL, AUDIO_BITSPERSAMPLE_TEXT, AUDIO_BITSPERSAMPLE_LONGTEXT, true ); - add_shortcut( "dshow" ); - set_capability( "access_demux", 0 ); - set_callbacks( DemuxOpen, DemuxClose ); + add_shortcut( "dshow" ) + set_capability( "access_demux", 0 ) + set_callbacks( DemuxOpen, DemuxClose ) - add_submodule(); - set_description( N_("DirectShow input") ); - set_capability( "access", 0 ); - set_callbacks( AccessOpen, AccessClose ); + add_submodule () + set_description( N_("DirectShow input") ) + set_capability( "access", 0 ) + set_callbacks( AccessOpen, AccessClose ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** * DirectShow elementary stream descriptor diff --git a/modules/access/dv.c b/modules/access/dv.c index a0b004b127..88129edb51 100644 --- a/modules/access/dv.c +++ b/modules/access/dv.c @@ -73,18 +73,18 @@ static int Control( access_t *, int, va_list ); "Caching value for DV streams. This " \ "value should be set in milliseconds." ) -vlc_module_begin(); - set_description( N_("Digital Video (Firewire/ieee1394) input") ); - set_shortname( N_("dv") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_capability( "access", 0 ); - add_shortcut( "dv" ); - add_shortcut( "dv1394" ); - add_shortcut( "raw1394" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Digital Video (Firewire/ieee1394) input") ) + set_shortname( N_("dv") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) + set_capability( "access", 0 ) + add_shortcut( "dv" ) + add_shortcut( "dv1394" ) + add_shortcut( "raw1394" ) + set_callbacks( Open, Close ) +vlc_module_end () typedef struct { diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index 687d9cb162..98e448b1b8 100644 --- a/modules/access/dvb/access.c +++ b/modules/access/dvb/access.c @@ -189,11 +189,11 @@ static void Close( vlc_object_t *p_this ); #define CRL_TEXT N_( "CRL file" ) #define CRL_LONGTEXT N_( "HTTP interface Certificates Revocation List file" ) -vlc_module_begin(); - set_shortname( N_("DVB") ); - set_description( N_("DVB input with v4l2 support") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("DVB") ) + set_description( N_("DVB input with v4l2 support") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); @@ -205,7 +205,7 @@ vlc_module_begin(); false ); add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT, true ); - add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true ); + add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true ) add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT, true ); /* DVB-S (satellite) */ @@ -217,7 +217,7 @@ vlc_module_begin(); HIGH_VOLTAGE_LONGTEXT, true ); add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT, true ); - add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true ); + add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true ) add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT, false ); add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT, @@ -236,14 +236,14 @@ vlc_module_begin(); CODE_RATE_LP_LONGTEXT, true ); add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, true ); - add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, true ); + add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, true ) add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT, TRANSMISSION_LONGTEXT, true ); add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, true ); #ifdef ENABLE_HTTPD /* MMI HTTP interface */ - set_section( N_("HTTP server" ), 0 ); + set_section( N_("HTTP server" ), 0 ) add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true ); add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, @@ -262,25 +262,25 @@ vlc_module_begin(); true ); #endif - set_capability( "access", 0 ); - add_shortcut( "dvb" ); /* Generic name */ + set_capability( "access", 0 ) + add_shortcut( "dvb" ) /* Generic name */ - add_shortcut( "dvb-s" ); /* Satellite */ - add_shortcut( "qpsk" ); - add_shortcut( "satellite" ); + add_shortcut( "dvb-s" ) /* Satellite */ + add_shortcut( "qpsk" ) + add_shortcut( "satellite" ) - add_shortcut( "dvb-c" ); /* Cable */ - add_shortcut( "cable" ); + add_shortcut( "dvb-c" ) /* Cable */ + add_shortcut( "cable" ) - add_shortcut( "dvb-t" ); /* Terrestrial */ - add_shortcut( "terrestrial" ); + add_shortcut( "dvb-t" ) /* Terrestrial */ + add_shortcut( "terrestrial" ) - add_shortcut( "atsc" ); /* Atsc */ - add_shortcut( "usdigital" ); + add_shortcut( "atsc" ) /* Atsc */ + add_shortcut( "usdigital" ) - set_callbacks( Open, Close ); + set_callbacks( Open, Close ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 5a200cbf2d..f1349bc653 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -83,22 +83,22 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("DVD with menus") ); - set_description( N_("DVDnav Input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("DVD with menus") ) + set_description( N_("DVDnav Input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT, ANGLE_LONGTEXT, false ); add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); add_bool( "dvdnav-menu", true, NULL, MENU_TEXT, MENU_LONGTEXT, false ); - set_capability( "access_demux", 5 ); - add_shortcut( "dvd" ); - add_shortcut( "dvdnav" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "access_demux", 5 ) + add_shortcut( "dvd" ) + add_shortcut( "dvdnav" ) + set_callbacks( Open, Close ) +vlc_module_end () /* Shall we use libdvdnav's read ahead cache? */ #define DVD_READ_CACHE 1 diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index 8e1757a5f9..c17d0afd5a 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -101,11 +101,11 @@ static const char *const psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Ke static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("DVD without menus") ); - set_description( N_("DVDRead Input (DVD without menu support)") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("DVD without menus") ) + set_description( N_("DVDRead Input (DVD without menu support)") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT, ANGLE_LONGTEXT, false ); add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL, @@ -113,12 +113,12 @@ vlc_module_begin(); add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT, CSSMETHOD_LONGTEXT, true ); change_string_list( psz_css_list, psz_css_list_text, 0 ); - set_capability( "access_demux", 0 ); - add_shortcut( "dvd" ); - add_shortcut( "dvdread" ); - add_shortcut( "dvdsimple" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "access_demux", 0 ) + add_shortcut( "dvd" ) + add_shortcut( "dvdread" ) + add_shortcut( "dvdsimple" ) + set_callbacks( Open, Close ) +vlc_module_end () /* how many blocks DVDRead will read in each loop */ #define DVD_BLOCK_READ_ONCE 4 diff --git a/modules/access/eyetv.m b/modules/access/eyetv.m index 81d448e409..dad8c053f1 100644 --- a/modules/access/eyetv.m +++ b/modules/access/eyetv.m @@ -63,21 +63,21 @@ static void Close( vlc_object_t * ); "Caching value for EyeTV captures. This " \ "value should be set in milliseconds." ) -vlc_module_begin(); - set_shortname( "EyeTV" ); - set_description( N_("EyeTV access module") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( "EyeTV" ) + set_description( N_("EyeTV access module") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "eyetv-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT, false ); - set_capability( "access", 0 ); - add_shortcut( "eyetv" ); - set_callbacks( Open, Close ); + set_capability( "access", 0 ) + add_shortcut( "eyetv" ) + set_callbacks( Open, Close ) add_integer( "eyetv-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Access: local prototypes diff --git a/modules/access/fake.c b/modules/access/fake.c index 03ac7b15c9..2e0d990f2a 100644 --- a/modules/access/fake.c +++ b/modules/access/fake.c @@ -56,23 +56,23 @@ static void Close( vlc_object_t * ); "Duration of the fake streaming before faking an " \ "end-of-file (default is 0, meaning that the stream is unlimited).") -vlc_module_begin(); - set_shortname( N_("Fake") ); - set_description( N_("Fake input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("Fake") ) + set_description( N_("Fake input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "fake-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - add_float( "fake-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ); - add_integer( "fake-id", 0, NULL, ID_TEXT, ID_LONGTEXT, true ); + add_float( "fake-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) + add_integer( "fake-id", 0, NULL, ID_TEXT, ID_LONGTEXT, true ) add_integer( "fake-duration", 0, NULL, DURATION_TEXT, DURATION_LONGTEXT, true ); - add_shortcut( "fake" ); - set_capability( "access_demux", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_shortcut( "fake" ) + set_capability( "access_demux", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Access: local prototypes diff --git a/modules/access/file.c b/modules/access/file.c index 5a798b236f..83306b45f5 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -79,18 +79,18 @@ static void Close( vlc_object_t * ); "Caching value for files. This " \ "value should be set in milliseconds." ) -vlc_module_begin(); - set_description( N_("File input") ); - set_shortname( N_("File") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - add_obsolete_string( "file-cat" ); - set_capability( "access", 50 ); - add_shortcut( "file" ); - add_shortcut( "stream" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("File input") ) + set_shortname( N_("File") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) + add_obsolete_string( "file-cat" ) + set_capability( "access", 50 ) + add_shortcut( "file" ) + add_shortcut( "stream" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access/ftp.c b/modules/access/ftp.c index 79cf667b14..8cb24f89b3 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -68,12 +68,12 @@ static void OutClose( vlc_object_t * ); #define ACCOUNT_LONGTEXT N_("Account that will be " \ "used for the connection.") -vlc_module_begin(); - set_shortname( "FTP" ); - set_description( N_("FTP input") ); - set_capability( "access", 0 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( "FTP" ) + set_description( N_("FTP input") ) + set_capability( "access", 0 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "ftp-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); add_string( "ftp-user", "anonymous", NULL, USER_TEXT, USER_LONGTEXT, @@ -82,17 +82,17 @@ vlc_module_begin(); PASS_LONGTEXT, false ); add_string( "ftp-account", "anonymous", NULL, ACCOUNT_TEXT, ACCOUNT_LONGTEXT, false ); - add_shortcut( "ftp" ); - set_callbacks( InOpen, InClose ); - - add_submodule(); - set_shortname( "FTP" ); - set_description( N_("FTP upload output") ); - set_capability( "sout access", 0 ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_ACO ); - set_callbacks( OutOpen, OutClose ); -vlc_module_end(); + add_shortcut( "ftp" ) + set_callbacks( InOpen, InClose ) + + add_submodule () + set_shortname( "FTP" ) + set_description( N_("FTP upload output") ) + set_capability( "sout access", 0 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_ACO ) + set_callbacks( OutOpen, OutClose ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c index fb8f56bed8..65880fc670 100644 --- a/modules/access/gnomevfs.c +++ b/modules/access/gnomevfs.c @@ -49,16 +49,16 @@ static void Close( vlc_object_t * ); "Caching value for GnomeVFS streams."\ "This value should be set in milliseconds." ) -vlc_module_begin(); - set_description( N_("GnomeVFS input") ); - set_shortname( "GnomeVFS" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_capability( "access", 10 ); - add_shortcut( "gnomevfs" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("GnomeVFS input") ) + set_shortname( "GnomeVFS" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) + set_capability( "access", 10 ) + add_shortcut( "gnomevfs" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access/http.c b/modules/access/http.c index 75bde96735..b50dc5ae14 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -95,12 +95,12 @@ static void Close( vlc_object_t * ); #define FORWARD_COOKIES_TEXT N_("Forward Cookies") #define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies across http redirections ") -vlc_module_begin(); - set_description( N_("HTTP input") ); - set_capability( "access", 0 ); - set_shortname( N_( "HTTP(S)" ) ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_description( N_("HTTP input") ) + set_capability( "access", 0 ) + set_shortname( N_( "HTTP(S)" ) ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, false ); @@ -116,14 +116,14 @@ vlc_module_begin(); CONTINUOUS_LONGTEXT, true ); add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT, FORWARD_COOKIES_LONGTEXT, true ); - add_obsolete_string("http-user"); - add_obsolete_string("http-pwd"); - add_shortcut( "http" ); - add_shortcut( "https" ); - add_shortcut( "unsv" ); - add_shortcut( "itpc" ); /* iTunes Podcast */ - set_callbacks( Open, Close ); -vlc_module_end(); + add_obsolete_string("http-user") + add_obsolete_string("http-pwd") + add_shortcut( "http" ) + add_shortcut( "https" ) + add_shortcut( "unsv" ) + add_shortcut( "itpc" ) /* iTunes Podcast */ + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/jack.c b/modules/access/jack.c index f8ca424388..f40340ee8c 100644 --- a/modules/access/jack.c +++ b/modules/access/jack.c @@ -70,12 +70,12 @@ static void Close( vlc_object_t * ); #define AUTO_CONNECT_LONGTEXT N_( \ "Automatically connect VLC input ports to available output ports." ) -vlc_module_begin(); - set_description( N_("JACK audio input") ); - set_capability( "access_demux", 0 ); - set_shortname( N_( "JACK Input" ) ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_description( N_("JACK audio input") ) + set_capability( "access_demux", 0 ) + set_shortname( N_( "JACK Input" ) ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "jack-input-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); @@ -84,9 +84,9 @@ vlc_module_begin(); add_bool( "jack-input-auto-connect", false, NULL, AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, true ); - add_shortcut( "jack" ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_shortcut( "jack" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/mmap.c b/modules/access/mmap.c index 2315e2b496..cbec77022d 100644 --- a/modules/access/mmap.c +++ b/modules/access/mmap.c @@ -50,17 +50,17 @@ static int Open (vlc_object_t *); static void Close (vlc_object_t *); -vlc_module_begin(); - set_shortname (N_("MMap")); - set_description (N_("Memory-mapped file input")); - set_category (CAT_INPUT); - set_subcategory (SUBCAT_INPUT_ACCESS); - set_capability ("access", 52); - add_shortcut ("file"); - set_callbacks (Open, Close); +vlc_module_begin () + set_shortname (N_("MMap")) + set_description (N_("Memory-mapped file input")) + set_category (CAT_INPUT) + set_subcategory (SUBCAT_INPUT_ACCESS) + set_capability ("access", 52) + add_shortcut ("file") + set_callbacks (Open, Close) add_bool ("file-mmap", false, NULL, FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true); -vlc_module_end(); +vlc_module_end () static block_t *Block (access_t *); static int Seek (access_t *, int64_t); diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c index fca871e372..04763ff2a4 100644 --- a/modules/access/mms/mms.c +++ b/modules/access/mms/mms.c @@ -69,12 +69,12 @@ static void Close( vlc_object_t * ); #define TIMEOUT_TEXT N_("TCP/UDP timeout (ms)") #define TIMEOUT_LONGTEXT N_("Amount of time (in ms) to wait before aborting network reception of data. Note that there will be 10 retries before completely giving up.") -vlc_module_begin(); - set_shortname( "MMS" ); - set_description( N_("Microsoft Media Server (MMS) input") ); - set_capability( "access", -1 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( "MMS" ) + set_description( N_("Microsoft Media Server (MMS) input") ) + set_capability( "access", -1 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "mms-caching", 19 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); @@ -82,19 +82,19 @@ vlc_module_begin(); add_integer( "mms-timeout", 5000, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT, true ); - add_bool( "mms-all", 0, NULL, ALL_TEXT, ALL_LONGTEXT, true ); + add_bool( "mms-all", 0, NULL, ALL_TEXT, ALL_LONGTEXT, true ) add_integer( "mms-maxbitrate", 0, NULL, BITRATE_TEXT, BITRATE_LONGTEXT , false ); add_string( "mmsh-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, false ); - add_shortcut( "mms" ); - add_shortcut( "mmsu" ); - add_shortcut( "mmst" ); - add_shortcut( "mmsh" ); - add_shortcut( "http" ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_shortcut( "mms" ) + add_shortcut( "mmsu" ) + add_shortcut( "mmst" ) + add_shortcut( "mmsh" ) + add_shortcut( "http" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/pvr.c b/modules/access/pvr.c index ada1a85f71..13e65cb1b7 100644 --- a/modules/access/pvr.c +++ b/modules/access/pvr.c @@ -124,13 +124,13 @@ static const char *const psz_bitrates_list_text[] = { N_("vbr"), N_("cbr") }; static const int pi_radio_range[2] = { 65000, 108000 }; -vlc_module_begin(); - set_shortname( N_("PVR") ); - set_description( N_("IVTV MPEG Encoding cards input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - set_capability( "access", 0 ); - add_shortcut( "pvr" ); +vlc_module_begin () + set_shortname( N_("PVR") ) + set_description( N_("IVTV MPEG Encoding cards input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + set_capability( "access", 0 ) + add_shortcut( "pvr" ) add_integer( "pvr-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); @@ -141,7 +141,7 @@ vlc_module_begin(); add_integer( "pvr-norm", V4L2_STD_UNKNOWN , NULL, NORM_TEXT, NORM_LONGTEXT, false ); change_integer_list( i_norm_list, psz_norm_list_text, NULL ); - add_integer( "pvr-width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ); + add_integer( "pvr-width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ) add_integer( "pvr-height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ); add_integer( "pvr-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT, @@ -163,10 +163,10 @@ vlc_module_begin(); BITMASK_LONGTEXT, true ); add_integer( "pvr-audio-volume", -1, NULL, VOLUME_TEXT, VOLUME_LONGTEXT, true ); - add_integer( "pvr-channel", -1, NULL, CHAN_TEXT, CHAN_LONGTEXT, true ); + add_integer( "pvr-channel", -1, NULL, CHAN_TEXT, CHAN_LONGTEXT, true ) - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Prototypes diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m index b1fbdd3705..ce856aa0da 100644 --- a/modules/access/qtcapture.m +++ b/modules/access/qtcapture.m @@ -51,15 +51,15 @@ static int Control( demux_t *, int, va_list ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( N_("Quicktime Capture") ); - set_description( N_("Quicktime Capture") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_shortcut( "qtcapture" ); - set_capability( "access_demux", 10 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("Quicktime Capture") ) + set_description( N_("Quicktime Capture") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + add_shortcut( "qtcapture" ) + set_capability( "access_demux", 10 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c index e0878779e7..870c48d3ed 100644 --- a/modules/access/rtmp/access.c +++ b/modules/access/rtmp/access.c @@ -48,19 +48,19 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("RTMP input") ); - set_shortname( N_("RTMP") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_description( N_("RTMP input") ) + set_shortname( N_("RTMP") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "rtmp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_capability( "access", 0 ); - set_callbacks( Open, Close ); - add_shortcut( "rtmp" ); -vlc_module_end(); + set_capability( "access", 0 ) + set_callbacks( Open, Close ) + add_shortcut( "rtmp" ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c index 722b9d38b6..9ba74d97f8 100644 --- a/modules/access/rtsp/access.c +++ b/modules/access/rtsp/access.c @@ -48,19 +48,19 @@ static void Close( vlc_object_t * ); "Caching value for RTSP streams. This " \ "value should be set in milliseconds." ) -vlc_module_begin(); - set_description( N_("Real RTSP") ); - set_shortname( N_("Real RTSP") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_description( N_("Real RTSP") ) + set_shortname( N_("Real RTSP") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "realrtsp-caching", 3000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_capability( "access", 10 ); - set_callbacks( Open, Close ); - add_shortcut( "realrtsp" ); - add_shortcut( "rtsp" ); - add_shortcut( "pnm" ); -vlc_module_end(); + set_capability( "access", 10 ) + set_callbacks( Open, Close ) + add_shortcut( "realrtsp" ) + add_shortcut( "rtsp" ) + add_shortcut( "pnm" ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c index 8287967b24..79e825552e 100644 --- a/modules/access/screen/screen.c +++ b/modules/access/screen/screen.c @@ -90,21 +90,21 @@ static void Close( vlc_object_t * ); # define SCREEN_FPS 5 #endif -vlc_module_begin(); - set_description( N_("Screen Input") ); - set_shortname( N_("Screen" )); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_description( N_("Screen Input") ) + set_shortname( N_("Screen" )) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "screen-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - add_float( "screen-fps", SCREEN_FPS, 0, FPS_TEXT, FPS_LONGTEXT, true ); + add_float( "screen-fps", SCREEN_FPS, 0, FPS_TEXT, FPS_LONGTEXT, true ) #ifdef SCREEN_SUBSCREEN - add_integer( "screen-top", 0, NULL, TOP_TEXT, TOP_LONGTEXT, true ); - add_integer( "screen-left", 0, NULL, LEFT_TEXT, LEFT_LONGTEXT, true ); - add_integer( "screen-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ); - add_integer( "screen-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ); + add_integer( "screen-top", 0, NULL, TOP_TEXT, TOP_LONGTEXT, true ) + add_integer( "screen-left", 0, NULL, LEFT_TEXT, LEFT_LONGTEXT, true ) + add_integer( "screen-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ) + add_integer( "screen-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ) add_bool( "screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT, FOLLOW_MOUSE_LONGTEXT, true ); #endif @@ -119,10 +119,10 @@ vlc_module_begin(); FRAGS_LONGTEXT, true ); #endif - set_capability( "access_demux", 0 ); - add_shortcut( "screen" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "access_demux", 0 ) + add_shortcut( "screen" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/smb.c b/modules/access/smb.c index 9b6d4c6f58..ecbacf1ac4 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -75,12 +75,12 @@ static void Close( vlc_object_t * ); #define DOMAIN_LONGTEXT N_("Domain/Workgroup that " \ "will be used for the connection.") -vlc_module_begin(); - set_shortname( "SMB" ); - set_description( N_("SMB input") ); - set_capability( "access", 0 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( "SMB" ) + set_description( N_("SMB input") ) + set_capability( "access", 0 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "smb-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); add_string( "smb-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, @@ -89,9 +89,9 @@ vlc_module_begin(); PASS_LONGTEXT, false ); add_string( "smb-domain", NULL, NULL, DOMAIN_TEXT, DOMAIN_LONGTEXT, false ); - add_shortcut( "smb" ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_shortcut( "smb" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/tcp.c b/modules/access/tcp.c index 6b3a0a7111..e346686442 100644 --- a/modules/access/tcp.c +++ b/modules/access/tcp.c @@ -46,19 +46,19 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("TCP") ); - set_description( N_("TCP input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("TCP") ) + set_description( N_("TCP input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_capability( "access", 0 ); - add_shortcut( "tcp" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "access", 0 ) + add_shortcut( "tcp" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/udp.c b/modules/access/udp.c index 0c22b434fc..4587ade850 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -54,25 +54,25 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("UDP" ) ); - set_description( N_("UDP input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("UDP" ) ) + set_description( N_("UDP input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - add_obsolete_integer( "rtp-late" ); - add_obsolete_bool( "udp-auto-mtu" ); + add_obsolete_integer( "rtp-late" ) + add_obsolete_bool( "udp-auto-mtu" ) - set_capability( "access", 0 ); - add_shortcut( "udp" ); - add_shortcut( "udpstream" ); - add_shortcut( "udp4" ); - add_shortcut( "udp6" ); + set_capability( "access", 0 ) + add_shortcut( "udp" ) + add_shortcut( "udpstream" ) + add_shortcut( "udp4" ) + add_shortcut( "udp6" ) - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/v4l.c b/modules/access/v4l.c index d54bcd40e8..f9b24a56b8 100644 --- a/modules/access/v4l.c +++ b/modules/access/v4l.c @@ -147,11 +147,11 @@ static const int i_norm_list[] = static const char *const psz_norm_list_text[] = { N_("Automatic"), N_("SECAM"), N_("PAL"), N_("NTSC") }; -vlc_module_begin(); - set_shortname( N_("Video4Linux") ); - set_description( N_("Video4Linux input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("Video4Linux") ) + set_description( N_("Video4Linux input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "v4l-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); @@ -161,28 +161,28 @@ vlc_module_begin(); false ); add_string( "v4l-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ); - add_float( "v4l-fps", -1.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ); + add_float( "v4l-fps", -1.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) add_integer( "v4l-samplerate", 44100, NULL, SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT, true ); add_integer( "v4l-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT, true ); - add_integer( "v4l-tuner", -1, NULL, TUNER_TEXT, TUNER_LONGTEXT, true ); + add_integer( "v4l-tuner", -1, NULL, TUNER_TEXT, TUNER_LONGTEXT, true ) add_integer( "v4l-norm", VIDEO_MODE_AUTO, NULL, NORM_TEXT, NORM_LONGTEXT, false ); change_integer_list( i_norm_list, psz_norm_list_text, NULL ); add_integer( "v4l-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT, false ); - add_integer( "v4l-audio", -1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, true ); + add_integer( "v4l-audio", -1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, true ) add_bool( "v4l-stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT, true ); - add_integer( "v4l-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ); + add_integer( "v4l-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ) add_integer( "v4l-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ); add_integer( "v4l-brightness", -1, NULL, BRIGHTNESS_TEXT, BRIGHTNESS_LONGTEXT, true ); add_integer( "v4l-colour", -1, NULL, COLOUR_TEXT, COLOUR_LONGTEXT, true ); - add_integer( "v4l-hue", -1, NULL, HUE_TEXT, HUE_LONGTEXT, true ); + add_integer( "v4l-hue", -1, NULL, HUE_TEXT, HUE_LONGTEXT, true ) add_integer( "v4l-contrast", -1, NULL, CONTRAST_TEXT, CONTRAST_LONGTEXT, true ); add_bool( "v4l-mjpeg", false, NULL, MJPEG_TEXT, MJPEG_LONGTEXT, @@ -192,10 +192,10 @@ vlc_module_begin(); add_integer( "v4l-quality", 100, NULL, QUALITY_TEXT, QUALITY_LONGTEXT, true ); - add_shortcut( "v4l" ); - set_capability( "access_demux", 10 ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_shortcut( "v4l" ) + set_capability( "access_demux", 10 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Access: local prototypes diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c index 063698faa8..bbe8cccc75 100644 --- a/modules/access/v4l2/v4l2.c +++ b/modules/access/v4l2/v4l2.c @@ -282,13 +282,13 @@ static const char *const psz_tuner_audio_modes_list_text[] = #define ALSA_DEFAULT "hw" #define CFG_PREFIX "v4l2-" -vlc_module_begin(); - set_shortname( N_("Video4Linux2") ); - set_description( N_("Video4Linux2 input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("Video4Linux2") ) + set_description( N_("Video4Linux2 input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) - set_section( N_( "Video input" ), NULL ); + set_section( N_( "Video input" ), NULL ) add_string( CFG_PREFIX "dev", "/dev/video0", 0, DEV_TEXT, DEV_LONGTEXT, false ); add_integer( CFG_PREFIX "standard", 0, NULL, STANDARD_TEXT, @@ -307,9 +307,9 @@ vlc_module_begin(); WIDTH_LONGTEXT, true ); add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ); - add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, true ); + add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) - set_section( N_( "Audio input" ), NULL ); + set_section( N_( "Audio input" ), NULL ) add_string( CFG_PREFIX "adev", NULL, 0, ADEV_TEXT, ADEV_LONGTEXT, false ); add_integer( CFG_PREFIX "audio-method", AUDIO_METHOD_OSS|AUDIO_METHOD_ALSA, @@ -321,7 +321,7 @@ vlc_module_begin(); add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_section( N_( "Tuner" ), NULL ); + set_section( N_( "Tuner" ), NULL ) add_integer( CFG_PREFIX "tuner", 0, NULL, TUNER_TEXT, TUNER_LONGTEXT, true ); add_integer( CFG_PREFIX "tuner-frequency", -1, NULL, FREQUENCY_TEXT, @@ -384,18 +384,18 @@ vlc_module_begin(); add_string( CFG_PREFIX "set-ctrls", NULL, NULL, S_CTRLS_TEXT, S_CTRLS_LONGTEXT, true ); - add_shortcut( "v4l2" ); - set_capability( "access_demux", 10 ); - set_callbacks( DemuxOpen, DemuxClose ); + add_shortcut( "v4l2" ) + set_capability( "access_demux", 10 ) + set_callbacks( DemuxOpen, DemuxClose ) - add_submodule(); - add_shortcut( "v4l2c" ); - set_description( N_("Video4Linux2 Compressed A/V") ); - set_capability( "access", 0 ); + add_submodule () + add_shortcut( "v4l2c" ) + set_description( N_("Video4Linux2 Compressed A/V") ) + set_capability( "access", 0 ) /* use these when open as access_demux fails; VLC will use another demux */ - set_callbacks( AccessOpen, AccessClose ); + set_callbacks( AccessOpen, AccessClose ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Access: local prototypes diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c index 575ff32668..5059b776c4 100644 --- a/modules/access/vcd/vcd.c +++ b/modules/access/vcd/vcd.c @@ -48,20 +48,20 @@ static void Close( vlc_object_t * ); "Caching value for VCDs. This " \ "value should be set in milliseconds." ) -vlc_module_begin(); - set_shortname( N_("VCD")); - set_description( N_("VCD input") ); - set_capability( "access", 60 ); - set_callbacks( Open, Close ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - - add_usage_hint( N_("[vcd:][device][@[title][,[chapter]]]") ); +vlc_module_begin () + set_shortname( N_("VCD")) + set_description( N_("VCD input") ) + set_capability( "access", 60 ) + set_callbacks( Open, Close ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + + add_usage_hint( N_("[vcd:][device][@[title][,[chapter]]]") ) add_integer( "vcd-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - add_shortcut( "vcd" ); - add_shortcut( "svcd" ); -vlc_module_end(); + add_shortcut( "vcd" ) + add_shortcut( "svcd" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c index e4d525f8bd..93bf8ec6cc 100644 --- a/modules/access/vcdx/vcd.c +++ b/modules/access/vcdx/vcd.c @@ -97,15 +97,15 @@ int BlocksPerReadCallback ( vlc_object_t *p_this, const char *psz_name, * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( N_("(Super) Video CD")); - set_description( N_("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") ); - add_usage_hint( N_("vcdx://[device-or-file][@{P,S,T}num]") ); - add_shortcut( "vcdx" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - set_capability( "access", 55 /* slightly lower than vcd */ ); - set_callbacks( VCDOpen, VCDClose ); +vlc_module_begin () + set_shortname( N_("(Super) Video CD")) + set_description( N_("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") ) + add_usage_hint( N_("vcdx://[device-or-file][@{P,S,T}num]") ) + add_shortcut( "vcdx" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + set_capability( "access", 55 /* slightly lower than vcd */ ) + set_callbacks( VCDOpen, VCDClose ) /* Configuration options */ add_integer ( MODULE_STRING "-debug", 0, NULL, @@ -149,5 +149,5 @@ vlc_module_begin(); N_("Format to use in the playlist's \"title\" field."), VCD_TITLE_FMT_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () diff --git a/modules/access_filter/bandwidth.c b/modules/access_filter/bandwidth.c index cb786772e3..995ee8aced 100644 --- a/modules/access_filter/bandwidth.c +++ b/modules/access_filter/bandwidth.c @@ -41,18 +41,18 @@ static void Close (vlc_object_t *); /* TODO: burst support */ -vlc_module_begin (); - set_shortname (N_("Bandwidth")); - set_description (N_("Bandwidth limiter")); - set_category (CAT_INPUT); - set_subcategory (SUBCAT_INPUT_ACCESS_FILTER); - set_capability ("access_filter", 0); - add_shortcut ("bandwidth"); - set_callbacks (Open, Close); +vlc_module_begin () + set_shortname (N_("Bandwidth")) + set_description (N_("Bandwidth limiter")) + set_category (CAT_INPUT) + set_subcategory (SUBCAT_INPUT_ACCESS_FILTER) + set_capability ("access_filter", 0) + add_shortcut ("bandwidth") + set_callbacks (Open, Close) add_integer ("access-bandwidth", 65536, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, false); -vlc_module_end(); +vlc_module_end () static ssize_t Read (access_t *access, uint8_t *buffer, size_t len); static int Seek (access_t *access, int64_t offset); diff --git a/modules/access_filter/dump.c b/modules/access_filter/dump.c index a6c51b9871..932e919033 100644 --- a/modules/access_filter/dump.c +++ b/modules/access_filter/dump.c @@ -50,20 +50,20 @@ static int Open (vlc_object_t *); static void Close (vlc_object_t *); -vlc_module_begin (); - set_shortname (N_("Dump")); - set_description (N_("Dump")); - set_category (CAT_INPUT); - set_subcategory (SUBCAT_INPUT_ACCESS_FILTER); - set_capability ("access_filter", 0); - add_shortcut ("dump"); - set_callbacks (Open, Close); +vlc_module_begin () + set_shortname (N_("Dump")) + set_description (N_("Dump")) + set_category (CAT_INPUT) + set_subcategory (SUBCAT_INPUT_ACCESS_FILTER) + set_capability ("access_filter", 0) + add_shortcut ("dump") + set_callbacks (Open, Close) add_bool ("dump-force", false, NULL, FORCE_TEXT, FORCE_LONGTEXT, false); add_integer ("dump-margin", DEFAULT_MARGIN, NULL, MARGIN_TEXT, MARGIN_LONGTEXT, false); -vlc_module_end(); +vlc_module_end () static ssize_t Read (access_t *access, uint8_t *buffer, size_t len); static block_t *Block (access_t *access); diff --git a/modules/access_filter/timeshift.c b/modules/access_filter/timeshift.c index 0a124baa85..8a612069b8 100644 --- a/modules/access_filter/timeshift.c +++ b/modules/access_filter/timeshift.c @@ -61,21 +61,21 @@ static void Close( vlc_object_t * ); #define FORCE_LONGTEXT N_("Force use of the timeshift module even if the " \ "access declares that it can control pace or pause." ) -vlc_module_begin(); - set_shortname( N_("Timeshift") ); - set_description( N_("Timeshift") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS_FILTER ); - set_capability( "access_filter", 0 ); - add_shortcut( "timeshift" ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_shortname( N_("Timeshift") ) + set_description( N_("Timeshift") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS_FILTER ) + set_capability( "access_filter", 0 ) + add_shortcut( "timeshift" ) + set_callbacks( Open, Close ) add_integer( "timeshift-granularity", 50, NULL, GRANULARITY_TEXT, GRANULARITY_LONGTEXT, true ); - add_directory( "timeshift-dir", 0, 0, DIR_TEXT, DIR_LONGTEXT, false ); + add_directory( "timeshift-dir", 0, 0, DIR_TEXT, DIR_LONGTEXT, false ) add_bool( "timeshift-force", false, NULL, FORCE_TEXT, FORCE_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access_output/dummy.c b/modules/access_output/dummy.c index 183e41d323..4a392f780d 100644 --- a/modules/access_output/dummy.c +++ b/modules/access_output/dummy.c @@ -41,15 +41,15 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("Dummy stream output") ); - set_shortname( N_( "Dummy" )); - set_capability( "sout access", 0 ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_ACO ); - add_shortcut( "dummy" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Dummy stream output") ) + set_shortname( N_( "Dummy" )) + set_capability( "sout access", 0 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_ACO ) + add_shortcut( "dummy" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access_output/file.c b/modules/access_output/file.c index 56ccd02ddc..83ded48963 100644 --- a/modules/access_output/file.c +++ b/modules/access_output/file.c @@ -65,18 +65,18 @@ static void Close( vlc_object_t * ); #define APPEND_LONGTEXT N_( "Append to file if it exists instead " \ "of replacing it.") -vlc_module_begin(); - set_description( N_("File stream output") ); - set_shortname( N_("File" )); - set_capability( "sout access", 50 ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_ACO ); - add_shortcut( "file" ); - add_shortcut( "stream" ); +vlc_module_begin () + set_description( N_("File stream output") ) + set_shortname( N_("File" )) + set_capability( "sout access", 50 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_ACO ) + add_shortcut( "file" ) + add_shortcut( "stream" ) add_bool( SOUT_CFG_PREFIX "append", 0, NULL, APPEND_TEXT,APPEND_LONGTEXT, true ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access_output/http.c b/modules/access_output/http.c index a55a1d497e..5644352ff4 100644 --- a/modules/access_output/http.c +++ b/modules/access_output/http.c @@ -91,15 +91,15 @@ static void Close( vlc_object_t * ); #define BONJOUR_LONGTEXT N_( "Advertise the stream with the Bonjour protocol." ) -vlc_module_begin(); - set_description( N_("HTTP stream output") ); - set_capability( "sout access", 0 ); - set_shortname( "HTTP" ); - add_shortcut( "http" ); - add_shortcut( "https" ); - add_shortcut( "mmsh" ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_ACO ); +vlc_module_begin () + set_description( N_("HTTP stream output") ) + set_capability( "sout access", 0 ) + set_shortname( "HTTP" ) + add_shortcut( "http" ) + add_shortcut( "https" ) + add_shortcut( "mmsh" ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_ACO ) add_string( SOUT_CFG_PREFIX "user", "", NULL, USER_TEXT, USER_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "pwd", "", NULL, @@ -116,8 +116,8 @@ vlc_module_begin(); CRL_TEXT, CRL_LONGTEXT, true ); add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL, BONJOUR_TEXT, BONJOUR_LONGTEXT, true); - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c index bc7caa3596..f2155c714a 100644 --- a/modules/access_output/rtmp.c +++ b/modules/access_output/rtmp.c @@ -51,17 +51,17 @@ static void Close( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-rtmp-" -vlc_module_begin(); - set_description( N_("RTMP stream output") ); - set_shortname( N_("RTMP" ) ); - set_capability( "sout access", 50 ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_STREAM ); - add_shortcut( "rtmp" ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_description( N_("RTMP stream output") ) + set_shortname( N_("RTMP" ) ) + set_capability( "sout access", 50 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_STREAM ) + add_shortcut( "rtmp" ) + set_callbacks( Open, Close ) add_bool( "rtmp-connect", false, NULL, RTMP_CONNECT_TEXT, RTMP_CONNECT_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c index 5a73958666..6fc3a47f4c 100644 --- a/modules/access_output/shout.c +++ b/modules/access_output/shout.c @@ -106,13 +106,13 @@ static void Close( vlc_object_t * ); "website. Requires the bitrate information specified for " \ "shoutcast. Requires Ogg streaming for icecast." ) -vlc_module_begin(); - set_description( N_("IceCAST output") ); - set_shortname( "Shoutcast" ); - set_capability( "sout access", 50 ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_ACO ); - add_shortcut( "shout" ); +vlc_module_begin () + set_description( N_("IceCAST output") ) + set_shortname( "Shoutcast" ) + set_capability( "sout access", 50 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_ACO ) + add_shortcut( "shout" ) add_string( SOUT_CFG_PREFIX "name", "VLC media player - Live stream", NULL, NAME_TEXT, NAME_LONGTEXT, false ); add_string( SOUT_CFG_PREFIX "description", @@ -134,8 +134,8 @@ vlc_module_begin(); QUALITY_TEXT, QUALITY_LONGTEXT, false ); add_bool( SOUT_CFG_PREFIX "public", false, NULL, PUBLIC_TEXT, PUBLIC_LONGTEXT, true ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index 9cc5d11d51..8952c46408 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -76,21 +76,21 @@ static void Close( vlc_object_t * ); "helps reducing the scheduling load on " \ "heavily-loaded systems." ) -vlc_module_begin(); - set_description( N_("UDP stream output") ); - set_shortname( "UDP" ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_ACO ); - add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); +vlc_module_begin () + set_description( N_("UDP stream output") ) + set_shortname( "UDP" ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_ACO ) + add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "group", 1, NULL, GROUP_TEXT, GROUP_LONGTEXT, true ); - add_obsolete_integer( SOUT_CFG_PREFIX "late" ); - add_obsolete_bool( SOUT_CFG_PREFIX "raw" ); + add_obsolete_integer( SOUT_CFG_PREFIX "late" ) + add_obsolete_bool( SOUT_CFG_PREFIX "raw" ) - set_capability( "sout access", 100 ); - add_shortcut( "udp" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "sout access", 100 ) + add_shortcut( "udp" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes diff --git a/modules/audio_filter/channel_mixer/dolby.c b/modules/audio_filter/channel_mixer/dolby.c index 0cfb7c0403..3b54cae2c2 100644 --- a/modules/audio_filter/channel_mixer/dolby.c +++ b/modules/audio_filter/channel_mixer/dolby.c @@ -45,14 +45,14 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Simple decoder for Dolby Surround encoded streams") ); - set_shortname( N_("Dolby Surround decoder") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_capability( "audio filter", 5 ); - set_callbacks( Create, Destroy ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Simple decoder for Dolby Surround encoded streams") ) + set_shortname( N_("Dolby Surround decoder") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_capability( "audio filter", 5 ) + set_callbacks( Create, Destroy ) +vlc_module_end () /***************************************************************************** * Internal data structures diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c index f854d8dadb..f791ac3aa9 100644 --- a/modules/audio_filter/channel_mixer/headphone.c +++ b/modules/audio_filter/channel_mixer/headphone.c @@ -78,12 +78,12 @@ static block_t *Convert( filter_t *, block_t * ); "Dolby Surround encoded streams won't be decoded before being " \ "processed by this filter. Enabling this setting is not recommended.") -vlc_module_begin(); - set_description( N_("Headphone virtual spatialization effect") ); - set_shortname( N_("Headphone effect") ); - set_help( MODULE_DESCRIPTION ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AFILTER ); +vlc_module_begin () + set_description( N_("Headphone virtual spatialization effect") ) + set_shortname( N_("Headphone effect") ) + set_help( MODULE_DESCRIPTION ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AFILTER ) add_integer( "headphone-dim", 10, NULL, HEADPHONE_DIM_TEXT, HEADPHONE_DIM_LONGTEXT, false ); @@ -92,16 +92,16 @@ vlc_module_begin(); add_bool( "headphone-dolby", 0, NULL, HEADPHONE_DOLBY_TEXT, HEADPHONE_DOLBY_LONGTEXT, true ); - set_capability( "audio filter", 0 ); - set_callbacks( Create, Destroy ); - add_shortcut( "headphone" ); + set_capability( "audio filter", 0 ) + set_callbacks( Create, Destroy ) + add_shortcut( "headphone" ) /* Audio filter 2 */ - add_submodule(); - set_description( N_("Headphone virtual spatialization effect") ); - set_capability( "audio filter2", 0 ); - set_callbacks( OpenFilter, CloseFilter ); -vlc_module_end(); + add_submodule () + set_description( N_("Headphone virtual spatialization effect") ) + set_capability( "audio filter2", 0 ) + set_callbacks( OpenFilter, CloseFilter ) +vlc_module_end () /***************************************************************************** diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c index 6e6be60934..221a5b9589 100644 --- a/modules/audio_filter/channel_mixer/mono.c +++ b/modules/audio_filter/channel_mixer/mono.c @@ -110,9 +110,9 @@ static const uint32_t pi_channels_out[] = /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Audio filter for stereo to mono conversion") ); - set_capability( "audio filter2", 2 ); +vlc_module_begin () + set_description( N_("Audio filter for stereo to mono conversion") ) + set_capability( "audio filter2", 2 ) add_bool( MONO_CFG "downmix", true, NULL, MONO_DOWNMIX_TEXT, MONO_DOWNMIX_LONGTEXT, false ); @@ -120,11 +120,11 @@ vlc_module_begin(); MONO_CHANNEL_LONGTEXT, false ); change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_callbacks( OpenFilter, CloseFilter ); - set_shortname( "Mono" ); -vlc_module_end(); + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_callbacks( OpenFilter, CloseFilter ) + set_shortname( "Mono" ) +vlc_module_end () /* Init() and ComputeChannelOperations() - * Code taken from modules/audio_filter/channel_mixer/headphone.c diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c index 7fa42580da..00f644a0d9 100644 --- a/modules/audio_filter/channel_mixer/simple.c +++ b/modules/audio_filter/channel_mixer/simple.c @@ -40,18 +40,18 @@ static int Create ( vlc_object_t * ); static int OpenFilter( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("Audio filter for simple channel mixing") ); - set_capability( "audio filter", 10 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_callbacks( Create, NULL ); - - add_submodule(); - set_description( N_("audio filter for simple channel mixing") ); - set_capability( "audio filter2", 10 ); - set_callbacks( OpenFilter, NULL ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Audio filter for simple channel mixing") ) + set_capability( "audio filter", 10 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_callbacks( Create, NULL ) + + add_submodule () + set_description( N_("audio filter for simple channel mixing") ) + set_capability( "audio filter2", 10 ) + set_callbacks( OpenFilter, NULL ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c index 0f8cd21adb..ee393ed48d 100644 --- a/modules/audio_filter/channel_mixer/trivial.c +++ b/modules/audio_filter/channel_mixer/trivial.c @@ -44,13 +44,13 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Audio filter for trivial channel mixing") ); - set_capability( "audio filter", 1 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Audio filter for trivial channel mixing") ) + set_capability( "audio filter", 1 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: allocate trivial channel mixer diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c index 699ca3f30b..f8a900dffb 100644 --- a/modules/audio_filter/converter/a52tofloat32.c +++ b/modules/audio_filter/converter/a52tofloat32.c @@ -101,21 +101,21 @@ struct filter_sys_t #define UPMIX_LONGTEXT N_( \ "Enable the internal upmixing algorithm (not recommended).") -vlc_module_begin(); - set_shortname( "A/52" ); - set_description( N_("ATSC A/52 (AC-3) audio decoder") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false ); - add_bool( "a52-upmix", 0, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, true ); - set_capability( "audio filter", 100 ); - set_callbacks( Create, Destroy ); - - add_submodule(); - set_description( N_("ATSC A/52 (AC-3) audio decoder") ); - set_capability( "audio filter2", 100 ); - set_callbacks( OpenFilter, CloseFilter ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "A/52" ) + set_description( N_("ATSC A/52 (AC-3) audio decoder") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false ) + add_bool( "a52-upmix", 0, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, true ) + set_capability( "audio filter", 100 ) + set_callbacks( Create, Destroy ) + + add_submodule () + set_description( N_("ATSC A/52 (AC-3) audio decoder") ) + set_capability( "audio filter2", 100 ) + set_callbacks( OpenFilter, CloseFilter ) +vlc_module_end () /***************************************************************************** * Create: diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c index 3f08c85a34..58f463bed7 100644 --- a/modules/audio_filter/converter/a52tospdif.c +++ b/modules/audio_filter/converter/a52tospdif.c @@ -49,13 +49,13 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_description( N_("Audio filter for A/52->S/PDIF encapsulation") ); - set_capability( "audio filter", 10 ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Audio filter for A/52->S/PDIF encapsulation") ) + set_capability( "audio filter", 10 ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c index 4041cb7cff..0028e13cab 100644 --- a/modules/audio_filter/converter/dtstofloat32.c +++ b/modules/audio_filter/converter/dtstofloat32.c @@ -88,20 +88,20 @@ struct filter_sys_t "compression the playback will be more adapted to a movie theater or a " \ "listening room.") -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_shortname( "DCA" ); - set_description( N_("DTS Coherent Acoustics audio decoder") ); - add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false ); - set_capability( "audio filter", 100 ); - set_callbacks( Create, Destroy ); - - add_submodule(); - set_description( N_("DTS Coherent Acoustics audio decoder") ); - set_capability( "audio filter2", 100 ); - set_callbacks( OpenFilter, CloseFilter ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_shortname( "DCA" ) + set_description( N_("DTS Coherent Acoustics audio decoder") ) + add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false ) + set_capability( "audio filter", 100 ) + set_callbacks( Create, Destroy ) + + add_submodule () + set_description( N_("DTS Coherent Acoustics audio decoder") ) + set_capability( "audio filter2", 100 ) + set_callbacks( OpenFilter, CloseFilter ) +vlc_module_end () /***************************************************************************** * Create: diff --git a/modules/audio_filter/converter/dtstospdif.c b/modules/audio_filter/converter/dtstospdif.c index 4fce3130b8..9a6a8bf991 100644 --- a/modules/audio_filter/converter/dtstospdif.c +++ b/modules/audio_filter/converter/dtstospdif.c @@ -66,13 +66,13 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_description( N_("Audio filter for DTS->S/PDIF encapsulation") ); - set_capability( "audio filter", 10 ); - set_callbacks( Create, Close ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Audio filter for DTS->S/PDIF encapsulation") ) + set_capability( "audio filter", 10 ) + set_callbacks( Create, Close ) +vlc_module_end () /***************************************************************************** * Create: diff --git a/modules/audio_filter/converter/fixed.c b/modules/audio_filter/converter/fixed.c index ec592d5632..1282838fef 100644 --- a/modules/audio_filter/converter/fixed.c +++ b/modules/audio_filter/converter/fixed.c @@ -53,18 +53,18 @@ static void Do_U8ToF32( aout_instance_t *, aout_filter_t *, aout_buffer_t *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Fixed point audio format conversions") ); - add_submodule(); - set_callbacks( Create_F32ToS16, NULL ); - set_capability( "audio filter", 10 ); - add_submodule(); - set_callbacks( Create_S16ToF32, NULL ); - set_capability( "audio filter", 15 ); - add_submodule(); - set_callbacks( Create_U8ToF32, NULL ); - set_capability( "audio filter", 1 ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Fixed point audio format conversions") ) + add_submodule () + set_callbacks( Create_F32ToS16, NULL ) + set_capability( "audio filter", 10 ) + add_submodule () + set_callbacks( Create_S16ToF32, NULL ) + set_capability( "audio filter", 15 ) + add_submodule () + set_callbacks( Create_U8ToF32, NULL ) + set_capability( "audio filter", 1 ) +vlc_module_end () /***************************************************************************** * F32 to S16 diff --git a/modules/audio_filter/converter/float.c b/modules/audio_filter/converter/float.c index 7d9c0227b6..10dbe28e98 100644 --- a/modules/audio_filter/converter/float.c +++ b/modules/audio_filter/converter/float.c @@ -98,36 +98,36 @@ static void Do_U8ToFL32( aout_instance_t *, aout_filter_t *, aout_buffer_t *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Floating-point audio format conversions") ); - add_submodule(); - set_capability( "audio filter", 10 ); - set_callbacks( Create_F32ToFL32, NULL ); - add_submodule(); - set_capability( "audio filter", 1 ); - set_callbacks( Create_FL32ToS16, NULL ); - add_submodule(); - set_capability( "audio filter", 1 ); - set_callbacks( Create_FL32ToS8, NULL ); - add_submodule(); - set_capability( "audio filter", 1 ); - set_callbacks( Create_FL32ToU16, NULL ); - add_submodule(); - set_capability( "audio filter", 1 ); - set_callbacks( Create_FL32ToU8, NULL ); - add_submodule(); - set_capability( "audio filter", 1 ); - set_callbacks( Create_S16ToFL32, NULL ); - add_submodule(); - set_capability( "audio filter", 1 ); - set_callbacks( Create_S16ToFL32_SW, NULL ); /* Endianness conversion*/ - add_submodule(); - set_capability( "audio filter", 1 ); - set_callbacks( Create_S8ToFL32, NULL ); - add_submodule(); - set_capability( "audio filter", 1 ); - set_callbacks( Create_U8ToFL32, NULL ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Floating-point audio format conversions") ) + add_submodule () + set_capability( "audio filter", 10 ) + set_callbacks( Create_F32ToFL32, NULL ) + add_submodule () + set_capability( "audio filter", 1 ) + set_callbacks( Create_FL32ToS16, NULL ) + add_submodule () + set_capability( "audio filter", 1 ) + set_callbacks( Create_FL32ToS8, NULL ) + add_submodule () + set_capability( "audio filter", 1 ) + set_callbacks( Create_FL32ToU16, NULL ) + add_submodule () + set_capability( "audio filter", 1 ) + set_callbacks( Create_FL32ToU8, NULL ) + add_submodule () + set_capability( "audio filter", 1 ) + set_callbacks( Create_S16ToFL32, NULL ) + add_submodule () + set_capability( "audio filter", 1 ) + set_callbacks( Create_S16ToFL32_SW, NULL ) /* Endianness conversion*/ + add_submodule () + set_capability( "audio filter", 1 ) + set_callbacks( Create_S8ToFL32, NULL ) + add_submodule () + set_capability( "audio filter", 1 ) + set_callbacks( Create_U8ToFL32, NULL ) +vlc_module_end () /***************************************************************************** * Fixed 32 to Float 32 and backwards diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index 5e8de153d5..357ccb8b6c 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -66,18 +66,18 @@ struct filter_sys_t /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_description( N_("MPEG audio decoder") ); - set_capability( "audio filter", 100 ); - set_callbacks( Create, Destroy ); - - add_submodule(); - set_description( N_("MPEG audio decoder") ); - set_capability( "audio filter2", 100 ); - set_callbacks( OpenFilter, CloseFilter ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_description( N_("MPEG audio decoder") ) + set_capability( "audio filter", 100 ) + set_callbacks( Create, Destroy ) + + add_submodule () + set_description( N_("MPEG audio decoder") ) + set_capability( "audio filter2", 100 ) + set_callbacks( OpenFilter, CloseFilter ) +vlc_module_end () /***************************************************************************** * Create: diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index de3476059c..ae456f312e 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -69,12 +69,12 @@ static void Close( vlc_object_t * ); #define PREAMP_TEXT N_("Global gain" ) #define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)." ) -vlc_module_begin(); - set_description( N_("Equalizer with 10 bands") ); - set_shortname( N_("Equalizer" ) ); - set_capability( "audio filter", 0 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AFILTER ); +vlc_module_begin () + set_description( N_("Equalizer with 10 bands") ) + set_shortname( N_("Equalizer" ) ) + set_capability( "audio filter", 0 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AFILTER ) add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT, PRESET_LONGTEXT, false ); @@ -85,9 +85,9 @@ vlc_module_begin(); TWOPASS_LONGTEXT, true ); add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT, PREAMP_LONGTEXT, true ); - set_callbacks( Open, Close ); - add_shortcut( "equalizer" ); -vlc_module_end(); + set_callbacks( Open, Close ) + add_shortcut( "equalizer" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c index b90f109f2d..0811231b10 100644 --- a/modules/audio_filter/format.c +++ b/modules/audio_filter/format.c @@ -201,13 +201,13 @@ static const struct /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Audio filter for PCM format conversion") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_capability( "audio filter2", 1 ); - set_callbacks( Open, NULL ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Audio filter for PCM format conversion") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_capability( "audio filter2", 1 ) + set_callbacks( Open, NULL ) +vlc_module_end () /***************************************************************************** * Open: diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c index 8b9f34272b..8f5dc48f4c 100644 --- a/modules/audio_filter/normvol.c +++ b/modules/audio_filter/normvol.c @@ -79,19 +79,19 @@ typedef struct aout_filter_sys_t "This value is a positive floating point number. A value " \ "between 0.5 and 10 seems sensible." ) -vlc_module_begin(); - set_description( N_("Volume normalizer") ); - set_shortname( N_("Volume normalizer") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AFILTER ); - add_shortcut( "volnorm" ); +vlc_module_begin () + set_description( N_("Volume normalizer") ) + set_shortname( N_("Volume normalizer") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AFILTER ) + add_shortcut( "volnorm" ) add_integer( "norm-buff-size", 20 ,NULL ,BUFF_TEXT, BUFF_LONGTEXT, true); add_float( "norm-max-level", 2.0, NULL, LEVEL_TEXT, LEVEL_LONGTEXT, true ); - set_capability( "audio filter", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "audio filter", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: initialize and create stuff diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c index 53c000f0e7..4479d57a7d 100644 --- a/modules/audio_filter/param_eq.c +++ b/modules/audio_filter/param_eq.c @@ -47,37 +47,37 @@ static void ProcessEQ( float *, float *, float *, unsigned, unsigned, float *, u static void DoWork( aout_instance_t *, aout_filter_t *, aout_buffer_t *, aout_buffer_t * ); -vlc_module_begin(); - set_description( N_("Parametric Equalizer") ); - set_shortname( N_("Parametric Equalizer" ) ); - set_capability( "audio filter", 0 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AFILTER ); - - add_float( "param-eq-lowf", 100, NULL, N_("Low freq (Hz)"),"", false ); +vlc_module_begin () + set_description( N_("Parametric Equalizer") ) + set_shortname( N_("Parametric Equalizer" ) ) + set_capability( "audio filter", 0 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AFILTER ) + + add_float( "param-eq-lowf", 100, NULL, N_("Low freq (Hz)"),"", false ) add_float_with_range( "param-eq-lowgain", 0, -20.0, 20.0, NULL, N_("Low freq gain (dB)"), "",false ); - add_float( "param-eq-highf", 10000, NULL, N_("High freq (Hz)"),"", false ); + add_float( "param-eq-highf", 10000, NULL, N_("High freq (Hz)"),"", false ) add_float_with_range( "param-eq-highgain", 0, -20.0, 20.0, NULL, N_("High freq gain (dB)"),"",false ); - add_float( "param-eq-f1", 300, NULL, N_("Freq 1 (Hz)"),"", false ); + add_float( "param-eq-f1", 300, NULL, N_("Freq 1 (Hz)"),"", false ) add_float_with_range( "param-eq-gain1", 0, -20.0, 20.0, NULL, N_("Freq 1 gain (dB)"), "",false ); add_float_with_range( "param-eq-q1", 3, 0.1, 100.0, NULL, N_("Freq 1 Q"), "",false ); - add_float( "param-eq-f2", 1000, NULL, N_("Freq 2 (Hz)"),"", false ); + add_float( "param-eq-f2", 1000, NULL, N_("Freq 2 (Hz)"),"", false ) add_float_with_range( "param-eq-gain2", 0, -20.0, 20.0, NULL, N_("Freq 2 gain (dB)"),"",false ); add_float_with_range( "param-eq-q2", 3, 0.1, 100.0, NULL, N_("Freq 2 Q"),"",false ); - add_float( "param-eq-f3", 3000, NULL, N_("Freq 3 (Hz)"),"", false ); + add_float( "param-eq-f3", 3000, NULL, N_("Freq 3 (Hz)"),"", false ) add_float_with_range( "param-eq-gain3", 0, -20.0, 20.0, NULL, N_("Freq 3 gain (dB)"),"",false ); add_float_with_range( "param-eq-q3", 3, 0.1, 100.0, NULL, N_("Freq 3 Q"),"",false ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c index 3eddef55bf..12e1f0b513 100644 --- a/modules/audio_filter/resampler/bandlimited.c +++ b/modules/audio_filter/resampler/bandlimited.c @@ -92,18 +92,18 @@ struct filter_sys_t /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_description( N_("Audio filter for band-limited interpolation resampling") ); - set_capability( "audio filter", 20 ); - set_callbacks( Create, Close ); - - add_submodule(); - set_description( _("Audio filter for band-limited interpolation resampling") ); - set_capability( "audio filter2", 20 ); - set_callbacks( OpenFilter, CloseFilter ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Audio filter for band-limited interpolation resampling") ) + set_capability( "audio filter", 20 ) + set_callbacks( Create, Close ) + + add_submodule () + set_description( _("Audio filter for band-limited interpolation resampling") ) + set_capability( "audio filter2", 20 ) + set_callbacks( OpenFilter, CloseFilter ) +vlc_module_end () /***************************************************************************** * Create: allocate linear resampler diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c index 59c6e95d34..35ecee8f8f 100644 --- a/modules/audio_filter/resampler/linear.c +++ b/modules/audio_filter/resampler/linear.c @@ -63,18 +63,18 @@ struct filter_sys_t /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Audio filter for linear interpolation resampling") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_capability( "audio filter", 5 ); - set_callbacks( Create, Close ); - - add_submodule(); - set_description( N_("Audio filter for linear interpolation resampling") ); - set_capability( "audio filter2", 5 ); - set_callbacks( OpenFilter, CloseFilter ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Audio filter for linear interpolation resampling") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_capability( "audio filter", 5 ) + set_callbacks( Create, Close ) + + add_submodule () + set_description( N_("Audio filter for linear interpolation resampling") ) + set_capability( "audio filter2", 5 ) + set_callbacks( OpenFilter, CloseFilter ) +vlc_module_end () /***************************************************************************** * Create: allocate linear resampler diff --git a/modules/audio_filter/resampler/trivial.c b/modules/audio_filter/resampler/trivial.c index 859ec5c6ee..75586041e7 100644 --- a/modules/audio_filter/resampler/trivial.c +++ b/modules/audio_filter/resampler/trivial.c @@ -44,13 +44,13 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Audio filter for trivial resampling") ); - set_capability( "audio filter", 1 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Audio filter for trivial resampling") ) + set_capability( "audio filter", 1 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: allocate trivial resampler diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c index 7d9053b044..3dab7af3bd 100644 --- a/modules/audio_filter/resampler/ugly.c +++ b/modules/audio_filter/resampler/ugly.c @@ -44,13 +44,13 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Audio filter for ugly resampling") ); - set_capability( "audio filter", 2 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Audio filter for ugly resampling") ) + set_capability( "audio filter", 2 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: allocate ugly resampler diff --git a/modules/audio_filter/scaletempo.c b/modules/audio_filter/scaletempo.c index 08541f175c..cb534ca2c7 100644 --- a/modules/audio_filter/scaletempo.c +++ b/modules/audio_filter/scaletempo.c @@ -43,12 +43,12 @@ static void Close( vlc_object_t * ); static void DoWork( aout_instance_t *, aout_filter_t *, aout_buffer_t *, aout_buffer_t * ); -vlc_module_begin(); - set_description( N_("Scale audio tempo in sync with playback rate") ); - set_shortname( N_("Scaletempo") ); - set_capability( "audio filter", 0 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AFILTER ); +vlc_module_begin () + set_description( N_("Scale audio tempo in sync with playback rate") ) + set_shortname( N_("Scaletempo") ) + set_capability( "audio filter", 0 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AFILTER ) add_integer_with_range( "scaletempo-stride", 30, 1, 2000, NULL, N_("Stride Length"), N_("Length in milliseconds to output each stride"), true ); @@ -57,8 +57,8 @@ vlc_module_begin(); add_integer_with_range( "scaletempo-search", 14, 0, 200, NULL, N_("Search Length"), N_("Length in milliseconds to search for best overlap position"), true ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /* * Scaletempo works by producing audio in constant sized chunks (a "stride") but diff --git a/modules/audio_filter/spatializer/spatializer.cpp b/modules/audio_filter/spatializer/spatializer.cpp index 6977d3a85a..672d4a1b30 100644 --- a/modules/audio_filter/spatializer/spatializer.cpp +++ b/modules/audio_filter/spatializer/spatializer.cpp @@ -61,21 +61,21 @@ static void Close( vlc_object_t * ); #define DAMP_TEXT "" #define DAMP_LONGTEXT "" -vlc_module_begin(); - set_description( N_("spatializer") ); - set_shortname( N_("spatializer" ) ); - set_capability( "audio filter", 0 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AFILTER ); - - set_callbacks( Open, Close ); - add_shortcut( "spatializer" ); - add_float( "Roomsize", 1.05, NULL, ROOMSIZE_TEXT,ROOMSIZE_LONGTEXT, true); - add_float( "Width", 10.0, NULL, WIDTH_TEXT,WIDTH_LONGTEXT, true); - add_float( "Wet", 3.0, NULL, WET_TEXT,WET_LONGTEXT, true); - add_float( "Dry", 2.0, NULL, DRY_TEXT,DRY_LONGTEXT, true); - add_float( "Damp", 1.0, NULL, DAMP_TEXT,DAMP_LONGTEXT, true); -vlc_module_end(); +vlc_module_begin () + set_description( N_("spatializer") ) + set_shortname( N_("spatializer" ) ) + set_capability( "audio filter", 0 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AFILTER ) + + set_callbacks( Open, Close ) + add_shortcut( "spatializer" ) + add_float( "Roomsize", 1.05, NULL, ROOMSIZE_TEXT,ROOMSIZE_LONGTEXT, true) + add_float( "Width", 10.0, NULL, WIDTH_TEXT,WIDTH_LONGTEXT, true) + add_float( "Wet", 3.0, NULL, WET_TEXT,WET_LONGTEXT, true) + add_float( "Dry", 2.0, NULL, DRY_TEXT,DRY_LONGTEXT, true) + add_float( "Damp", 1.0, NULL, DAMP_TEXT,DAMP_LONGTEXT, true) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c index 0792a50581..e3f905464d 100644 --- a/modules/audio_mixer/float32.c +++ b/modules/audio_mixer/float32.c @@ -44,13 +44,13 @@ static void DoWork ( aout_instance_t *, aout_buffer_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_description( N_("Float32 audio mixer") ); - set_capability( "audio mixer", 10 ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Float32 audio mixer") ) + set_capability( "audio mixer", 10 ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: allocate mixer diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c index bd183f3d0b..f74f4212c0 100644 --- a/modules/audio_mixer/spdif.c +++ b/modules/audio_mixer/spdif.c @@ -43,13 +43,13 @@ static void DoWork ( aout_instance_t *, aout_buffer_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_description( N_("Dummy S/PDIF audio mixer") ); - set_capability( "audio mixer", 1 ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Dummy S/PDIF audio mixer") ) + set_capability( "audio mixer", 1 ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: allocate spdif mixer diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c index 5c93d9b8e2..2512981ae5 100644 --- a/modules/audio_mixer/trivial.c +++ b/modules/audio_mixer/trivial.c @@ -44,13 +44,13 @@ static void DoWork ( aout_instance_t *, aout_buffer_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); - set_description( N_("Trivial audio mixer") ); - set_capability( "audio mixer", 1 ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Trivial audio mixer") ) + set_capability( "audio mixer", 1 ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** * Create: allocate trivial mixer diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index 2a0f46dbd2..3dbd8b7069 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -103,20 +103,20 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, *****************************************************************************/ static const char *const ppsz_devices[] = { "default" }; static const char *const ppsz_devices_text[] = { N_("Default") }; -vlc_module_begin(); - set_shortname( "ALSA" ); - set_description( N_("ALSA audio output") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); +vlc_module_begin () + set_shortname( "ALSA" ) + set_description( N_("ALSA audio output") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) add_string( "alsa-audio-device", DEFAULT_ALSA_DEVICE, aout_FindAndRestart, N_("ALSA Device Name"), NULL, false ); - add_deprecated_alias( "alsadev" ); /* deprecated since 0.9.3 */ + add_deprecated_alias( "alsadev" ) /* deprecated since 0.9.3 */ change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback ); - change_action_add( FindDevicesCallback, N_("Refresh list") ); + change_action_add( FindDevicesCallback, N_("Refresh list") ) - set_capability( "audio output", 150 ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "audio output", 150 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Probe: probe the audio device for available formats and channels diff --git a/modules/audio_output/arts.c b/modules/audio_output/arts.c index 525787d581..169bad7be4 100644 --- a/modules/audio_output/arts.c +++ b/modules/audio_output/arts.c @@ -61,14 +61,14 @@ static void Play ( aout_instance_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( "aRts" ); - set_description( N_("aRts audio output") ); - set_capability( "audio output", 50 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "aRts" ) + set_description( N_("aRts audio output") ) + set_capability( "audio output", 50 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: open an aRts socket diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c index 22bfd43936..0e29526c89 100644 --- a/modules/audio_output/auhal.c +++ b/modules/audio_output/auhal.c @@ -133,15 +133,15 @@ static int AudioDeviceCallback ( vlc_object_t *, const char *, "audio device, as listed in your 'Audio Device' menu. This device will " \ "then be used by default for audio playback.") -vlc_module_begin(); - set_shortname( "auhal" ); - set_description( N_("HAL AudioUnit output") ); - set_capability( "audio output", 101 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - set_callbacks( Open, Close ); - add_integer( "macosx-audio-device", 0, NULL, ADEV_TEXT, ADEV_LONGTEXT, false ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "auhal" ) + set_description( N_("HAL AudioUnit output") ) + set_capability( "audio output", 101 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + set_callbacks( Open, Close ) + add_integer( "macosx-audio-device", 0, NULL, ADEV_TEXT, ADEV_LONGTEXT, false ) +vlc_module_end () /***************************************************************************** * Open: open macosx audio output diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index 265a39e7e7..1a6b504628 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -226,19 +226,19 @@ static int FillBuffer ( aout_instance_t *, int, aout_buffer_t * ); "The option allows you to enable or disable the high-quality float32 " \ "audio output mode (which is not well supported by some soundcards)." ) -vlc_module_begin(); - set_description( N_("DirectX audio output") ); - set_shortname( "DirectX" ); - set_capability( "audio output", 100 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - add_shortcut( "directx" ); +vlc_module_begin () + set_description( N_("DirectX audio output") ) + set_shortname( "DirectX" ) + set_capability( "audio output", 100 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + add_shortcut( "directx" ) add_integer( "directx-audio-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, true ); add_bool( "directx-audio-float32", 0, 0, FLOAT_TEXT, FLOAT_LONGTEXT, true ); - set_callbacks( OpenAudio, CloseAudio ); -vlc_module_end(); + set_callbacks( OpenAudio, CloseAudio ) +vlc_module_end () /***************************************************************************** * OpenAudio: open the audio device diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c index b56b99cb98..be91c4af7a 100644 --- a/modules/audio_output/esd.c +++ b/modules/audio_output/esd.c @@ -66,16 +66,16 @@ static void Play ( aout_instance_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("EsounD audio output") ); - set_shortname( "EsounD" ); - set_capability( "audio output", 50 ); - add_string( "esdserver", "", NULL, N_("Esound server"), NULL, false ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - set_callbacks( Open, Close ); - add_shortcut( "esound" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("EsounD audio output") ) + set_shortname( "EsounD" ) + set_capability( "audio output", 50 ) + add_string( "esdserver", "", NULL, N_("Esound server"), NULL, false ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + set_callbacks( Open, Close ) + add_shortcut( "esound" ) +vlc_module_end () /***************************************************************************** * Open: open an esd socket diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index ff075999b5..2916b6382c 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -109,11 +109,11 @@ static const int format_int[] = { VLC_FOURCC('u','8',' ',' '), #define FILE_TEXT N_("Output file") #define FILE_LONGTEXT N_("File to which the audio samples will be written to. (\"-\" for stdout") -vlc_module_begin(); - set_description( N_("File audio output") ); - set_shortname( N_("File") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); +vlc_module_begin () + set_description( N_("File audio output") ) + set_shortname( N_("File") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) add_string( "audiofile-format", "s16", NULL, FORMAT_TEXT, FORMAT_LONGTEXT, true ); @@ -122,13 +122,13 @@ vlc_module_begin(); CHANNELS_TEXT, CHANNELS_LONGTEXT, true ); add_file( "audiofile-file", "audiofile.wav", NULL, FILE_TEXT, FILE_LONGTEXT, false ); - add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true ); + add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true ) - set_capability( "audio output", 0 ); - add_shortcut( "file" ); - add_shortcut( "audiofile" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "audio output", 0 ) + add_shortcut( "file" ) + add_shortcut( "audiofile" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: open a dummy audio device diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp index cb01386c22..a317cdf4cb 100644 --- a/modules/audio_output/hd1000a.cpp +++ b/modules/audio_output/hd1000a.cpp @@ -74,14 +74,14 @@ static void InterleaveS16( int16_t *, int16_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( "Roku HD1000" ); - set_description( N_("Roku HD1000 audio output") ); - set_capability( "audio output", 100 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "Roku HD1000" ) + set_description( N_("Roku HD1000 audio output") ) + set_capability( "audio output", 100 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: open a dummy audio device diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c index f87d4cbe01..b15bbfab88 100644 --- a/modules/audio_output/jack.c +++ b/modules/audio_output/jack.c @@ -79,18 +79,18 @@ static int Process ( jack_nframes_t i_frames, void *p_arg ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( "JACK" ); - set_description( N_("JACK audio output") ); - set_capability( "audio output", 100 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); +vlc_module_begin () + set_shortname( "JACK" ) + set_description( N_("JACK audio output") ) + set_capability( "audio output", 100 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) add_bool( AUTO_CONNECT_OPTION, 0, NULL, AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, true ); add_string( CONNECT_REGEX_OPTION, NULL, NULL, CONNECT_REGEX_TEXT, CONNECT_REGEX_LONGTEXT, true ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: create a JACK client diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 2b3de848df..6e8d362954 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -106,21 +106,21 @@ static mtime_t BufferDuration( aout_instance_t * p_aout ); "are completely filled (the sound gets heavily hashed). If you have one " \ "of these drivers, then you need to enable this option." ) -vlc_module_begin(); - set_shortname( "OSS" ); - set_description( N_("UNIX OSS audio output") ); +vlc_module_begin () + set_shortname( "OSS" ) + set_description( N_("UNIX OSS audio output") ) - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) add_file( "oss-audio-device", "/dev/dsp", aout_FindAndRestart, N_("OSS DSP device"), NULL, false ); - add_deprecated_alias( "dspdev" ); /* deprecated since 0.9.3 */ - add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true ); + add_deprecated_alias( "dspdev" ) /* deprecated since 0.9.3 */ + add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true ) - set_capability( "audio output", 100 ); - add_shortcut( "oss" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "audio output", 100 ) + add_shortcut( "oss" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Probe: probe the audio device for available formats and channels diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c index 6256e75325..9f90d06d38 100644 --- a/modules/audio_output/portaudio.c +++ b/modules/audio_output/portaudio.c @@ -105,17 +105,17 @@ static int PAOpenStream( aout_instance_t * ); #define DEVICE_TEXT N_("Output device") #define DEVICE_LONGTEXT N_("Portaudio identifier for the output device") -vlc_module_begin(); - set_shortname( "PortAudio" ); - set_description( N_("PORTAUDIO audio output") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); +vlc_module_begin () + set_shortname( "PortAudio" ) + set_description( N_("PORTAUDIO audio output") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) add_integer( "portaudio-audio-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, false ); - add_deprecated_alias( "portaudio-device" ); /* deprecated since 0.9.3 */ - set_capability( "audio output", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_deprecated_alias( "portaudio-device" ) /* deprecated since 0.9.3 */ + set_capability( "audio output", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /* This routine will be called by the PortAudio engine when audio is needed. * It may called at interrupt level on some machines so don't do anything diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c index 5d0c39daeb..d1e5d505e1 100644 --- a/modules/audio_output/pulse.c +++ b/modules/audio_output/pulse.c @@ -92,16 +92,16 @@ static void uninit(aout_instance_t *p_aout); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( "Pulse Audio" ); - set_description( N_("Pulseaudio audio output") ); - set_capability( "audio output", 40 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - add_shortcut( "pulseaudio" ); - add_shortcut( "pa" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "Pulse Audio" ) + set_description( N_("Pulseaudio audio output") ) + set_capability( "audio output", 40 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + add_shortcut( "pulseaudio" ) + add_shortcut( "pa" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: open the audio device diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c index 7dc215f1e4..5a5ccc14ad 100644 --- a/modules/audio_output/sdl.c +++ b/modules/audio_output/sdl.c @@ -64,15 +64,15 @@ static void SDLCallback ( void *, uint8_t *, int ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( "SDL" ); - set_description( N_("Simple DirectMedia Layer audio output") ); - set_capability( "audio output", 40 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - add_shortcut( "sdl" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "SDL" ) + set_description( N_("Simple DirectMedia Layer audio output") ) + set_capability( "audio output", 40 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + add_shortcut( "sdl" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: open the audio device diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index 26d878176f..44f916a3b2 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -162,24 +162,24 @@ static const char *const ppsz_adev_text[] = { N_("Microsoft Soundmapper") }; "to apply.") #define DEFAULT_AUDIO_DEVICE N_("Default Audio Device") -vlc_module_begin(); - set_shortname( "WaveOut" ); - set_description( N_("Win32 waveOut extension output") ); - set_capability( "audio output", 50 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - add_bool( "waveout-float32", 1, 0, FLOAT_TEXT, FLOAT_LONGTEXT, true ); +vlc_module_begin () + set_shortname( "WaveOut" ) + set_description( N_("Win32 waveOut extension output") ) + set_capability( "audio output", 50 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + add_bool( "waveout-float32", 1, 0, FLOAT_TEXT, FLOAT_LONGTEXT, true ) add_string( "waveout-audio-device", "wavemapper", NULL, DEVICE_TEXT, DEVICE_LONG, false ); - add_deprecated_alias( "waveout-dev" ); /* deprecated since 0.9.3 */ + add_deprecated_alias( "waveout-dev" ) /* deprecated since 0.9.3 */ change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices ); - change_need_restart(); - change_action_add( ReloadWaveoutDevices, N_("Refresh list") ); + change_need_restart () + change_action_add( ReloadWaveoutDevices, N_("Refresh list") ) - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * aout_sys_t: waveOut audio output method descriptor diff --git a/modules/codec/a52.c b/modules/codec/a52.c index edba4f121b..82112f930a 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -44,18 +44,18 @@ static int OpenDecoder ( vlc_object_t * ); static int OpenPacketizer( vlc_object_t * ); static void CloseCommon ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("A/52 parser") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseCommon ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - - add_submodule(); - set_description( N_("A/52 audio packetizer") ); - set_capability( "packetizer", 10 ); - set_callbacks( OpenPacketizer, CloseCommon ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("A/52 parser") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseCommon ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + + add_submodule () + set_description( N_("A/52 audio packetizer") ) + set_capability( "packetizer", 10 ) + set_callbacks( OpenPacketizer, CloseCommon ) +vlc_module_end () /***************************************************************************** * decoder_sys_t : decoder descriptor diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c index c647f806ed..d0b9988321 100644 --- a/modules/codec/adpcm.c +++ b/modules/codec/adpcm.c @@ -44,13 +44,13 @@ static void CloseDecoder( vlc_object_t * ); static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** ); -vlc_module_begin(); - set_description( N_("ADPCM audio decoder") ); - set_capability( "decoder", 50 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_callbacks( OpenDecoder, CloseDecoder ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("ADPCM audio decoder") ) + set_capability( "decoder", 50 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/aes3.c b/modules/codec/aes3.c index 226a3c69ef..e1f1c15ecf 100644 --- a/modules/codec/aes3.c +++ b/modules/codec/aes3.c @@ -41,20 +41,20 @@ static int OpenDecoder ( vlc_object_t * ); static int OpenPacketizer( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); +vlc_module_begin () - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_description( _("AES3/SMPTE 302M audio decoder") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, Close ); + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_description( _("AES3/SMPTE 302M audio decoder") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, Close ) - add_submodule(); - set_description( N_("AES3/SMPTE 302M audio packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, Close ); + add_submodule () + set_description( N_("AES3/SMPTE 302M audio packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, Close ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** * decoder_sys_t : aes3 decoder descriptor diff --git a/modules/codec/araw.c b/modules/codec/araw.c index 93cb691c96..7a5ec825eb 100644 --- a/modules/codec/araw.c +++ b/modules/codec/araw.c @@ -44,22 +44,22 @@ static int EncoderOpen ( vlc_object_t * ); static void EncoderClose( vlc_object_t * ); #endif -vlc_module_begin(); +vlc_module_begin () /* audio decoder module */ - set_description( N_("Raw/Log Audio decoder") ); - set_capability( "decoder", 100 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_callbacks( DecoderOpen, DecoderClose ); + set_description( N_("Raw/Log Audio decoder") ) + set_capability( "decoder", 100 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_callbacks( DecoderOpen, DecoderClose ) #ifdef ENABLE_SOUT /* audio encoder submodule */ - add_submodule(); - set_description( N_("Raw audio encoder") ); - set_capability( "encoder", 150 ); - set_callbacks( EncoderOpen, EncoderClose ); + add_submodule () + set_description( N_("Raw audio encoder") ) + set_capability( "encoder", 150 ) + set_callbacks( EncoderOpen, EncoderClose ) #endif -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index 87c7daab0c..151082e591 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -82,27 +82,27 @@ static const char *const enc_hq_list_text[] = { "delivered by the FFmpeg library. This includes (MS)MPEG4, DivX, SV1,"\ "H261, H263, H264, WMV, WMA, AAC, AMR, DV, MJPEG and other codecs") -vlc_module_begin(); - set_shortname( "FFmpeg"); - add_shortcut( "ffmpeg" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); +vlc_module_begin () + set_shortname( "FFmpeg") + add_shortcut( "ffmpeg" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) /* decoder main module */ #if defined(MODULE_NAME_is_ffmpegaltivec) \ || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG)) - set_description( N_("AltiVec FFmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") ); - /*add_requirement( ALTIVEC );*/ - set_capability( "decoder", 71 ); + set_description( N_("AltiVec FFmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") ) + /*add_requirement( ALTIVEC )*/ + set_capability( "decoder", 71 ) #else - set_description( N_("FFmpeg audio/video decoder") ); - set_help( MODULE_DESCRIPTION ); - set_capability( "decoder", 70 ); + set_description( N_("FFmpeg audio/video decoder") ) + set_help( MODULE_DESCRIPTION ) + set_capability( "decoder", 70 ) #endif - set_section( N_("Decoding") , NULL ); - set_callbacks( OpenDecoder, CloseDecoder ); + set_section( N_("Decoding") , NULL ) + set_callbacks( OpenDecoder, CloseDecoder ) - add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, true ); + add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, true ) add_integer ( "ffmpeg-error-resilience", 1, NULL, ERROR_TEXT, ERROR_LONGTEXT, true ); add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT, @@ -111,15 +111,15 @@ vlc_module_begin(); false ); add_integer( "ffmpeg-skip-frame", 0, NULL, SKIP_FRAME_TEXT, SKIP_FRAME_LONGTEXT, true ); - change_integer_range( -1, 4 ); + change_integer_range( -1, 4 ) add_integer( "ffmpeg-skip-idct", 0, NULL, SKIP_IDCT_TEXT, SKIP_IDCT_LONGTEXT, true ); - change_integer_range( -1, 4 ); + change_integer_range( -1, 4 ) add_integer ( "ffmpeg-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT, true ); add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT, true ); - change_integer_range( 0, 2 ); + change_integer_range( 0, 2 ) add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT, SKIPLOOPF_LONGTEXT, true ); change_integer_list( nloopf_list, nloopf_list_text, NULL ); @@ -129,11 +129,11 @@ vlc_module_begin(); #ifdef ENABLE_SOUT /* encoder submodule */ - add_submodule(); - set_section( N_("Encoding") , NULL ); - set_description( N_("FFmpeg audio/video encoder") ); - set_capability( "encoder", 100 ); - set_callbacks( OpenEncoder, CloseEncoder ); + add_submodule () + set_section( N_("Encoding") , NULL ) + set_description( N_("FFmpeg audio/video encoder") ) + set_capability( "encoder", 100 ) + set_callbacks( OpenEncoder, CloseEncoder ) add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT, ENC_HQ_LONGTEXT, false ); @@ -193,13 +193,13 @@ vlc_module_begin(); #endif /* ENABLE_SOUT */ /* video filter submodule */ - add_submodule(); - set_capability( "video filter2", 0 ); - set_callbacks( OpenDeinterlace, CloseDeinterlace ); - set_description( N_("FFmpeg deinterlace video filter") ); - add_shortcut( "ffmpeg-deinterlace" ); + add_submodule () + set_capability( "video filter2", 0 ) + set_callbacks( OpenDeinterlace, CloseDeinterlace ) + set_description( N_("FFmpeg deinterlace video filter") ) + add_shortcut( "ffmpeg-deinterlace" ) -vlc_module_end(); +vlc_module_end () vlc_mutex_t avcodec_lock = VLC_STATIC_MUTEX; diff --git a/modules/codec/cc.c b/modules/codec/cc.c index 4db6b31a7f..e00afb3742 100644 --- a/modules/codec/cc.c +++ b/modules/codec/cc.c @@ -60,12 +60,12 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("CC 608/708")); - set_description( N_("Closed Captions decoder") ); - set_capability( "decoder", 50 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("CC 608/708")) + set_description( N_("Closed Captions decoder") ) + set_capability( "decoder", 50 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c index ae0f5bacd8..3269061fbb 100644 --- a/modules/codec/cdg.c +++ b/modules/codec/cdg.c @@ -80,14 +80,14 @@ static int Render( decoder_sys_t *p_cdg, picture_t *p_picture ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_description( N_("CDG video decoder") ); - set_capability( "decoder", 1000 ); - set_callbacks( Open, Close ); - add_shortcut( "cdg" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_description( N_("CDG video decoder") ) + set_capability( "decoder", 1000 ) + set_callbacks( Open, Close ) + add_shortcut( "cdg" ) +vlc_module_end () /***************************************************************************** * Open: probe the decoder and return score diff --git a/modules/codec/cmml/cmml.c b/modules/codec/cmml/cmml.c index 14fe347a0d..69763a5184 100644 --- a/modules/codec/cmml/cmml.c +++ b/modules/codec/cmml/cmml.c @@ -69,16 +69,16 @@ void CloseIntf ( vlc_object_t * ); /***************************************************************************** * Module descriptor. *****************************************************************************/ -vlc_module_begin(); - set_description( N_("CMML annotations decoder") ); - set_capability( "decoder", 50 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "cmml" ); - - add_submodule(); - set_capability( "interface", 0 ); - set_callbacks( OpenIntf, CloseIntf ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("CMML annotations decoder") ) + set_capability( "decoder", 50 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "cmml" ) + + add_submodule () + set_capability( "interface", 0 ) + set_callbacks( OpenIntf, CloseIntf ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/csri.c b/modules/codec/csri.c index f1f6de07a7..dfcd13b242 100644 --- a/modules/codec/csri.c +++ b/modules/codec/csri.c @@ -48,14 +48,14 @@ static int Create ( vlc_object_t * ); static void Destroy( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("Subtitles (advanced)")); - set_description( N_("Wrapper for subtitle renderers using CSRI/asa") ); - set_capability( "decoder", 60 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_callbacks( Create, Destroy ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("Subtitles (advanced)")) + set_description( N_("Wrapper for subtitle renderers using CSRI/asa") ) + set_capability( "decoder", 60 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_callbacks( Create, Destroy ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c index a2d1a76d86..b3e1456c78 100644 --- a/modules/codec/cvdsub.c +++ b/modules/codec/cvdsub.c @@ -47,16 +47,16 @@ static int DecoderOpen ( vlc_object_t * ); static int PacketizerOpen( vlc_object_t * ); static void DecoderClose ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("CVD subtitle decoder") ); - set_capability( "decoder", 50 ); - set_callbacks( DecoderOpen, DecoderClose ); - - add_submodule(); - set_description( N_("Chaoji VCD subtitle packetizer") ); - set_capability( "packetizer", 50 ); - set_callbacks( PacketizerOpen, DecoderClose ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("CVD subtitle decoder") ) + set_capability( "decoder", 50 ) + set_callbacks( DecoderOpen, DecoderClose ) + + add_submodule () + set_description( N_("Chaoji VCD subtitle packetizer") ) + set_capability( "packetizer", 50 ) + set_callbacks( PacketizerOpen, DecoderClose ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c index 87fb11bba1..bb37518f4c 100644 --- a/modules/codec/dirac.c +++ b/modules/codec/dirac.c @@ -73,22 +73,22 @@ static const char *const ppsz_enc_options[] = { #define ENC_QUALITY_LONGTEXT N_( \ "Quality of the encoding between 1.0 (low) and 10.0 (high)." ) -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_description( N_("Dirac video decoder") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "dirac" ); - - add_submodule(); - set_description( N_("Dirac video encoder") ); - set_capability( "encoder", 100 ); - set_callbacks( OpenEncoder, CloseEncoder ); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_description( N_("Dirac video decoder") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "dirac" ) + + add_submodule () + set_description( N_("Dirac video encoder") ) + set_capability( "encoder", 100 ) + set_callbacks( OpenEncoder, CloseEncoder ) add_float( ENC_CFG_PREFIX "quality", 7.0, NULL, ENC_QUALITY_TEXT, ENC_QUALITY_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c index cb077976c5..8ae2aaba9f 100644 --- a/modules/codec/dmo/dmo.c +++ b/modules/codec/dmo/dmo.c @@ -98,21 +98,21 @@ static int LoadDMO( vlc_object_t *, HINSTANCE *, IMediaObject **, es_format_t *, bool ); static void CopyPicture( picture_t *, uint8_t * ); -vlc_module_begin(); - set_description( N_("DirectMedia Object decoder") ); - add_shortcut( "dmo" ); - set_capability( "decoder", 1 ); - set_callbacks( DecoderOpen, DecoderClose ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); +vlc_module_begin () + set_description( N_("DirectMedia Object decoder") ) + add_shortcut( "dmo" ) + set_capability( "decoder", 1 ) + set_callbacks( DecoderOpen, DecoderClose ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) # define ENC_CFG_PREFIX "sout-dmo-" - add_submodule(); - set_description( N_("DirectMedia Object encoder") ); - set_capability( "encoder", 10 ); - set_callbacks( EncoderOpen, EncoderClose ); + add_submodule () + set_description( N_("DirectMedia Object encoder") ) + set_capability( "encoder", 10 ) + set_callbacks( EncoderOpen, EncoderClose ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/dts.c b/modules/codec/dts.c index f9ed084aae..1dd9379ec7 100644 --- a/modules/codec/dts.c +++ b/modules/codec/dts.c @@ -96,16 +96,16 @@ static block_t *GetSoutBuffer( decoder_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("DTS parser") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseDecoder ); - - add_submodule(); - set_description( N_("DTS audio packetizer") ); - set_capability( "packetizer", 10 ); - set_callbacks( OpenPacketizer, CloseDecoder ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("DTS parser") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseDecoder ) + + add_submodule () + set_description( N_("DTS audio packetizer") ) + set_capability( "packetizer", 10 ) + set_callbacks( OpenPacketizer, CloseDecoder ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c index 0310fa4441..61b61762da 100644 --- a/modules/codec/dvbsub.c +++ b/modules/codec/dvbsub.c @@ -86,29 +86,29 @@ static int OpenEncoder ( vlc_object_t * ); static void CloseEncoder( vlc_object_t * ); static block_t *Encode ( encoder_t *, subpicture_t * ); -vlc_module_begin(); +vlc_module_begin () # define DVBSUB_CFG_PREFIX "dvbsub-" - set_description( N_("DVB subtitles decoder") ); - set_capability( "decoder", 50 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_callbacks( Open, Close ); + set_description( N_("DVB subtitles decoder") ) + set_capability( "decoder", 50 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_callbacks( Open, Close ) - add_integer( DVBSUB_CFG_PREFIX "position", 8, NULL, POS_TEXT, POS_LONGTEXT, true ); + add_integer( DVBSUB_CFG_PREFIX "position", 8, NULL, POS_TEXT, POS_LONGTEXT, true ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); - add_integer( DVBSUB_CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false ); - add_integer( DVBSUB_CFG_PREFIX "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false ); + add_integer( DVBSUB_CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false ) + add_integer( DVBSUB_CFG_PREFIX "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false ) # define ENC_CFG_PREFIX "sout-dvbsub-" - add_submodule(); - set_description( N_("DVB subtitles encoder") ); - set_capability( "encoder", 100 ); - set_callbacks( OpenEncoder, CloseEncoder ); - - add_integer( ENC_CFG_PREFIX "x", -1, NULL, ENC_POSX_TEXT, ENC_POSX_LONGTEXT, false ); - add_integer( ENC_CFG_PREFIX "y", -1, NULL, ENC_POSY_TEXT, ENC_POSY_LONGTEXT, false ); - add_obsolete_integer( ENC_CFG_PREFIX "timeout" ); /* Suppressed since 0.8.5 */ -vlc_module_end(); + add_submodule () + set_description( N_("DVB subtitles encoder") ) + set_capability( "encoder", 100 ) + set_callbacks( OpenEncoder, CloseEncoder ) + + add_integer( ENC_CFG_PREFIX "x", -1, NULL, ENC_POSX_TEXT, ENC_POSX_LONGTEXT, false ) + add_integer( ENC_CFG_PREFIX "y", -1, NULL, ENC_POSY_TEXT, ENC_POSY_LONGTEXT, false ) + add_obsolete_integer( ENC_CFG_PREFIX "timeout" ) /* Suppressed since 0.8.5 */ +vlc_module_end () static const char *const ppsz_enc_options[] = { "x", "y", NULL }; diff --git a/modules/codec/faad.c b/modules/codec/faad.c index 901ad31140..521b272e3b 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -40,13 +40,13 @@ static int Open( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("AAC audio decoder (using libfaad2)") ); - set_capability( "decoder", 100 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("AAC audio decoder (using libfaad2)") ) + set_capability( "decoder", 100 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_callbacks( Open, Close ) +vlc_module_end () /**************************************************************************** * Local prototypes diff --git a/modules/codec/fake.c b/modules/codec/fake.c index 5974564a90..282f3ffdf7 100644 --- a/modules/codec/fake.c +++ b/modules/codec/fake.c @@ -83,14 +83,14 @@ static const char *const ppsz_deinterlace_type[] = "deinterlace", "ffmpeg-deinterlace" }; -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_shortname( N_("Fake") ); - set_description( N_("Fake video decoder") ); - set_capability( "decoder", 1000 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "fake" ); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_shortname( N_("Fake") ) + set_description( N_("Fake video decoder") ) + set_capability( "decoder", 1000 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "fake" ) add_file( "fake-file", "", NULL, FILE_TEXT, FILE_LONGTEXT, false ); @@ -112,7 +112,7 @@ vlc_module_begin(); change_string_list( ppsz_deinterlace_type, 0, 0 ); add_string( "fake-chroma", "I420", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ); -vlc_module_end(); +vlc_module_end () struct decoder_sys_t { diff --git a/modules/codec/flac.c b/modules/codec/flac.c index 0971a50430..c9d806959f 100644 --- a/modules/codec/flac.c +++ b/modules/codec/flac.c @@ -176,29 +176,29 @@ static uint8_t flac_crc8( const uint8_t *data, unsigned len ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); +vlc_module_begin () - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - add_shortcut( "flac" ); + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + add_shortcut( "flac" ) #ifdef USE_LIBFLAC - set_description( N_("Flac audio decoder") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseDecoder ); + set_description( N_("Flac audio decoder") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseDecoder ) - add_submodule(); - set_description( N_("Flac audio encoder") ); - set_capability( "encoder", 100 ); - set_callbacks( OpenEncoder, CloseEncoder ); + add_submodule () + set_description( N_("Flac audio encoder") ) + set_capability( "encoder", 100 ) + set_callbacks( OpenEncoder, CloseEncoder ) - add_submodule(); + add_submodule () #endif - set_description( N_("Flac audio packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); + set_description( N_("Flac audio packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c index 2bb5ee7898..0025da2436 100644 --- a/modules/codec/fluidsynth.c +++ b/modules/codec/fluidsynth.c @@ -37,15 +37,15 @@ static int Open (vlc_object_t *); static void Close (vlc_object_t *); -vlc_module_begin(); - set_description (N_("FluidSynth MIDI synthetizer")); - set_capability ("decoder", 100); - set_category (CAT_INPUT); - set_subcategory (SUBCAT_INPUT_ACODEC); - set_callbacks (Open, Close); +vlc_module_begin () + set_description (N_("FluidSynth MIDI synthetizer")) + set_capability ("decoder", 100) + set_category (CAT_INPUT) + set_subcategory (SUBCAT_INPUT_ACODEC) + set_callbacks (Open, Close) add_file ("soundfont", "", NULL, SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false); -vlc_module_end(); +vlc_module_end () struct decoder_sys_t diff --git a/modules/codec/kate.c b/modules/codec/kate.c index 20090c1a47..ced41c9cc1 100644 --- a/modules/codec/kate.c +++ b/modules/codec/kate.c @@ -108,28 +108,28 @@ static void ParseKateComments( decoder_t * ); #endif -vlc_module_begin(); - set_shortname( N_("Kate")); - set_description( N_("Kate text subtitles decoder") ); - set_capability( "decoder", 50 ); - set_callbacks( OpenDecoder, CloseDecoder ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - add_shortcut( "kate" ); +vlc_module_begin () + set_shortname( N_("Kate")) + set_description( N_("Kate text subtitles decoder") ) + set_capability( "decoder", 50 ) + set_callbacks( OpenDecoder, CloseDecoder ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + add_shortcut( "kate" ) #ifdef ENABLE_PACKETIZER - add_submodule(); - set_description( N_("Kate text subtitles packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); - add_shortcut( "kate" ); + add_submodule () + set_description( N_("Kate text subtitles packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) + add_shortcut( "kate" ) #endif #ifdef ENABLE_FORMATTING add_bool( "kate-formatted", true, NULL, FORMAT_TEXT, FORMAT_LONGTEXT, true ); #endif -vlc_module_end(); +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/libass.c b/modules/codec/libass.c index 0fa34ce762..32a6a1ef07 100644 --- a/modules/codec/libass.c +++ b/modules/codec/libass.c @@ -49,14 +49,14 @@ static int Create ( vlc_object_t * ); static void Destroy( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("Subtitles (advanced)")); - set_description( N_("Subtitle renderers using libass") ); - set_capability( "decoder", 100 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_callbacks( Create, Destroy ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("Subtitles (advanced)")) + set_description( N_("Subtitle renderers using libass") ) + set_capability( "decoder", 100 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_callbacks( Create, Destroy ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c index 2c8ddecf0d..11dbb2fec2 100644 --- a/modules/codec/libmpeg2.c +++ b/modules/codec/libmpeg2.c @@ -99,14 +99,14 @@ static void GetAR( decoder_t *p_dec ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("MPEG I/II video decoder (using libmpeg2)") ); - set_capability( "decoder", 150 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "libmpeg2" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("MPEG I/II video decoder (using libmpeg2)") ) + set_capability( "decoder", 150 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "libmpeg2" ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c index 1d98488dfe..35751005c2 100644 --- a/modules/codec/lpcm.c +++ b/modules/codec/lpcm.c @@ -81,20 +81,20 @@ static void *DecodeFrame ( decoder_t *, block_t ** ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); +vlc_module_begin () - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_description( N_("Linear PCM audio decoder") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseDecoder ); + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_description( N_("Linear PCM audio decoder") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseDecoder ) - add_submodule(); - set_description( N_("Linear PCM audio packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); + add_submodule () + set_description( N_("Linear PCM audio packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp index 7895eb6427..88533cb479 100644 --- a/modules/codec/mash.cpp +++ b/modules/codec/mash.cpp @@ -67,13 +67,13 @@ static block_t *SendFrame ( decoder_t *, block_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Video decoder using openmash") ); - set_capability( "decoder", 50 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_callbacks( OpenDecoder, CloseDecoder ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Video decoder using openmash") ) + set_capability( "decoder", 50 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c index 6e7d869280..96fe2aa8c1 100644 --- a/modules/codec/mpeg_audio.c +++ b/modules/codec/mpeg_audio.c @@ -109,22 +109,22 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("MPEG audio layer I/II/III decoder") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); +vlc_module_begin () + set_description( N_("MPEG audio layer I/II/III decoder") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) #if defined(UNDER_CE) - set_capability( "decoder", 5 ); + set_capability( "decoder", 5 ) #else - set_capability( "decoder", 100 ); + set_capability( "decoder", 100 ) #endif - set_callbacks( OpenDecoder, CloseDecoder ); + set_callbacks( OpenDecoder, CloseDecoder ) - add_submodule(); - set_description( N_("MPEG audio layer I/II/III packetizer") ); - set_capability( "packetizer", 10 ); - set_callbacks( OpenPacketizer, CloseDecoder ); -vlc_module_end(); + add_submodule () + set_description( N_("MPEG audio layer I/II/III packetizer") ) + set_capability( "packetizer", 10 ) + set_callbacks( OpenPacketizer, CloseDecoder ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/png.c b/modules/codec/png.c index 7fe5f0794d..b6c0f4ea23 100644 --- a/modules/codec/png.c +++ b/modules/codec/png.c @@ -53,14 +53,14 @@ static picture_t *DecodeBlock ( decoder_t *, block_t ** ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_description( N_("PNG video decoder") ); - set_capability( "decoder", 1000 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "png" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_description( N_("PNG video decoder") ) + set_capability( "decoder", 1000 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "png" ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c index e4e24cf359..a42ccce76f 100644 --- a/modules/codec/quicktime.c +++ b/modules/codec/quicktime.c @@ -64,14 +64,14 @@ int WINAPI FreeLibrary(HMODULE); static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("QuickTime library decoder") ); - set_capability( "decoder", 0 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_callbacks( Open, Close ); - -vlc_module_end(); +vlc_module_begin () + set_description( N_("QuickTime library decoder") ) + set_capability( "decoder", 0 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_callbacks( Open, Close ) + +vlc_module_end () /***************************************************************************** diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c index a83a40f54e..eed5ab2414 100644 --- a/modules/codec/rawvideo.c +++ b/modules/codec/rawvideo.c @@ -69,18 +69,18 @@ static block_t *SendFrame ( decoder_t *, block_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Pseudo raw video decoder") ); - set_capability( "decoder", 50 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_callbacks( OpenDecoder, CloseDecoder ); - - add_submodule(); - set_description( N_("Pseudo raw video packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Pseudo raw video decoder") ) + set_capability( "decoder", 50 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) + + add_submodule () + set_description( N_("Pseudo raw video packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/realaudio.c b/modules/codec/realaudio.c index caa768643b..1945f2aa76 100644 --- a/modules/codec/realaudio.c +++ b/modules/codec/realaudio.c @@ -61,13 +61,13 @@ int WINAPI FreeLibrary( void *handle ); static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("RealAudio library decoder") ); - set_capability( "decoder", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("RealAudio library decoder") ) + set_capability( "decoder", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/realvideo.c b/modules/codec/realvideo.c index 04d7e84676..60e43fb5e9 100644 --- a/modules/codec/realvideo.c +++ b/modules/codec/realvideo.c @@ -128,13 +128,13 @@ static void Close( vlc_object_t * ); //static int OpenPacketizer( vlc_object_t * ); static picture_t *DecodeVideo( decoder_t *, block_t ** ); -vlc_module_begin(); - set_description( N_("RealVideo library decoder") ); - set_capability( "decoder", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("RealVideo library decoder") ) + set_capability( "decoder", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/codec/schroedinger.c b/modules/codec/schroedinger.c index 1725e3602b..4bb392a6e6 100644 --- a/modules/codec/schroedinger.c +++ b/modules/codec/schroedinger.c @@ -45,14 +45,14 @@ static int OpenDecoder ( vlc_object_t * ); static void CloseDecoder ( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_description( N_("Schroedinger video decoder") ); - set_capability( "decoder", 200 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "schroedinger" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_description( N_("Schroedinger video decoder") ) + set_capability( "decoder", 200 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "schroedinger" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c index dcc558d256..861bcb1b14 100644 --- a/modules/codec/sdl_image.c +++ b/modules/codec/sdl_image.c @@ -54,15 +54,15 @@ static picture_t *DecodeBlock ( decoder_t *, block_t ** ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_shortname( N_("SDL Image decoder")); - set_description( N_("SDL_image video decoder") ); - set_capability( "decoder", 60 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "sdl_image" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_shortname( N_("SDL Image decoder")) + set_description( N_("SDL_image video decoder") ) + set_capability( "decoder", 60 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "sdl_image" ) +vlc_module_end () static const struct supported_fmt_t { diff --git a/modules/codec/speex.c b/modules/codec/speex.c index bd4305b96b..b9853eae81 100644 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -88,23 +88,23 @@ static const char * const ppsz_enc_mode_descriptions[] = { N_("Narrow-band (8kHz)"), N_("Wide-band (16kHz)"), N_("Ultra-wideband (32kHz)"), NULL }; -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) - set_description( N_("Speex audio decoder") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseDecoder ); + set_description( N_("Speex audio decoder") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseDecoder ) - add_submodule(); - set_description( N_("Speex audio packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); + add_submodule () + set_description( N_("Speex audio packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) - add_submodule(); - set_description( N_("Speex audio encoder") ); - set_capability( "encoder", 100 ); - set_callbacks( OpenEncoder, CloseEncoder ); + add_submodule () + set_description( N_("Speex audio encoder") ) + set_capability( "encoder", 100 ) + set_callbacks( OpenEncoder, CloseEncoder ) add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT, ENC_MODE_LONGTEXT, false ); @@ -112,14 +112,14 @@ vlc_module_begin(); add_integer( ENC_CFG_PREFIX "complexity", 3, NULL, ENC_COMPLEXITY_TEXT, ENC_COMPLEXITY_LONGTEXT, false ); - change_integer_range( 1, 10 ); + change_integer_range( 1, 10 ) add_bool( ENC_CFG_PREFIX "cbr", false, NULL, ENC_CBR_TEXT, ENC_CBR_LONGTEXT, false ); add_float( ENC_CFG_PREFIX "quality", 8.0, NULL, ENC_QUALITY_TEXT, ENC_QUALITY_LONGTEXT, false ); - change_float_range( 0.0, 10.0 ); + change_float_range( 0.0, 10.0 ) add_integer( ENC_CFG_PREFIX "max-bitrate", 0, NULL, ENC_MAXBITRATE_TEXT, ENC_MAXBITRATE_LONGTEXT, false ); @@ -132,7 +132,7 @@ vlc_module_begin(); /* TODO agc, noise suppression, */ -vlc_module_end(); +vlc_module_end () static const char *const ppsz_enc_options[] = { "mode", "complexity", "cbr", "quality", "max-bitrate", "vad", "dtx", NULL diff --git a/modules/codec/spudec/spudec.c b/modules/codec/spudec/spudec.c index 5f4e83e3e7..f527a9c2b3 100644 --- a/modules/codec/spudec/spudec.c +++ b/modules/codec/spudec/spudec.c @@ -42,18 +42,18 @@ static int DecoderOpen ( vlc_object_t * ); static int PacketizerOpen( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("DVD subtitles decoder") ); - set_capability( "decoder", 50 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_callbacks( DecoderOpen, Close ); - - add_submodule(); - set_description( N_("DVD subtitles packetizer") ); - set_capability( "packetizer", 50 ); - set_callbacks( PacketizerOpen, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("DVD subtitles decoder") ) + set_capability( "decoder", 50 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_callbacks( DecoderOpen, Close ) + + add_submodule () + set_description( N_("DVD subtitles packetizer") ) + set_capability( "packetizer", 50 ) + set_callbacks( PacketizerOpen, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c index 24b9021dfb..0b9173224d 100644 --- a/modules/codec/subtitles/subsdec.c +++ b/modules/codec/subtitles/subsdec.c @@ -113,13 +113,13 @@ static const char *const ppsz_justification_text[] = { "VLC partly implements this, but you can choose to disable all formatting.") -vlc_module_begin(); - set_shortname( N_("Subtitles")); - set_description( N_("Text subtitles decoder") ); - set_capability( "decoder", 50 ); - set_callbacks( OpenDecoder, CloseDecoder ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); +vlc_module_begin () + set_shortname( N_("Subtitles")) + set_description( N_("Text subtitles decoder") ) + set_capability( "decoder", 50 ) + set_callbacks( OpenDecoder, CloseDecoder ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, false ); @@ -131,7 +131,7 @@ vlc_module_begin(); AUTODETECT_UTF8_TEXT, AUTODETECT_UTF8_LONGTEXT, false ); add_bool( "subsdec-formatted", true, NULL, FORMAT_TEXT, FORMAT_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c index 6b21e12621..ab7756bc5a 100644 --- a/modules/codec/subtitles/subsusf.c +++ b/modules/codec/subtitles/subsusf.c @@ -47,15 +47,15 @@ static subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, subpicture_t *p * Module descriptor. *****************************************************************************/ -vlc_module_begin(); - set_capability( "decoder", 40 ); - set_shortname( N_("USFSubs")); - set_description( N_("USF subtitles decoder") ); - set_callbacks( OpenDecoder, CloseDecoder ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); +vlc_module_begin () + set_capability( "decoder", 40 ) + set_shortname( N_("USFSubs")) + set_description( N_("USF subtitles decoder") ) + set_callbacks( OpenDecoder, CloseDecoder ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) /* We inherit subsdec-align and subsdec-formatted from subsdec.c */ -vlc_module_end(); +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/subtitles/t140.c b/modules/codec/subtitles/t140.c index 01b31629c6..76ae1ef1f1 100644 --- a/modules/codec/subtitles/t140.c +++ b/modules/codec/subtitles/t140.c @@ -32,12 +32,12 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - add_submodule(); - set_description( N_("T.140 text encoder") ); - set_capability( "encoder", 100 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + add_submodule () + set_description( N_("T.140 text encoder") ) + set_capability( "encoder", 100 ) + set_callbacks( Open, Close ) +vlc_module_end () static block_t *Encode ( encoder_t *, subpicture_t * ); diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c index d5e5e9dac7..184311510b 100644 --- a/modules/codec/svcdsub.c +++ b/modules/codec/svcdsub.c @@ -51,22 +51,22 @@ static void DecoderClose ( vlc_object_t * ); "calls 1\n" \ "packet assembly info 2\n" ) -vlc_module_begin(); - set_description( N_("Philips OGT (SVCD subtitle) decoder") ); - set_shortname( N_("SVCD subtitles") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_capability( "decoder", 50 ); - set_callbacks( DecoderOpen, DecoderClose ); +vlc_module_begin () + set_description( N_("Philips OGT (SVCD subtitle) decoder") ) + set_shortname( N_("SVCD subtitles") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_capability( "decoder", 50 ) + set_callbacks( DecoderOpen, DecoderClose ) add_integer ( MODULE_STRING "-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT, true ); - add_submodule(); - set_description( N_("Philips OGT (SVCD subtitle) packetizer") ); - set_capability( "packetizer", 50 ); - set_callbacks( PacketizerOpen, DecoderClose ); -vlc_module_end(); + add_submodule () + set_description( N_("Philips OGT (SVCD subtitle) packetizer") ) + set_capability( "packetizer", 50 ) + set_callbacks( PacketizerOpen, DecoderClose ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/tarkin.c b/modules/codec/tarkin.c index 5b86788da1..2a35e496f3 100644 --- a/modules/codec/tarkin.c +++ b/modules/codec/tarkin.c @@ -76,14 +76,14 @@ static void tarkin_CopyPicture( decoder_t *, picture_t *, uint8_t *, int ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Tarkin decoder module") ); - set_capability( "decoder", 100 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "tarkin" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Tarkin decoder module") ) + set_capability( "decoder", 100 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "tarkin" ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/telx.c b/modules/codec/telx.c index 1cc96d5381..9743b440f3 100644 --- a/modules/codec/telx.c +++ b/modules/codec/telx.c @@ -68,13 +68,13 @@ static subpicture_t *Decode( decoder_t *, block_t ** ); "interpretation mistake. Try using this wrong interpretation if " \ "your subtitles don't appear.") -vlc_module_begin(); - set_description( N_("Teletext subtitles decoder") ); - set_shortname( "Teletext" ); - set_capability( "decoder", 50 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_description( N_("Teletext subtitles decoder") ) + set_shortname( "Teletext" ) + set_capability( "decoder", 50 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_callbacks( Open, Close ) add_integer( "telx-override-page", -1, NULL, OVERRIDE_PAGE_TEXT, OVERRIDE_PAGE_LONGTEXT, true ); @@ -83,7 +83,7 @@ vlc_module_begin(); add_bool( "telx-french-workaround", 0, NULL, FRENCH_WORKAROUND_TEXT, FRENCH_WORKAROUND_LONGTEXT, true ); -vlc_module_end(); +vlc_module_end () /**************************************************************************** * Local structures diff --git a/modules/codec/theora.c b/modules/codec/theora.c index b6411c93a7..2380b234af 100644 --- a/modules/codec/theora.c +++ b/modules/codec/theora.c @@ -97,29 +97,29 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ); "Enforce a quality between 1 (low) and 10 (high), instead " \ "of specifying a particular bitrate. This will produce a VBR stream." ) -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_shortname( "Theora" ); - set_description( N_("Theora video decoder") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "theora" ); - - add_submodule(); - set_description( N_("Theora video packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); - - add_submodule(); - set_description( N_("Theora video encoder") ); - set_capability( "encoder", 150 ); - set_callbacks( OpenEncoder, CloseEncoder ); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_shortname( "Theora" ) + set_description( N_("Theora video decoder") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "theora" ) + + add_submodule () + set_description( N_("Theora video packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) + + add_submodule () + set_description( N_("Theora video encoder") ) + set_capability( "encoder", 150 ) + set_callbacks( OpenEncoder, CloseEncoder ) # define ENC_CFG_PREFIX "sout-theora-" add_integer( ENC_CFG_PREFIX "quality", 2, NULL, ENC_QUALITY_TEXT, ENC_QUALITY_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () static const char *const ppsz_enc_options[] = { "quality", NULL diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c index 0f300efb72..418f080d27 100644 --- a/modules/codec/twolame.c +++ b/modules/codec/twolame.c @@ -71,13 +71,13 @@ static const char *const ppsz_stereo_descriptions[] = { N_("Stereo"), N_("Dual mono"), N_("Joint stereo") }; -vlc_module_begin(); - set_shortname( "Twolame"); - set_description( N_("Libtwolame audio encoder") ); - set_capability( "encoder", 50 ); - set_callbacks( OpenEncoder, CloseEncoder ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); +vlc_module_begin () + set_shortname( "Twolame") + set_description( N_("Libtwolame audio encoder") ) + set_capability( "encoder", 50 ) + set_callbacks( OpenEncoder, CloseEncoder ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) add_float( ENC_CFG_PREFIX "quality", 0.0, NULL, ENC_QUALITY_TEXT, ENC_QUALITY_LONGTEXT, false ); @@ -88,7 +88,7 @@ vlc_module_begin(); ENC_VBR_LONGTEXT, false ); add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT, ENC_PSY_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () static const char *const ppsz_enc_options[] = { "quality", "mode", "vbr", "psy", NULL diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 7217643263..312951d874 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -177,30 +177,30 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * ); #define ENC_CBR_LONGTEXT N_( \ "Force a constant bitrate encoding (CBR)." ) -vlc_module_begin(); - set_shortname( "Vorbis" ); - set_description( N_("Vorbis audio decoder") ); +vlc_module_begin () + set_shortname( "Vorbis" ) + set_description( N_("Vorbis audio decoder") ) #ifdef MODULE_NAME_IS_tremor - set_capability( "decoder", 90 ); + set_capability( "decoder", 90 ) #else - set_capability( "decoder", 100 ); + set_capability( "decoder", 100 ) #endif - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_callbacks( OpenDecoder, CloseDecoder ); + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) - add_submodule(); - set_description( N_("Vorbis audio packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); + add_submodule () + set_description( N_("Vorbis audio packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) #ifndef MODULE_NAME_IS_tremor # define ENC_CFG_PREFIX "sout-vorbis-" - add_submodule(); - set_description( N_("Vorbis audio encoder") ); - set_capability( "encoder", 100 ); + add_submodule () + set_description( N_("Vorbis audio encoder") ) + set_capability( "encoder", 100 ) #if defined(HAVE_VORBIS_VORBISENC_H) - set_callbacks( OpenEncoder, CloseEncoder ); + set_callbacks( OpenEncoder, CloseEncoder ) #endif add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT, @@ -213,7 +213,7 @@ vlc_module_begin(); ENC_CBR_LONGTEXT, false ); #endif -vlc_module_end(); +vlc_module_end () #ifndef MODULE_NAME_IS_tremor static const char *const ppsz_enc_options[] = { diff --git a/modules/codec/x264.c b/modules/codec/x264.c index 79f56a11da..6e749a7f0c 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -414,12 +414,12 @@ static const char *const direct_pred_list_text[] = { N_("none"), N_("spatial"), N_("temporal") }; #endif -vlc_module_begin(); - set_description( N_("H.264/MPEG4 AVC encoder (using x264 library)")); - set_capability( "encoder", 200 ); - set_callbacks( Open, Close ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); +vlc_module_begin () + set_description( N_("H.264/MPEG4 AVC encoder (using x264 library)")) + set_capability( "encoder", 200 ) + set_callbacks( Open, Close ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) /* Frame-type options */ @@ -428,11 +428,11 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT, MIN_KEYINT_LONGTEXT, false ); - add_deprecated_alias( SOUT_CFG_PREFIX "keyint-min" ); /* Deprecated since 0.8.5 */ + add_deprecated_alias( SOUT_CFG_PREFIX "keyint-min" ) /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT, SCENE_LONGTEXT, false ); - change_integer_range( -1, 100 ); + change_integer_range( -1, 100 ) #if X264_BUILD >= 55 /* r607 */ add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT, @@ -441,12 +441,12 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT, BFRAMES_LONGTEXT, false ); - change_integer_range( 0, 16 ); + change_integer_range( 0, 16 ) #if X264_BUILD >= 63 add_integer( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT, B_ADAPT_LONGTEXT, false ); - change_integer_range( 0, 2 ); + change_integer_range( 0, 2 ) #elif X264_BUILD >= 0x0013 /* r137 */ add_bool( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT, B_ADAPT_LONGTEXT, false ); @@ -455,7 +455,7 @@ vlc_module_begin(); #if X264_BUILD >= 0x0013 /* r137 */ add_integer( SOUT_CFG_PREFIX "b-bias", 0, NULL, B_BIAS_TEXT, B_BIAS_LONGTEXT, false ); - change_integer_range( -100, 100 ); + change_integer_range( -100, 100 ) #endif add_bool( SOUT_CFG_PREFIX "bpyramid", 0, NULL, BPYRAMID_TEXT, @@ -466,16 +466,16 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "ref", 1, NULL, REF_TEXT, REF_LONGTEXT, false ); - change_integer_range( 1, 16 ); - add_deprecated_alias( SOUT_CFG_PREFIX "frameref" ); /* Deprecated since 0.8.5 */ + change_integer_range( 1, 16 ) + add_deprecated_alias( SOUT_CFG_PREFIX "frameref" ) /* Deprecated since 0.8.5 */ add_bool( SOUT_CFG_PREFIX "nf", 0, NULL, NF_TEXT, NF_LONGTEXT, false ); - add_deprecated_alias( SOUT_CFG_PREFIX "loopfilter" ); /* Deprecated since 0.8.5 */ + add_deprecated_alias( SOUT_CFG_PREFIX "loopfilter" ) /* Deprecated since 0.8.5 */ add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT, FILTER_LONGTEXT, false ); - add_deprecated_alias( SOUT_CFG_PREFIX "filter" ); /* Deprecated since 0.8.6 */ + add_deprecated_alias( SOUT_CFG_PREFIX "filter" ) /* Deprecated since 0.8.6 */ add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT, LEVEL_LONGTEXT, false ); @@ -489,32 +489,32 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "qp", 26, NULL, QP_TEXT, QP_LONGTEXT, false ); - change_integer_range( 0, 51 ); /* QP 0 -> lossless encoding */ + change_integer_range( 0, 51 ) /* QP 0 -> lossless encoding */ #if X264_BUILD >= 37 /* r334 */ add_integer( SOUT_CFG_PREFIX "crf", 0, NULL, CRF_TEXT, CRF_LONGTEXT, false ); - change_integer_range( 0, 51 ); + change_integer_range( 0, 51 ) #endif add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT, QPMIN_LONGTEXT, false ); - change_integer_range( 0, 51 ); - add_deprecated_alias( SOUT_CFG_PREFIX "qp-min" ); /* Deprecated since 0.8.5 */ + change_integer_range( 0, 51 ) + add_deprecated_alias( SOUT_CFG_PREFIX "qp-min" ) /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT, QPMAX_LONGTEXT, false ); - change_integer_range( 0, 51 ); - add_deprecated_alias( SOUT_CFG_PREFIX "qp-max" ); /* Deprecated since 0.8.5 */ + change_integer_range( 0, 51 ) + add_deprecated_alias( SOUT_CFG_PREFIX "qp-max" ) /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT, QPSTEP_LONGTEXT, false ); - change_integer_range( 0, 51 ); + change_integer_range( 0, 51 ) add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT, RATETOL_LONGTEXT, false ); - change_float_range( 0, 100 ); - add_deprecated_alias( SOUT_CFG_PREFIX "tolerance" ); /* Deprecated since 0.8.5 */ + change_float_range( 0, 100 ) + add_deprecated_alias( SOUT_CFG_PREFIX "tolerance" ) /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT, VBV_MAXRATE_LONGTEXT, false ); @@ -524,15 +524,15 @@ vlc_module_begin(); add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT, VBV_INIT_LONGTEXT, false ); - change_float_range( 0, 1 ); + change_float_range( 0, 1 ) add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT, IPRATIO_LONGTEXT, false ); - change_float_range( 1, 2 ); + change_float_range( 1, 2 ) add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT, PBRATIO_LONGTEXT, false ); - change_float_range( 1, 2 ); + change_float_range( 1, 2 ) #if X264_BUILD >= 23 /* r190 */ add_integer( SOUT_CFG_PREFIX "chroma-qp-offset", 0, NULL, CHROMA_QP_OFFSET_TEXT, @@ -541,11 +541,11 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "pass", 0, NULL, PASS_TEXT, PASS_LONGTEXT, false ); - change_integer_range( 0, 3 ); + change_integer_range( 0, 3 ) add_float( SOUT_CFG_PREFIX "qcomp", 0.60, NULL, QCOMP_TEXT, QCOMP_LONGTEXT, false ); - change_float_range( 0, 1 ); + change_float_range( 0, 1 ) add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, NULL, CPLXBLUR_TEXT, CPLXBLUR_LONGTEXT, false ); @@ -555,7 +555,7 @@ vlc_module_begin(); #if X264_BUILD >= 59 add_integer( SOUT_CFG_PREFIX "aq-mode", 2, NULL, AQ_MODE_TEXT, AQ_MODE_LONGTEXT, false ); - change_integer_range( 0, 2 ); + change_integer_range( 0, 2 ) add_float( SOUT_CFG_PREFIX "aq-strength", 1.0, NULL, AQ_STRENGTH_TEXT, AQ_STRENGTH_LONGTEXT, false ); #endif @@ -566,7 +566,7 @@ vlc_module_begin(); add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT, ANALYSE_LONGTEXT, false ); change_string_list( enc_analyse_list, enc_analyse_list_text, 0 ); - add_deprecated_alias( SOUT_CFG_PREFIX "analyse" ); /* Deprecated since 0.8.6 */ + add_deprecated_alias( SOUT_CFG_PREFIX "analyse" ) /* Deprecated since 0.8.6 */ add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT, DIRECT_PRED_LONGTEXT, false ); @@ -575,7 +575,7 @@ vlc_module_begin(); #if X264_BUILD >= 52 /* r573 */ add_integer( SOUT_CFG_PREFIX "direct-8x8", -1, NULL, DIRECT_PRED_SIZE_TEXT, DIRECT_PRED_SIZE_LONGTEXT, false ); - change_integer_range( -1, 1 ); + change_integer_range( -1, 1 ) #endif #if X264_BUILD >= 0x0012 /* r134 */ @@ -590,7 +590,7 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "merange", 16, NULL, MERANGE_TEXT, MERANGE_LONGTEXT, false ); - change_integer_range( 1, 64 ); + change_integer_range( 1, 64 ) #endif add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT, @@ -603,8 +603,8 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT, SUBME_LONGTEXT, false ); - change_integer_range( 1, SUBME_MAX ); - add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ); /* Deprecated since 0.8.5 */ + change_integer_range( 1, SUBME_MAX ) + add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ) /* Deprecated since 0.8.5 */ #if X264_BUILD >= 41 && X264_BUILD < 65 /* r368 */ add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT, @@ -634,7 +634,7 @@ vlc_module_begin(); #if X264_BUILD >= 39 /* r360 */ add_integer( SOUT_CFG_PREFIX "trellis", 0, NULL, TRELLIS_TEXT, TRELLIS_LONGTEXT, false ); - change_integer_range( 0, 2 ); + change_integer_range( 0, 2 ) #endif #if X264_BUILD >= 42 /* r384 */ @@ -650,17 +650,17 @@ vlc_module_begin(); #if X264_BUILD >= 44 /* r398 */ add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT, NR_LONGTEXT, false ); - change_integer_range( 0, 1000 ); + change_integer_range( 0, 1000 ) #endif #if X264_BUILD >= 52 /* r573 */ add_integer( SOUT_CFG_PREFIX "deadzone-inter", 21, NULL, DEADZONE_INTER_TEXT, DEADZONE_INTRA_LONGTEXT, false ); - change_integer_range( 0, 32 ); + change_integer_range( 0, 32 ) add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, NULL, DEADZONE_INTRA_TEXT, DEADZONE_INTRA_LONGTEXT, false ); - change_integer_range( 0, 32 ); + change_integer_range( 0, 32 ) #endif /* Input/Output */ @@ -702,7 +702,7 @@ vlc_module_begin(); add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT, STATS_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/codec/xvmc/xxmc.c b/modules/codec/xvmc/xxmc.c index 7941bc8e1d..e502780c4e 100644 --- a/modules/codec/xvmc/xxmc.c +++ b/modules/codec/xvmc/xxmc.c @@ -100,12 +100,12 @@ static picture_t *GetNewPicture( decoder_t *, uint8_t ** ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("MPEG I/II hw video decoder (using libmpeg2)") ); - set_capability( "decoder", 140 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "xxmc" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("MPEG I/II hw video decoder (using libmpeg2)") ) + set_capability( "decoder", 140 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "xxmc" ) +vlc_module_end () /***************************************************************************** * OpenDecoder: probe the decoder and return score diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c index 833c886845..868d03747d 100644 --- a/modules/codec/zvbi.c +++ b/modules/codec/zvbi.c @@ -79,23 +79,23 @@ static const char *const ppsz_pos_descriptions[] = { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; -vlc_module_begin(); - set_description( N_("VBI and Teletext decoder") ); - set_shortname( N_("VBI & Teletext") ); - set_capability( "decoder", 51 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_description( N_("VBI and Teletext decoder") ) + set_shortname( N_("VBI & Teletext") ) + set_capability( "decoder", 51 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_callbacks( Open, Close ) add_integer( "vbi-page", 100, NULL, PAGE_TEXT, PAGE_LONGTEXT, false ); add_bool( "vbi-opaque", true, NULL, OPAQUE_TEXT, OPAQUE_LONGTEXT, false ); - add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false ); + add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); add_bool( "vbi-text", false, NULL, TELX_TEXT, TELX_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () /**************************************************************************** * Local structures diff --git a/modules/control/dbus.c b/modules/control/dbus.c index 972a19c3d9..bb6776ecbb 100644 --- a/modules/control/dbus.c +++ b/modules/control/dbus.c @@ -107,14 +107,14 @@ struct intf_sys_t * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( N_("dbus")); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); - set_description( N_("D-Bus control interface") ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("dbus")) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) + set_description( N_("D-Bus control interface") ) + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Methods diff --git a/modules/control/gestures.c b/modules/control/gestures.c index 940bbc42cd..5a187bb6ef 100644 --- a/modules/control/gestures.c +++ b/modules/control/gestures.c @@ -91,20 +91,20 @@ static const char *const button_list[] = { "left", "middle", "right" }; static const char *const button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") }; -vlc_module_begin(); - set_shortname( N_("Gestures")); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); +vlc_module_begin () + set_shortname( N_("Gestures")) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) add_integer( "gestures-threshold", 30, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true ); add_string( "gestures-button", "right", NULL, BUTTON_TEXT, BUTTON_LONGTEXT, false ); change_string_list( button_list, button_list_text, 0 ); - set_description( N_("Mouse gestures control interface") ); + set_description( N_("Mouse gestures control interface") ) - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * OpenIntf: initialize interface diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index e6c2ddb2d5..73b0e71827 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -95,12 +95,12 @@ static void ClearChannels ( intf_thread_t *, vout_thread_t * ); #define BOOKMARK10_TEXT N_("Playlist bookmark 10") #define BOOKMARK_LONGTEXT N_("Define playlist bookmarks.") -vlc_module_begin(); - set_shortname( N_("Hotkeys") ); - set_description( N_("Hotkeys management interface") ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("Hotkeys") ) + set_description( N_("Hotkeys management interface") ) + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: initialize interface diff --git a/modules/control/http/http.c b/modules/control/http/http.c index 08becdf796..0c1cd34bb0 100644 --- a/modules/control/http/http.c +++ b/modules/control/http/http.c @@ -63,26 +63,26 @@ static void Close( vlc_object_t * ); #define CRL_TEXT N_( "CRL file" ) #define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file." ) -vlc_module_begin(); - set_shortname( N_("HTTP")); - set_description( N_("HTTP remote control interface") ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); - add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true ); - add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, true ); - add_obsolete_string ( "http-charset" ); +vlc_module_begin () + set_shortname( N_("HTTP")) + set_description( N_("HTTP remote control interface") ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) + add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true ) + add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, true ) + add_obsolete_string ( "http-charset" ) #if defined( HAVE_FORK ) || defined( WIN32 ) - add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true ); + add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true ) #endif - add_bool ( "http-album-art", false, NULL, ART_TEXT, ART_LONGTEXT, true ); - set_section( N_("HTTP SSL" ), 0 ); - add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, true ); - add_string ( "http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, true ); - add_string ( "http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, true ); - add_string ( "http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, true ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_bool ( "http-album-art", false, NULL, ART_TEXT, ART_LONGTEXT, true ) + set_section( N_("HTTP SSL" ), 0 ) + add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, true ) + add_string ( "http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, true ) + add_string ( "http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, true ) + add_string ( "http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, true ) + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** diff --git a/modules/control/lirc.c b/modules/control/lirc.c index c82dcc5886..467f48229a 100644 --- a/modules/control/lirc.c +++ b/modules/control/lirc.c @@ -53,17 +53,17 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("Infrared") ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); - set_description( N_("Infrared remote control interface") ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_shortname( N_("Infrared") ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) + set_description( N_("Infrared remote control interface") ) + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) add_string( "lirc-file", NULL, NULL, LIRC_TEXT, LIRC_LONGTEXT, true ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * intf_sys_t: description and status of FB interface diff --git a/modules/control/motion.c b/modules/control/motion.c index 6219f7b6c1..c788857fb9 100644 --- a/modules/control/motion.c +++ b/modules/control/motion.c @@ -74,19 +74,19 @@ static int GetOrientation( intf_thread_t *p_intf ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( N_("motion")); - set_category( CAT_INTERFACE ); - set_description( N_("motion control interface") ); +vlc_module_begin () + set_shortname( N_("motion")) + set_category( CAT_INTERFACE ) + set_description( N_("motion control interface") ) set_help( N_("Use HDAPS, AMS, APPLESMC or UNIMOTION motion sensors " \ "to rotate the video") ) add_bool( "motion-use-rotate", 0, NULL, USE_ROTATE_TEXT, USE_ROTATE_TEXT, false ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * OpenIntf: initialise interface diff --git a/modules/control/netsync.c b/modules/control/netsync.c index 3b4b7bc3df..d005e6acf4 100644 --- a/modules/control/netsync.c +++ b/modules/control/netsync.c @@ -72,20 +72,20 @@ static mtime_t GetClockRef( intf_thread_t *, mtime_t ); #define MIP_LONGTEXT N_( "IP address of " \ "the master client used for the network synchronisation." ) -vlc_module_begin(); - set_shortname( N_("Network Sync")); - set_description( N_("Network synchronisation") ); - set_category( CAT_ADVANCED ); - set_subcategory( SUBCAT_ADVANCED_MISC ); +vlc_module_begin () + set_shortname( N_("Network Sync")) + set_description( N_("Network synchronisation") ) + set_category( CAT_ADVANCED ) + set_subcategory( SUBCAT_ADVANCED_MISC ) add_bool( "netsync-master", 0, NULL, NETSYNC_TEXT, NETSYNC_LONGTEXT, true ); add_string( "netsync-master-ip", NULL, NULL, MIP_TEXT, MIP_LONGTEXT, true ); - set_capability( "interface", 0 ); - set_callbacks( Activate, Close ); -vlc_module_end(); + set_capability( "interface", 0 ) + set_callbacks( Activate, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c index 7432db8542..e7bd289119 100644 --- a/modules/control/ntservice.c +++ b/modules/control/ntservice.c @@ -61,11 +61,11 @@ static void Close ( vlc_object_t * ); "properly configured. Use a comma separated list of interface modules. " \ "(common values are: logger, sap, rc, http)") -vlc_module_begin(); - set_shortname( N_("NT Service")); - set_description( N_("Windows Service interface") ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); +vlc_module_begin () + set_shortname( N_("NT Service")) + set_description( N_("Windows Service interface") ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) add_bool( "ntservice-install", 0, NULL, INSTALL_TEXT, INSTALL_LONGTEXT, true ); add_bool( "ntservice-uninstall", 0, NULL, @@ -77,9 +77,9 @@ vlc_module_begin(); add_string ( "ntservice-extraintf", NULL, NULL, EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, true ); - set_capability( "interface", 0 ); - set_callbacks( Activate, Close ); -vlc_module_end(); + set_capability( "interface", 0 ) + set_callbacks( Activate, Close ) +vlc_module_end () struct intf_sys_t { diff --git a/modules/control/rc.c b/modules/control/rc.c index a43fbb9fd1..cb6d0cfcb7 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -189,27 +189,27 @@ static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) "open." ) #endif -vlc_module_begin(); - set_shortname( N_("RC")); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); - set_description( N_("Remote control interface") ); - add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, true ); +vlc_module_begin () + set_shortname( N_("RC")) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) + set_description( N_("Remote control interface") ) + add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, true ) #ifdef WIN32 - add_bool( "rc-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ); + add_bool( "rc-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ) #else #if defined (HAVE_ISATTY) - add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, true ); + add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, true ) #endif - add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, true ); + add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, true ) #endif - add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, true ); + add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, true ) - set_capability( "interface", 20 ); + set_capability( "interface", 20 ) - set_callbacks( Activate, Deactivate ); -vlc_module_end(); + set_callbacks( Activate, Deactivate ) +vlc_module_end () /***************************************************************************** * Activate: initialize and create stuff diff --git a/modules/control/showintf.c b/modules/control/showintf.c index a59cad6c89..01ec57e345 100644 --- a/modules/control/showintf.c +++ b/modules/control/showintf.c @@ -66,14 +66,14 @@ static int MouseEvent( vlc_object_t *, char const *, #define THRESHOLD_TEXT N_( "Threshold" ) #define THRESHOLD_LONGTEXT N_( "Height of the zone triggering the interface." ) -vlc_module_begin(); - set_shortname( "Showintf" ); - add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true ); - set_description( N_("Show interface with mouse") ); - - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "Showintf" ) + add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true ) + set_description( N_("Show interface with mouse") ) + + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: initialize interface diff --git a/modules/control/signals.c b/modules/control/signals.c index 840a8114e4..1b481ccd7d 100644 --- a/modules/control/signals.c +++ b/modules/control/signals.c @@ -33,14 +33,14 @@ static int Open (vlc_object_t *); static void Close (vlc_object_t *); static void *SigThread (void *); -vlc_module_begin (); - set_shortname (N_("Signals")); - set_category (CAT_INTERFACE); - set_subcategory (SUBCAT_INTERFACE_CONTROL); - set_description (N_("POSIX signals handling interface")); - set_capability ("interface", 0); - set_callbacks (Open, Close); -vlc_module_end (); +vlc_module_begin () + set_shortname (N_("Signals")) + set_category (CAT_INTERFACE) + set_subcategory (SUBCAT_INTERFACE_CONTROL) + set_description (N_("POSIX signals handling interface")) + set_capability ("interface", 0) + set_callbacks (Open, Close) +vlc_module_end () struct intf_sys_t { diff --git a/modules/control/telnet.c b/modules/control/telnet.c index dcd286326d..6cf4b6d64a 100644 --- a/modules/control/telnet.c +++ b/modules/control/telnet.c @@ -89,21 +89,21 @@ static void Close( vlc_object_t * ); "to protect this interface. The default value is \"admin\"." ) #define TELNETPWD_DEFAULT "admin" -vlc_module_begin(); - set_shortname( "Telnet" ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); +vlc_module_begin () + set_shortname( "Telnet" ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) add_string( "telnet-host", "", NULL, TELNETHOST_TEXT, TELNETHOST_LONGTEXT, true ); add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT, TELNETPORT_LONGTEXT, true ); add_password( "telnet-password", TELNETPWD_DEFAULT, NULL, TELNETPWD_TEXT, TELNETPWD_LONGTEXT, true ); - set_description( N_("VLM remote control interface") ); - add_category_hint( "VLM", NULL, false ); - set_capability( "interface", 0 ); - set_callbacks( Open , Close ); -vlc_module_end(); + set_description( N_("VLM remote control interface") ) + add_category_hint( "VLM", NULL, false ) + set_capability( "interface", 0 ) + set_callbacks( Open , Close ) +vlc_module_end () /***************************************************************************** * Local prototypes. diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c index 092357493a..186606713b 100644 --- a/modules/demux/aiff.c +++ b/modules/demux/aiff.c @@ -43,14 +43,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("AIFF demuxer" ) ); - set_capability( "demux", 10 ); - set_callbacks( Open, Close ); - add_shortcut( "aiff" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("AIFF demuxer" ) ) + set_capability( "demux", 10 ) + set_callbacks( Open, Close ) + add_shortcut( "aiff" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c index 6169d6b665..a7e9e201b3 100644 --- a/modules/demux/asf/asf.c +++ b/modules/demux/asf/asf.c @@ -50,14 +50,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("ASF v1.0 demuxer") ); - set_capability( "demux", 200 ); - set_callbacks( Open, Close ); - add_shortcut( "asf" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("ASF v1.0 demuxer") ) + set_capability( "demux", 200 ) + set_callbacks( Open, Close ) + add_shortcut( "asf" ) +vlc_module_end () /***************************************************************************** diff --git a/modules/demux/au.c b/modules/demux/au.c index 58da050f61..87fb9e4237 100644 --- a/modules/demux/au.c +++ b/modules/demux/au.c @@ -44,14 +44,14 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("AU demuxer") ); - set_capability( "demux", 10 ); - set_callbacks( Open, Close ); - add_shortcut( "au" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("AU demuxer") ) + set_capability( "demux", 10 ) + set_callbacks( Open, Close ) + add_shortcut( "au" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c index 59a5862fd2..8c45258aa6 100644 --- a/modules/demux/avformat/avformat.c +++ b/modules/demux/avformat/avformat.c @@ -45,21 +45,21 @@ /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - add_shortcut( "ffmpeg" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_description( N_("FFmpeg demuxer" ) ); - set_capability( "demux", 2 ); - set_callbacks( OpenDemux, CloseDemux ); +vlc_module_begin () + add_shortcut( "ffmpeg" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_description( N_("FFmpeg demuxer" ) ) + set_capability( "demux", 2 ) + set_callbacks( OpenDemux, CloseDemux ) #ifdef ENABLE_SOUT /* mux submodule */ - add_submodule(); - set_description( N_("FFmpeg muxer" ) ); - set_capability( "sout mux", 2 ); + add_submodule () + set_description( N_("FFmpeg muxer" ) ) + set_capability( "sout mux", 2 ) add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT, MUX_LONGTEXT, true ); - set_callbacks( OpenMux, CloseMux ); + set_callbacks( OpenMux, CloseMux ) #endif -vlc_module_end(); +vlc_module_end () diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index eb7cbfbb86..8c8a0223da 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -60,12 +60,12 @@ static const int pi_index[] = {0,1,2}; static const char *const ppsz_indexes[] = { N_("Ask"), N_("Always fix"), N_("Never fix") }; -vlc_module_begin(); - set_shortname( "AVI" ); - set_description( N_("AVI demuxer") ); - set_capability( "demux", 212 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); +vlc_module_begin () + set_shortname( "AVI" ) + set_description( N_("AVI demuxer") ) + set_capability( "demux", 212 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) add_bool( "avi-interleaved", 0, NULL, INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, true ); @@ -73,8 +73,8 @@ vlc_module_begin(); INDEX_TEXT, INDEX_LONGTEXT, false ); change_integer_list( pi_index, ppsz_indexes, NULL ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c index d2fc789912..a4d16f5410 100644 --- a/modules/demux/cdg.c +++ b/modules/demux/cdg.c @@ -41,15 +41,15 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("CDG demuxer") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 3 ); - set_callbacks( Open, Close ); - add_shortcut( "cdg" ); - add_shortcut( "subtitle" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("CDG demuxer") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 3 ) + set_callbacks( Open, Close ) + add_shortcut( "cdg" ) + add_shortcut( "subtitle" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/decomp.c b/modules/demux/decomp.c index 82ae4bc190..1489db3b2a 100644 --- a/modules/demux/decomp.c +++ b/modules/demux/decomp.c @@ -43,18 +43,18 @@ static int OpenGzip (vlc_object_t *); static int OpenBzip2 (vlc_object_t *); static void Close (vlc_object_t *); -vlc_module_begin (); - set_description (N_("Decompression")); - set_category (CAT_INPUT); - set_subcategory (SUBCAT_INPUT_DEMUX); - set_capability ("demux", 20); - set_callbacks (OpenBzip2, Close); +vlc_module_begin () + set_description (N_("Decompression")) + set_category (CAT_INPUT) + set_subcategory (SUBCAT_INPUT_DEMUX) + set_capability ("demux", 20) + set_callbacks (OpenBzip2, Close) /* TODO: shortnames */ /* --demux support */ - add_submodule (); - set_callbacks (OpenGzip, Close); -vlc_module_end (); + add_submodule () + set_callbacks (OpenGzip, Close) +vlc_module_end () static int Demux (demux_t *); static int Control (demux_t *, int i_query, va_list args); diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c index 1dd677377b..3ef046a551 100644 --- a/modules/demux/demuxdump.c +++ b/modules/demux/demuxdump.c @@ -49,19 +49,19 @@ static int Open( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_shortname("Dump"); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("File dumper") ); - set_capability( "demux", 0 ); +vlc_module_begin () + set_shortname("Dump") + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("File dumper") ) + set_capability( "demux", 0 ) add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT, FILE_LONGTEXT, false ); add_bool( "demuxdump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ); - set_callbacks( Open, Close ); - add_shortcut( "dump" ); -vlc_module_end(); + set_callbacks( Open, Close ) + add_shortcut( "dump" ) +vlc_module_end () /***************************************************************************** diff --git a/modules/demux/flac.c b/modules/demux/flac.c index 81db480d94..5203cffdda 100644 --- a/modules/demux/flac.c +++ b/modules/demux/flac.c @@ -44,14 +44,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("FLAC demuxer") ); - set_capability( "demux", 155 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_callbacks( Open, Close ); - add_shortcut( "flac" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("FLAC demuxer") ) + set_capability( "demux", 155 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_callbacks( Open, Close ) + add_shortcut( "flac" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/gme.cpp b/modules/demux/gme.cpp index 2dfb5c957a..e24f04b9d0 100644 --- a/modules/demux/gme.cpp +++ b/modules/demux/gme.cpp @@ -50,15 +50,15 @@ using namespace std; static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_shortname( "GME"); - set_description( N_("GME demuxer (Game_Music_Emu)" ) ); - set_capability( "demux", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_callbacks( Open, Close ); - add_shortcut( "gme" ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "GME") + set_description( N_("GME demuxer (Game_Music_Emu)" ) ) + set_capability( "demux", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_callbacks( Open, Close ) + add_shortcut( "gme" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 6a09c4f7c8..415510d902 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -89,22 +89,22 @@ static void Close( vlc_object_t * ); #define PASS_LONGTEXT N_("Allows you to modify the password that will be " \ "used for the connection.") -vlc_module_begin(); - set_description( N_("RTP/RTSP/SDP demuxer (using Live555)" ) ); - set_capability( "demux", 50 ); - set_shortname( "RTP/RTSP"); - set_callbacks( Open, Close ); - add_shortcut( "live" ); - add_shortcut( "livedotcom" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - - add_submodule(); - set_description( N_("RTSP/RTP access and demux") ); - add_shortcut( "rtsp" ); - add_shortcut( "sdp" ); - set_capability( "access_demux", 0 ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_description( N_("RTP/RTSP/SDP demuxer (using Live555)" ) ) + set_capability( "demux", 50 ) + set_shortname( "RTP/RTSP") + set_callbacks( Open, Close ) + add_shortcut( "live" ) + add_shortcut( "livedotcom" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + + add_submodule () + set_description( N_("RTSP/RTP access and demux") ) + add_shortcut( "rtsp" ) + add_shortcut( "sdp" ) + set_capability( "access_demux", 0 ) + set_callbacks( Open, Close ) add_bool( "rtsp-tcp", 0, NULL, N_("Use RTP over RTSP (TCP)"), N_("Use RTP over RTSP (TCP)"), true ); @@ -129,7 +129,7 @@ vlc_module_begin(); USER_LONGTEXT, true ); add_string( "rtsp-pwd", NULL, NULL, PASS_TEXT, PASS_LONGTEXT, true ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c index 5415864d0d..fff153f4bc 100644 --- a/modules/demux/mjpeg.c +++ b/modules/demux/mjpeg.c @@ -49,15 +49,15 @@ static void Close( vlc_object_t * ); "playing MJPEG from a file. Use 0 (this is the default value) for a " \ "live stream (from a camera).") -vlc_module_begin(); - set_shortname( "MJPEG"); - set_description( N_("M-JPEG camera demuxer") ); - set_capability( "demux", 5 ); - set_callbacks( Open, Close ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - add_float( "mjpeg-fps", 0.0, NULL, FPS_TEXT, FPS_LONGTEXT, false ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "MJPEG") + set_description( N_("M-JPEG camera demuxer") ) + set_capability( "demux", 5 ) + set_callbacks( Open, Close ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + add_float( "mjpeg-fps", 0.0, NULL, FPS_TEXT, FPS_LONGTEXT, false ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp index 2c1e967345..ae7329afba 100644 --- a/modules/demux/mkv/mkv.cpp +++ b/modules/demux/mkv/mkv.cpp @@ -39,13 +39,13 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname( "Matroska" ); - set_description( N_("Matroska stream demuxer" ) ); - set_capability( "demux", 0 ); - set_callbacks( Open, Close ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); +vlc_module_begin () + set_shortname( "Matroska" ) + set_description( N_("Matroska stream demuxer" ) ) + set_capability( "demux", 0 ) + set_callbacks( Open, Close ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) add_bool( "mkv-use-ordered-chapters", 1, NULL, N_("Ordered chapters"), @@ -67,9 +67,9 @@ vlc_module_begin(); N_("Dummy Elements"), N_("Read and discard unknown EBML elements (not good for broken files)."), true ); - add_shortcut( "mka" ); - add_shortcut( "mkv" ); -vlc_module_end(); + add_shortcut( "mka" ) + add_shortcut( "mkv" ) +vlc_module_end () class demux_sys_t; diff --git a/modules/demux/mod.c b/modules/demux/mod.c index 69128ecc99..19c002b698 100644 --- a/modules/demux/mod.c +++ b/modules/demux/mod.c @@ -65,12 +65,12 @@ static void Close ( vlc_object_t * ); #define SURROUND_DELAY_LONGTEXT N_("Surround delay, in ms. Usual values are " \ "from 5 to 40 ms." ) -vlc_module_begin(); - set_shortname( "MOD"); - set_description( N_("MOD demuxer (libmodplug)" ) ); - set_capability( "demux", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); +vlc_module_begin () + set_shortname( "MOD") + set_description( N_("MOD demuxer (libmodplug)" ) ) + set_capability( "demux", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) add_bool( "mod-noisereduction", true, NULL, N_("Noise reduction"), NOISE_LONGTEXT, false ); @@ -96,9 +96,9 @@ vlc_module_begin(); add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL, N_("Surround delay (ms)"), SURROUND_DELAY_LONGTEXT, true ); - set_callbacks( Open, Close ); - add_shortcut( "mod" ); -vlc_module_end(); + set_callbacks( Open, Close ) + add_shortcut( "mod" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 0a099175b3..369c632238 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -52,13 +52,13 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("MP4 stream demuxer") ); - set_capability( "demux", 242 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("MP4 stream demuxer") ) + set_capability( "demux", 242 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c index d6d4ed3ea4..d0a9d931f9 100644 --- a/modules/demux/mpc.c +++ b/modules/demux/mpc.c @@ -52,15 +52,15 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("MusePack demuxer") ); - set_capability( "demux", 145 ); - - set_callbacks( Open, Close ); - add_shortcut( "mpc" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("MusePack demuxer") ) + set_capability( "demux", 145 ) + + set_callbacks( Open, Close ) + add_shortcut( "mpc" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c index d86a5a010e..dbac5dab5f 100644 --- a/modules/demux/mpeg/es.c +++ b/modules/demux/mpeg/es.c @@ -42,27 +42,27 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("MPEG-I/II/4 / A52 / DTS audio" ) ); - set_capability( "demux", 155 ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("MPEG-I/II/4 / A52 / DTS audio" ) ) + set_capability( "demux", 155 ) + set_callbacks( Open, Close ) - add_shortcut( "mpga" ); - add_shortcut( "mp3" ); + add_shortcut( "mpga" ) + add_shortcut( "mp3" ) - add_shortcut( "m4a" ); - add_shortcut( "mp4a" ); - add_shortcut( "aac" ); + add_shortcut( "m4a" ) + add_shortcut( "mp4a" ) + add_shortcut( "aac" ) - add_shortcut( "ac3" ); - add_shortcut( "a52" ); + add_shortcut( "ac3" ) + add_shortcut( "a52" ) - add_shortcut( "eac3" ); + add_shortcut( "eac3" ) - add_shortcut( "dts" ); -vlc_module_end(); + add_shortcut( "dts" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/mpeg/h264.c b/modules/demux/mpeg/h264.c index a529cabff2..5f6071c482 100644 --- a/modules/demux/mpeg/h264.c +++ b/modules/demux/mpeg/h264.c @@ -44,16 +44,16 @@ static void Close( vlc_object_t * ); #define FPS_LONGTEXT N_("Desired frame rate for the H264 stream.") -vlc_module_begin(); - set_shortname( "H264"); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("H264 video demuxer" ) ); - set_capability( "demux", 0 ); - add_float( "h264-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ); - set_callbacks( Open, Close ); - add_shortcut( "h264" ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "H264") + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("H264 video demuxer" ) ) + set_capability( "demux", 0 ) + add_float( "h264-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) + set_callbacks( Open, Close ) + add_shortcut( "h264" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/mpeg/m4v.c b/modules/demux/mpeg/m4v.c index d51ab695e3..2f48a9e2ce 100644 --- a/modules/demux/mpeg/m4v.c +++ b/modules/demux/mpeg/m4v.c @@ -44,16 +44,16 @@ static void Close( vlc_object_t * ); #define FPS_LONGTEXT N_("This is the desired frame rate when " \ "playing MPEG4 video elementary streams.") -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("MPEG-4 video demuxer" ) ); - set_capability( "demux", 0 ); - set_callbacks( Open, Close ); - add_shortcut( "m4v" ); - add_shortcut( "mp4v" ); - add_float( "m4v-fps", 25, NULL, FPS_TEXT, FPS_LONGTEXT, false ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("MPEG-4 video demuxer" ) ) + set_capability( "demux", 0 ) + set_callbacks( Open, Close ) + add_shortcut( "m4v" ) + add_shortcut( "mp4v" ) + add_float( "m4v-fps", 25, NULL, FPS_TEXT, FPS_LONGTEXT, false ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/mpeg/mpgv.c b/modules/demux/mpeg/mpgv.c index b1f1251187..946739aa3c 100644 --- a/modules/demux/mpeg/mpgv.c +++ b/modules/demux/mpeg/mpgv.c @@ -40,14 +40,14 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("MPEG-I/II video demuxer" ) ); - set_capability( "demux", 100 ); - set_callbacks( Open, Close ); - add_shortcut( "mpgv" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("MPEG-I/II video demuxer" ) ) + set_capability( "demux", 100 ) + set_callbacks( Open, Close ) + add_shortcut( "mpgv" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c index c889af9a8e..c401c0b5f2 100644 --- a/modules/demux/nsc.c +++ b/modules/demux/nsc.c @@ -42,13 +42,13 @@ static int DemuxOpen ( vlc_object_t * ); static void DemuxClose ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("Windows Media NSC metademux") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 3 ); - set_callbacks( DemuxOpen, DemuxClose ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Windows Media NSC metademux") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 3 ) + set_callbacks( DemuxOpen, DemuxClose ) +vlc_module_end () static int Demux ( demux_t *p_demux ); static int Control( demux_t *p_demux, int i_query, va_list args ); diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c index 8af188efc6..34890534b0 100644 --- a/modules/demux/nsv.c +++ b/modules/demux/nsv.c @@ -45,14 +45,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("NullSoft demuxer" ) ); - set_capability( "demux", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_callbacks( Open, Close ); - add_shortcut( "nsv" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("NullSoft demuxer" ) ) + set_capability( "demux", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_callbacks( Open, Close ) + add_shortcut( "nsv" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c index 0a7c8917c8..c6a87b45ac 100644 --- a/modules/demux/nuv.c +++ b/modules/demux/nuv.c @@ -43,14 +43,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("Nuv demuxer") ); - set_capability( "demux", 145 ); - set_callbacks( Open, Close ); - add_shortcut( "nuv" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("Nuv demuxer") ) + set_capability( "demux", 145 ) + set_callbacks( Open, Close ) + add_shortcut( "nuv" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index db22e7c8ff..2a85c3f276 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -46,15 +46,15 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname ( "OGG" ); - set_description( N_("OGG demuxer" ) ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 50 ); - set_callbacks( Open, Close ); - add_shortcut( "ogg" ); -vlc_module_end(); +vlc_module_begin () + set_shortname ( "OGG" ) + set_description( N_("OGG demuxer" ) ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 50 ) + set_callbacks( Open, Close ) + add_shortcut( "ogg" ) +vlc_module_end () /***************************************************************************** diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c index 3b8374d5e1..1e22d6f4fe 100644 --- a/modules/demux/playlist/playlist.c +++ b/modules/demux/playlist/playlist.c @@ -49,90 +49,90 @@ #define SKIP_ADS_LONGTEXT N_( "Use playlist options usually used to prevent " \ "ads skipping to detect ads and prevent adding them to the playlist." ) -vlc_module_begin(); - add_shortcut( "playlist" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); +vlc_module_begin () + add_shortcut( "playlist" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) add_bool( "playlist-autostart", 1, NULL, AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false ); - add_integer( "parent-item", 0, NULL, NULL, NULL, true ); - change_internal(); + add_integer( "parent-item", 0, NULL, NULL, NULL, true ) + change_internal () add_bool( "playlist-skip-ads", 1, NULL, SKIP_ADS_TEXT, SKIP_ADS_LONGTEXT, false ); - set_shortname( N_("Playlist") ); - set_description( N_("Playlist") ); - add_submodule(); - set_description( N_("M3U playlist import") ); - add_shortcut( "m3u-open" ); - set_capability( "demux", 10 ); - set_callbacks( Import_M3U, Close_M3U ); - add_submodule(); - set_description( N_("PLS playlist import") ); - add_shortcut( "pls-open" ); - set_capability( "demux", 10 ); - set_callbacks( Import_PLS, Close_PLS ); - add_submodule(); - set_description( N_("B4S playlist import") ); - add_shortcut( "b4s-open" ); - add_shortcut( "shout-b4s" ); - set_capability( "demux", 10 ); - set_callbacks( Import_B4S, Close_B4S ); - add_submodule(); - set_description( N_("DVB playlist import") ); - add_shortcut( "dvb-open" ); - set_capability( "demux", 10 ); - set_callbacks( Import_DVB, Close_DVB ); - add_submodule(); - set_description( N_("Podcast parser") ); - add_shortcut( "podcast" ); - set_capability( "demux", 10 ); - set_callbacks( Import_podcast, Close_podcast ); - add_submodule(); - set_description( N_("XSPF playlist import") ); - add_shortcut( "xspf-open" ); - set_capability( "demux", 10 ); - set_callbacks( Import_xspf, Close_xspf ); - add_submodule(); - set_description( N_("New winamp 5.2 shoutcast import") ); - add_shortcut( "shout-winamp" ); - set_capability( "demux", 10 ); - set_callbacks( Import_Shoutcast, Close_Shoutcast ); + set_shortname( N_("Playlist") ) + set_description( N_("Playlist") ) + add_submodule () + set_description( N_("M3U playlist import") ) + add_shortcut( "m3u-open" ) + set_capability( "demux", 10 ) + set_callbacks( Import_M3U, Close_M3U ) + add_submodule () + set_description( N_("PLS playlist import") ) + add_shortcut( "pls-open" ) + set_capability( "demux", 10 ) + set_callbacks( Import_PLS, Close_PLS ) + add_submodule () + set_description( N_("B4S playlist import") ) + add_shortcut( "b4s-open" ) + add_shortcut( "shout-b4s" ) + set_capability( "demux", 10 ) + set_callbacks( Import_B4S, Close_B4S ) + add_submodule () + set_description( N_("DVB playlist import") ) + add_shortcut( "dvb-open" ) + set_capability( "demux", 10 ) + set_callbacks( Import_DVB, Close_DVB ) + add_submodule () + set_description( N_("Podcast parser") ) + add_shortcut( "podcast" ) + set_capability( "demux", 10 ) + set_callbacks( Import_podcast, Close_podcast ) + add_submodule () + set_description( N_("XSPF playlist import") ) + add_shortcut( "xspf-open" ) + set_capability( "demux", 10 ) + set_callbacks( Import_xspf, Close_xspf ) + add_submodule () + set_description( N_("New winamp 5.2 shoutcast import") ) + add_shortcut( "shout-winamp" ) + set_capability( "demux", 10 ) + set_callbacks( Import_Shoutcast, Close_Shoutcast ) add_bool( "shoutcast-show-adult", false, NULL, SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false ); - add_submodule(); - set_description( N_("ASX playlist import") ); - add_shortcut( "asx-open" ); - set_capability( "demux", 10 ); - set_callbacks( Import_ASX, Close_ASX ); - add_submodule(); - set_description( N_("Kasenna MediaBase parser") ); - add_shortcut( "sgimb" ); - set_capability( "demux", 10 ); - set_callbacks( Import_SGIMB, Close_SGIMB ); - add_submodule(); - set_description( N_("QuickTime Media Link importer") ); - add_shortcut( "qtl" ); - set_capability( "demux", 10 ); - set_callbacks( Import_QTL, Close_QTL ); - add_submodule(); - set_description( N_("Google Video Playlist importer") ); - add_shortcut( "gvp" ); - set_capability( "demux", 10 ); - set_callbacks( Import_GVP, Close_GVP ); - add_submodule(); - set_description( N_("Dummy ifo demux") ); - set_capability( "demux", 12 ); - set_callbacks( Import_IFO, Close_IFO ); - add_submodule(); - set_description( N_("iTunes Music Library importer") ); - add_shortcut( "itml" ); - set_capability( "demux", 10 ); - set_callbacks( Import_iTML, Close_iTML ); -vlc_module_end(); + add_submodule () + set_description( N_("ASX playlist import") ) + add_shortcut( "asx-open" ) + set_capability( "demux", 10 ) + set_callbacks( Import_ASX, Close_ASX ) + add_submodule () + set_description( N_("Kasenna MediaBase parser") ) + add_shortcut( "sgimb" ) + set_capability( "demux", 10 ) + set_callbacks( Import_SGIMB, Close_SGIMB ) + add_submodule () + set_description( N_("QuickTime Media Link importer") ) + add_shortcut( "qtl" ) + set_capability( "demux", 10 ) + set_callbacks( Import_QTL, Close_QTL ) + add_submodule () + set_description( N_("Google Video Playlist importer") ) + add_shortcut( "gvp" ) + set_capability( "demux", 10 ) + set_callbacks( Import_GVP, Close_GVP ) + add_submodule () + set_description( N_("Dummy ifo demux") ) + set_capability( "demux", 12 ) + set_callbacks( Import_IFO, Close_IFO ) + add_submodule () + set_description( N_("iTunes Music Library importer") ) + add_shortcut( "itml" ) + set_capability( "demux", 10 ) + set_callbacks( Import_iTML, Close_iTML ) +vlc_module_end () /** diff --git a/modules/demux/ps.c b/modules/demux/ps.c index 274dc0bfee..ddd5072567 100644 --- a/modules/demux/ps.c +++ b/modules/demux/ps.c @@ -52,22 +52,22 @@ static int OpenForce( vlc_object_t * ); static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("MPEG-PS demuxer") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 1 ); - set_callbacks( OpenForce, Close ); - add_shortcut( "ps" ); +vlc_module_begin () + set_description( N_("MPEG-PS demuxer") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 1 ) + set_callbacks( OpenForce, Close ) + add_shortcut( "ps" ) add_bool( "ps-trust-timestamps", true, NULL, TIME_TEXT, TIME_LONGTEXT, true ); - add_submodule(); - set_description( N_("MPEG-PS demuxer") ); - set_capability( "demux", 8 ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_submodule () + set_description( N_("MPEG-PS demuxer") ) + set_capability( "demux", 8 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/pva.c b/modules/demux/pva.c index a3f13a01fb..68093d98df 100644 --- a/modules/demux/pva.c +++ b/modules/demux/pva.c @@ -39,14 +39,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("PVA demuxer" ) ); - set_capability( "demux", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_callbacks( Open, Close ); - add_shortcut( "pva" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("PVA demuxer" ) ) + set_capability( "demux", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_callbacks( Open, Close ) + add_shortcut( "pva" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c index 627220aee6..611be06aec 100644 --- a/modules/demux/rawdv.c +++ b/modules/demux/rawdv.c @@ -44,16 +44,16 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname( "DV" ); - set_description( N_("DV (Digital Video) demuxer") ); - set_capability( "demux", 3 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - add_bool( "rawdv-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, false ); - set_callbacks( Open, Close ); - add_shortcut( "rawdv" ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "DV" ) + set_description( N_("DV (Digital Video) demuxer") ) + set_capability( "demux", 3 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + add_bool( "rawdv-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, false ) + set_callbacks( Open, Close ) + add_shortcut( "rawdv" ) +vlc_module_end () /***************************************************************************** diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c index 542f20ab6f..d39ba0a5fc 100644 --- a/modules/demux/rawvid.c +++ b/modules/demux/rawvid.c @@ -60,22 +60,22 @@ static void Close( vlc_object_t * ); #define ASPECT_RATIO_LONGTEXT N_( \ "Aspect ratio (4:3, 16:9). Default is square pixels." ) -vlc_module_begin(); - set_shortname( "Raw Video" ); - set_description( N_("Raw video demuxer") ); - set_capability( "demux", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_callbacks( Open, Close ); - add_shortcut( "rawvideo" ); - add_float( "rawvid-fps", 0, 0, FPS_TEXT, FPS_LONGTEXT, false ); - add_integer( "rawvid-width", 0, 0, WIDTH_TEXT, WIDTH_LONGTEXT, 0 ); - add_integer( "rawvid-height", 0, 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, 0 ); +vlc_module_begin () + set_shortname( "Raw Video" ) + set_description( N_("Raw video demuxer") ) + set_capability( "demux", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_callbacks( Open, Close ) + add_shortcut( "rawvideo" ) + add_float( "rawvid-fps", 0, 0, FPS_TEXT, FPS_LONGTEXT, false ) + add_integer( "rawvid-width", 0, 0, WIDTH_TEXT, WIDTH_LONGTEXT, 0 ) + add_integer( "rawvid-height", 0, 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, 0 ) add_string( "rawvid-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ); add_string( "rawvid-aspect-ratio", NULL, NULL, ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ); -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Definitions of structures used by this plugin diff --git a/modules/demux/real.c b/modules/demux/real.c index 571b6f85b9..f3eb09408b 100644 --- a/modules/demux/real.c +++ b/modules/demux/real.c @@ -64,15 +64,15 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("Real demuxer" ) ); - set_capability( "demux", 0 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_callbacks( Open, Close ); - add_shortcut( "real" ); - add_shortcut( "rm" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Real demuxer" ) ) + set_capability( "demux", 0 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_callbacks( Open, Close ) + add_shortcut( "real" ) + add_shortcut( "rm" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/rtp.c b/modules/demux/rtp.c index 5978918c09..86d3d96dac 100644 --- a/modules/demux/rtp.c +++ b/modules/demux/rtp.c @@ -78,39 +78,39 @@ static void Close (vlc_object_t *); /* * Module descriptor */ -vlc_module_begin (); - set_shortname (_("RTP")); - set_description (_("(Experimental) Real-Time Protocol demuxer")); - set_category (CAT_INPUT); - set_subcategory (SUBCAT_INPUT_DEMUX); - set_capability ("access_demux", 0); - set_callbacks (Open, Close); +vlc_module_begin () + set_shortname (_("RTP")) + set_description (_("(Experimental) Real-Time Protocol demuxer")) + set_category (CAT_INPUT) + set_subcategory (SUBCAT_INPUT_DEMUX) + set_capability ("access_demux", 0) + set_callbacks (Open, Close) add_integer ("rtp-caching", 1000, NULL, RTP_CACHING_TEXT, RTP_CACHING_LONGTEXT, true); - change_integer_range (0, 65535); + change_integer_range (0, 65535) add_string ("srtp-key", "", NULL, SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false); add_string ("srtp-salt", "", NULL, SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false); add_integer ("rtp-max-src", 1, NULL, RTP_MAX_SRC_TEXT, RTP_MAX_SRC_LONGTEXT, true); - change_integer_range (1, 255); + change_integer_range (1, 255) add_integer ("rtp-timeout", 5, NULL, RTP_TIMEOUT_TEXT, RTP_TIMEOUT_LONGTEXT, true); add_integer ("rtp-max-dropout", 3000, NULL, RTP_MAX_DROPOUT_TEXT, RTP_MAX_DROPOUT_LONGTEXT, true); - change_integer_range (0, 32767); + change_integer_range (0, 32767) add_integer ("rtp-max-misorder", 100, NULL, RTP_MAX_MISORDER_TEXT, RTP_MAX_MISORDER_LONGTEXT, true); - change_integer_range (0, 32767); - - add_shortcut ("dccp"); - /*add_shortcut ("sctp");*/ - add_shortcut ("rtptcp"); /* "tcp" is already taken :( */ - add_shortcut ("rtp"); - add_shortcut ("udplite"); -vlc_module_end (); + change_integer_range (0, 32767) + + add_shortcut ("dccp") + /*add_shortcut ("sctp")*/ + add_shortcut ("rtptcp") /* "tcp" is already taken :( */ + add_shortcut ("rtp") + add_shortcut ("udplite") +vlc_module_end () /* * TODO: so much stuff diff --git a/modules/demux/smf.c b/modules/demux/smf.c index 2785cec366..ec02487ead 100644 --- a/modules/demux/smf.c +++ b/modules/demux/smf.c @@ -39,13 +39,13 @@ static int Open (vlc_object_t *); static void Close (vlc_object_t *); -vlc_module_begin (); - set_description (N_("SMF demuxer")); - set_category (CAT_INPUT); - set_subcategory (SUBCAT_INPUT_DEMUX); - set_capability ("demux", 20); - set_callbacks (Open, Close); -vlc_module_end (); +vlc_module_begin () + set_description (N_("SMF demuxer")) + set_category (CAT_INPUT) + set_subcategory (SUBCAT_INPUT_DEMUX) + set_capability ("demux", 20) + set_callbacks (Open, Close) +vlc_module_end () static int Demux (demux_t *); static int Control (demux_t *, int i_query, va_list args); diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 7b2009446d..87a914c2dd 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -70,12 +70,12 @@ static const char *const ppsz_sub_type[] = "subviewer1" }; -vlc_module_begin(); - set_shortname( N_("Subtitles")); - set_description( N_("Text subtitles parser") ); - set_capability( "demux", 0 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); +vlc_module_begin () + set_shortname( N_("Subtitles")) + set_description( N_("Text subtitles parser") ) + set_capability( "demux", 0 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) add_float( "sub-fps", 0.0, NULL, N_("Frames per second"), SUB_FPS_LONGTEXT, true ); @@ -85,10 +85,10 @@ vlc_module_begin(); add_string( "sub-type", "auto", NULL, N_("Subtitles format"), SUB_TYPE_LONGTEXT, true ); change_string_list( ppsz_sub_type, NULL, NULL ); - set_callbacks( Open, Close ); + set_callbacks( Open, Close ) - add_shortcut( "subtitle" ); -vlc_module_end(); + add_shortcut( "subtitle" ) +vlc_module_end () /***************************************************************************** * Prototypes: diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c index 53899e1dd0..9c499e3f3f 100644 --- a/modules/demux/subtitle_asa.c +++ b/modules/demux/subtitle_asa.c @@ -60,12 +60,12 @@ static void Close( vlc_object_t *p_this ); #define SUB_TYPE_LONGTEXT \ N_("Force the subtiles format. Use \"auto\", the set of supported values varies.") -vlc_module_begin(); - set_shortname( N_("Subtitles (asa demuxer)")); - set_description( N_("Text subtitles parser") ); - set_capability( "demux", 50 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); +vlc_module_begin () + set_shortname( N_("Subtitles (asa demuxer)")) + set_description( N_("Text subtitles parser") ) + set_capability( "demux", 50 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) add_float( "sub-fps", 0.0, NULL, N_("Frames per second"), SUB_FPS_LONGTEXT, true ); @@ -74,10 +74,10 @@ vlc_module_begin(); SUB_DELAY_LONGTEXT, true ); add_string( "sub-type", "auto", NULL, N_("Subtitles format"), SUB_TYPE_LONGTEXT, true ); - set_callbacks( Open, Close ); + set_callbacks( Open, Close ) - add_shortcut( "asademux" ); -vlc_module_end(); + add_shortcut( "asademux" ) +vlc_module_end () /***************************************************************************** * Prototypes: diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 862ccd6f39..7394db2831 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -155,31 +155,31 @@ static void Close ( vlc_object_t * ); "Tweak the buffer size for reading and writing an integer number of packets." \ "Specify the size of the buffer here and not the number of packets." ) -vlc_module_begin(); - set_description( N_("MPEG Transport Stream demuxer") ); - set_shortname ( "MPEG-TS" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - - add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, true ); - add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, true ); - add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true ); +vlc_module_begin () + set_description( N_("MPEG Transport Stream demuxer") ) + set_shortname ( "MPEG-TS" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + + add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, true ) + add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, true ) + add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true ) add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT, MTUOUT_LONGTEXT, true ); - add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ); - add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ); - add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ); - add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, true ); + add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ) + add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ) + add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ) + add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, true ) - add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false ); - add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ); + add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false ) + add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ) add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, DUMPSIZE_LONGTEXT, true ); - set_capability( "demux", 10 ); - set_callbacks( Open, Close ); - add_shortcut( "ts" ); -vlc_module_end(); + set_capability( "demux", 10 ) + set_callbacks( Open, Close ) + add_shortcut( "ts" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/tta.c b/modules/demux/tta.c index eca6ac5fba..3f295c92ea 100644 --- a/modules/demux/tta.c +++ b/modules/demux/tta.c @@ -40,16 +40,16 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_shortname( "TTA" ); - set_description( N_("TTA demuxer") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 145 ); - - set_callbacks( Open, Close ); - add_shortcut( "tta" ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "TTA" ) + set_description( N_("TTA demuxer") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 145 ) + + set_callbacks( Open, Close ) + add_shortcut( "tta" ) +vlc_module_end () #define TTA_FRAMETIME 1.04489795918367346939 diff --git a/modules/demux/ty.c b/modules/demux/ty.c index 11511b4ff9..a4db231772 100644 --- a/modules/demux/ty.c +++ b/modules/demux/ty.c @@ -55,20 +55,20 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname( N_("TY") ); - set_description(N_("TY Stream audio/video demux")); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability("demux", 6); +vlc_module_begin () + set_shortname( N_("TY") ) + set_description(N_("TY Stream audio/video demux")) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability("demux", 6) /* FIXME: there seems to be a segfault when using PVR access * and TY demux has a bigger priority than PS * Something must be wrong. */ - set_callbacks( Open, Close ); - add_shortcut("ty"); - add_shortcut("tivo"); -vlc_module_end(); + set_callbacks( Open, Close ) + add_shortcut("ty") + add_shortcut("tivo") +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/vc1.c b/modules/demux/vc1.c index 31f78c1767..99b8f934e0 100644 --- a/modules/demux/vc1.c +++ b/modules/demux/vc1.c @@ -43,16 +43,16 @@ static void Close( vlc_object_t * ); #define FPS_TEXT N_("Frames per Second") #define FPS_LONGTEXT N_("Desired frame rate for the VC-1 stream.") -vlc_module_begin(); - set_shortname( "VC-1"); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("VC1 video demuxer" ) ); - set_capability( "demux", 0 ); - add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ); - set_callbacks( Open, Close ); - add_shortcut( "vc1" ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "VC-1") + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("VC1 video demuxer" ) ) + set_capability( "demux", 0 ) + add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) + set_callbacks( Open, Close ) + add_shortcut( "vc1" ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c index fe9cf2782d..b3a460d588 100644 --- a/modules/demux/vobsub.c +++ b/modules/demux/vobsub.c @@ -48,17 +48,17 @@ static int Open ( vlc_object_t *p_this ); static void Close( vlc_object_t *p_this ); -vlc_module_begin(); - set_description( N_("Vobsub subtitles parser") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 1 ); +vlc_module_begin () + set_description( N_("Vobsub subtitles parser") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 1 ) - set_callbacks( Open, Close ); + set_callbacks( Open, Close ) - add_shortcut( "vobsub" ); - add_shortcut( "subtitle" ); -vlc_module_end(); + add_shortcut( "vobsub" ) + add_shortcut( "subtitle" ) +vlc_module_end () /***************************************************************************** * Prototypes: diff --git a/modules/demux/voc.c b/modules/demux/voc.c index e6c9356759..13d86d1b28 100644 --- a/modules/demux/voc.c +++ b/modules/demux/voc.c @@ -42,13 +42,13 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("VOC demuxer") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 10 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("VOC demuxer") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 10 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/wav.c b/modules/demux/wav.c index c300c7b403..be7f848baf 100644 --- a/modules/demux/wav.c +++ b/modules/demux/wav.c @@ -41,13 +41,13 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("WAV demuxer") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 142 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("WAV demuxer") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 142 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/demux/xa.c b/modules/demux/xa.c index b98a78ed8f..65a3f2eca9 100644 --- a/modules/demux/xa.c +++ b/modules/demux/xa.c @@ -41,13 +41,13 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("XA demuxer") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 10 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("XA demuxer") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 10 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes diff --git a/modules/gui/beos/BeOS.cpp b/modules/gui/beos/BeOS.cpp index c1dc7e84b1..337e85bae0 100644 --- a/modules/gui/beos/BeOS.cpp +++ b/modules/gui/beos/BeOS.cpp @@ -49,19 +49,19 @@ void CloseVideo ( vlc_object_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); - add_bool( "beos-dvdmenus", 0, NULL, _("Use DVD Menus"), "", true ); - set_shortname( "BeOS" ); - set_description( N_("BeOS standard API interface") ); - set_capability( "interface", 100 ); - set_callbacks( OpenIntf, CloseIntf ); +vlc_module_begin () + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) + add_bool( "beos-dvdmenus", 0, NULL, _("Use DVD Menus"), "", true ) + set_shortname( "BeOS" ) + set_description( N_("BeOS standard API interface") ) + set_capability( "interface", 100 ) + set_callbacks( OpenIntf, CloseIntf ) - add_submodule(); - set_capability( "video output", 100 ); - set_callbacks( OpenVideo, CloseVideo ); - add_submodule(); - set_capability( "audio output", 100 ); - set_callbacks( OpenAudio, CloseAudio ); -vlc_module_end(); + add_submodule () + set_capability( "video output", 100 ) + set_callbacks( OpenVideo, CloseVideo ) + add_submodule () + set_capability( "audio output", 100 ) + set_callbacks( OpenAudio, CloseAudio ) +vlc_module_end () diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c index 2ac42b6d26..c91a1f2039 100644 --- a/modules/gui/fbosd.c +++ b/modules/gui/fbosd.c @@ -174,10 +174,10 @@ static const char *const ppsz_color_descriptions[] = { N_("Teal"), N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"), N_("Aqua") }; -vlc_module_begin(); - set_shortname( "fbosd" ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); +vlc_module_begin () + set_shortname( "fbosd" ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) add_file( "fbosd-dev", "/dev/fb1", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, false ); @@ -192,15 +192,15 @@ vlc_module_begin(); add_integer_with_range( "fbosd-alpha", 255, 0, 255, NULL, ALPHA_TEXT, ALPHA_LONGTEXT, true ); - set_section( N_("Position"), NULL ); + set_section( N_("Position"), NULL ) add_integer( "fbosd-x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, false ); add_integer( "fbosd-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, false ); - add_integer( "fbosd-position", 8, NULL, POS_TEXT, POS_LONGTEXT, true ); + add_integer( "fbosd-position", 8, NULL, POS_TEXT, POS_LONGTEXT, true ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); - set_section( N_("Font"), NULL ); + set_section( N_("Font"), NULL ) add_integer_with_range( "fbosd-font-opacity", 255, 0, 255, NULL, OPACITY_TEXT, OPACITY_LONGTEXT, false ); add_integer( "fbosd-font-color", 0x00FFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, @@ -209,15 +209,15 @@ vlc_module_begin(); add_integer( "fbosd-font-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, false ); - set_section( N_("Commands"), NULL ); - add_bool( "fbosd-clear", false, NULL, CLEAR_TEXT, CLEAR_LONGTEXT, true ); - add_bool( "fbosd-render", false, NULL, RENDER_TEXT, RENDER_LONGTEXT, true ); - add_bool( "fbosd-display", false, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true ); + set_section( N_("Commands"), NULL ) + add_bool( "fbosd-clear", false, NULL, CLEAR_TEXT, CLEAR_LONGTEXT, true ) + add_bool( "fbosd-render", false, NULL, RENDER_TEXT, RENDER_LONGTEXT, true ) + add_bool( "fbosd-display", false, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true ) - set_description( N_("GNU/Linux osd/overlay framebuffer interface") ); - set_capability( "interface", 10 ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + set_description( N_("GNU/Linux osd/overlay framebuffer interface") ) + set_capability( "interface", 10 ) + set_callbacks( Create, Destroy ) +vlc_module_end () /***************************************************************************** * fbosd_render_t: render descriptor diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index 9d4404dcb0..e7810c5446 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -87,12 +87,12 @@ void CloseVideoGL ( vlc_object_t * ); #define EQ_KEEP_LONGTEXT N_("By default, VLC keeps the last equalizer settings before " \ "termination. This feature can be disabled here.") -vlc_module_begin(); - set_description( N_("Mac OS X interface") ); - set_capability( "interface", 200 ); - set_callbacks( OpenIntf, CloseIntf ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); +vlc_module_begin () + set_description( N_("Mac OS X interface") ) + set_capability( "interface", 200 ) + set_callbacks( OpenIntf, CloseIntf ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) add_bool( "macosx-autoplay", 1, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT, false ); add_bool( "macosx-recentitems", 1, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT, @@ -102,12 +102,12 @@ vlc_module_begin(); add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT, false ); - add_submodule(); - set_description( "Mac OS X OpenGL" ); - set_capability( "opengl provider", 100 ); - set_category( CAT_VIDEO); - set_subcategory( SUBCAT_VIDEO_VOUT ); - set_callbacks( OpenVideoGL, CloseVideoGL ); + add_submodule () + set_description( "Mac OS X OpenGL" ) + set_capability( "opengl provider", 100 ) + set_category( CAT_VIDEO) + set_subcategory( SUBCAT_VIDEO_VOUT ) + set_callbacks( OpenVideoGL, CloseVideoGL ) add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT, false ); @@ -119,5 +119,5 @@ vlc_module_begin(); false ); add_bool( "macosx-background", 0, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () diff --git a/modules/gui/minimal_macosx/macosx.c b/modules/gui/minimal_macosx/macosx.c index 4319b1a615..49cd6b1806 100644 --- a/modules/gui/minimal_macosx/macosx.c +++ b/modules/gui/minimal_macosx/macosx.c @@ -50,23 +50,23 @@ void CloseVideoGL ( vlc_object_t * ); * Module descriptor *****************************************************************************/ -vlc_module_begin(); +vlc_module_begin () /* Minimal interface. see intf.m */ - set_shortname( "Minimal Macosx" ); - add_shortcut( "minimal_macosx" ); - add_shortcut( "miosx" ); - set_description( N_("Minimal Mac OS X interface") ); - set_capability( "interface", 50 ); - set_callbacks( OpenIntf, CloseIntf ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); + set_shortname( "Minimal Macosx" ) + add_shortcut( "minimal_macosx" ) + add_shortcut( "miosx" ) + set_description( N_("Minimal Mac OS X interface") ) + set_capability( "interface", 50 ) + set_callbacks( OpenIntf, CloseIntf ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) - add_submodule(); + add_submodule () /* Will be loaded even without interface module. see voutgl.m */ - set_description( N_("Minimal Mac OS X OpenGL video output (opens a borderless window)") ); - set_capability( "opengl provider", 50 ); - set_category( CAT_VIDEO); - set_subcategory( SUBCAT_VIDEO_VOUT ); - set_callbacks( OpenVideoGL, CloseVideoGL ); -vlc_module_end(); + set_description( N_("Minimal Mac OS X OpenGL video output (opens a borderless window)") ) + set_capability( "opengl provider", 50 ) + set_category( CAT_VIDEO) + set_subcategory( SUBCAT_VIDEO_VOUT ) + set_callbacks( OpenVideoGL, CloseVideoGL ) +vlc_module_end () diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index c09377ed06..48c3b18d30 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -121,16 +121,16 @@ static void start_color_and_pairs ( intf_thread_t * ); "This option allows you to specify the directory the ncurses filebrowser " \ "will show you initially.") -vlc_module_begin(); - set_shortname( "Ncurses" ); - set_description( N_("Ncurses interface") ); - set_capability( "interface", 10 ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); - set_callbacks( Open, Close ); - add_shortcut( "curses" ); - add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "Ncurses" ) + set_description( N_("Ncurses interface") ) + set_capability( "interface", 10 ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) + set_callbacks( Open, Close ) + add_shortcut( "curses" ) + add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false ) +vlc_module_end () /***************************************************************************** * intf_sys_t: description and status of ncurses interface diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c index e5eecb07a2..e26f802ac5 100644 --- a/modules/gui/pda/pda.c +++ b/modules/gui/pda/pda.c @@ -66,15 +66,15 @@ gint GtkModeManage ( intf_thread_t * p_intf ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("PDA Linux Gtk2+ interface") ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); -// add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, true ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); - add_shortcut( "pda" ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("PDA Linux Gtk2+ interface") ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) +// add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, true ) + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) + add_shortcut( "pda" ) +vlc_module_end () /***************************************************************************** * Open: initialize and create window diff --git a/modules/gui/pda/pda_support.c b/modules/gui/pda/pda_support.c index 36b73e8a0b..4526c9c520 100644 --- a/modules/gui/pda/pda_support.c +++ b/modules/gui/pda/pda_support.c @@ -136,7 +136,7 @@ glade_set_atk_action_description (AtkAction *action, for (i = 0; i < n_actions; i++) { if (!strcmp (atk_action_get_name (action, i), action_name)) - atk_action_set_description (action, i, description); + atk_action_set_description (action, i, description) } } diff --git a/modules/gui/qnx/qnx.c b/modules/gui/qnx/qnx.c index e07fb40cde..1de9e95f30 100644 --- a/modules/gui/qnx/qnx.c +++ b/modules/gui/qnx/qnx.c @@ -43,14 +43,14 @@ void CloseVideo ( vlc_object_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("QNX RTOS video and audio output") ); - set_capability( "video output", 100 ); - set_callbacks( OpenVideo, CloseVideo ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); - add_submodule(); - set_capability( "audio output", 100 ); - set_callbacks( OpenAudio, CloseAudio ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("QNX RTOS video and audio output") ) + set_capability( "video output", 100 ) + set_callbacks( OpenVideo, CloseVideo ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) + add_submodule () + set_capability( "audio output", 100 ) + set_callbacks( OpenAudio, CloseAudio ) +vlc_module_end () diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 4308ab4641..2dc829331d 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -155,15 +155,15 @@ static const int i_mode_list[] = static const char *const psz_mode_list_text[] = { QT_NORMAL_MODE_TEXT, QT_ALWAYS_VIDEO_MODE_TEXT, QT_MINIMAL_MODE_TEXT }; -vlc_module_begin(); - set_shortname( "Qt" ); - set_description( N_("Qt interface") ); - set_category( CAT_INTERFACE ) ; - set_subcategory( SUBCAT_INTERFACE_MAIN ); - set_capability( "interface", 151 ); - set_callbacks( Open, Close ); - - add_shortcut("qt"); +vlc_module_begin () + set_shortname( "Qt" ) + set_description( N_("Qt interface") ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) + set_capability( "interface", 151 ) + set_callbacks( Open, Close ) + + add_shortcut("qt") add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL, QT_MODE_TEXT, QT_MODE_LONGTEXT, false ); change_integer_list( i_mode_list, psz_mode_list_text, NULL ); @@ -173,7 +173,7 @@ vlc_module_begin(); add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT, OPACITY_LONGTEXT, false ); - add_bool( "qt-blingbling", true, NULL, BLING_TEXT, BLING_TEXT, false ); + add_bool( "qt-blingbling", true, NULL, BLING_TEXT, BLING_TEXT, false ) add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT, SYSTRAY_LONGTEXT, false); @@ -190,8 +190,8 @@ vlc_module_begin(); SAVEVOL_TEXT, true ); add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT, FILEDIALOG_PATH_TEXT, true ); - change_autosave(); - change_internal(); + change_autosave () + change_internal () add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT, RECENTPLAY_TEXT, false ); @@ -216,18 +216,18 @@ vlc_module_begin(); add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT, false ); - change_internal(); + change_internal () - add_submodule(); - set_description( "Dialogs provider" ); - set_capability( "dialogs provider", 51 ); + add_submodule () + set_description( "Dialogs provider" ) + set_capability( "dialogs provider", 51 ) - set_callbacks( OpenDialogs, Close ); + set_callbacks( OpenDialogs, Close ) - add_submodule(); - set_capability( "vout window", 50 ); - set_callbacks( WindowOpen, WindowClose ); -vlc_module_end(); + add_submodule () + set_capability( "vout window", 50 ) + set_callbacks( WindowOpen, WindowClose ) +vlc_module_end () /* Ugly, but the Qt4 interface assumes single instance anyway */ static struct diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index e2857a3027..6878aead7f 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -462,16 +462,16 @@ static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable, #define SKINS2_PLAYLIST N_("Use a skinned playlist") #define SKINS2_PLAYLIST_LONG N_("Use a skinned playlist") -vlc_module_begin(); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); +vlc_module_begin () + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) add_file( "skins2-last", "", NULL, SKINS2_LAST, SKINS2_LAST_LONG, true ); - change_autosave(); + change_autosave () add_string( "skins2-config", "", NULL, SKINS2_CONFIG, SKINS2_CONFIG_LONG, true ); - change_autosave(); - change_internal(); + change_autosave () + change_internal () #ifdef WIN32 add_bool( "skins2-systray", false, onSystrayChange, SKINS2_SYSTRAY, SKINS2_SYSTRAY_LONG, false ); @@ -483,19 +483,19 @@ vlc_module_begin(); add_bool( "skinned-playlist", true, NULL, SKINS2_PLAYLIST, SKINS2_PLAYLIST_LONG, false ); - set_shortname( N_("Skins")); - set_description( N_("Skinnable Interface") ); - set_capability( "interface", 30 ); - set_callbacks( Open, Close ); - add_shortcut( "skins" ); - - add_submodule(); - set_capability( "vout window", 51 ); - set_callbacks( WindowOpen, WindowClose ); - - add_submodule(); - set_description( N_("Skins loader demux") ); - set_capability( "demux", 5 ); - set_callbacks( DemuxOpen, NULL ); - -vlc_module_end(); + set_shortname( N_("Skins")) + set_description( N_("Skinnable Interface") ) + set_capability( "interface", 30 ) + set_callbacks( Open, Close ) + add_shortcut( "skins" ) + + add_submodule () + set_capability( "vout window", 51 ) + set_callbacks( WindowOpen, WindowClose ) + + add_submodule () + set_description( N_("Skins loader demux") ) + set_capability( "demux", 5 ) + set_callbacks( DemuxOpen, NULL ) + +vlc_module_end () diff --git a/modules/gui/wince/wince.cpp b/modules/gui/wince/wince.cpp index 6886933376..bcc12b97b8 100644 --- a/modules/gui/wince/wince.cpp +++ b/modules/gui/wince/wince.cpp @@ -62,23 +62,23 @@ static void ShowDialog( intf_thread_t *, int, int, intf_dialog_args_t * ); #define EMBED_LONGTEXT N_("Embed the video inside the interface instead " \ "of having it in a separate window.") -vlc_module_begin(); - set_shortname( "WinCE" ); - set_description( (char *) _("WinCE interface module") ); - set_capability( "interface", 100 ); - set_callbacks( Open, Close ); - add_shortcut( "wince" ); - - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); +vlc_module_begin () + set_shortname( "WinCE" ) + set_description( (char *) _("WinCE interface module") ) + set_capability( "interface", 100 ) + set_callbacks( Open, Close ) + add_shortcut( "wince" ) + + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) add_bool( "wince-embed", 1, NULL, EMBED_TEXT, EMBED_LONGTEXT, false ); - add_submodule(); - set_description( N_("WinCE dialogs provider") ); - set_capability( "dialogs provider", 10 ); - set_callbacks( OpenDialogs, Close ); -vlc_module_end(); + add_submodule () + set_description( N_("WinCE dialogs provider") ) + set_capability( "dialogs provider", 10 ) + set_callbacks( OpenDialogs, Close ) +vlc_module_end () HINSTANCE hInstance = 0; diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp index cf65e0a009..09aaccd5a3 100644 --- a/modules/gui/wxwidgets/wxwidgets.cpp +++ b/modules/gui/wxwidgets/wxwidgets.cpp @@ -116,35 +116,35 @@ static const int pi_playlist_views[] = { 0,1,2 }; static const char *const psz_playlist_views[] = { N_("Normal" ), N_("Embedded" ), N_("Both") }; -vlc_module_begin(); - set_shortname( "wxWidgets" ); - set_description( N_("wxWidgets interface module") ); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_MAIN ); - set_capability( "interface", 150 ); - set_callbacks( Open, Close ); - add_shortcut( "wxwindows" ); - add_shortcut( "wxwin" ); - add_shortcut( "wx" ); - add_shortcut( "wxwidgets" ); +vlc_module_begin () + set_shortname( "wxWidgets" ) + set_description( N_("wxWidgets interface module") ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_MAIN ) + set_capability( "interface", 150 ) + set_callbacks( Open, Close ) + add_shortcut( "wxwindows" ) + add_shortcut( "wxwin" ) + add_shortcut( "wx" ) + add_shortcut( "wxwidgets" ) add_bool( "wx-embed", 1, NULL, EMBED_TEXT, EMBED_LONGTEXT, false ); - add_deprecated_alias( "wxwin-enbed" ); /*Deprecated since 0.8.4*/ + add_deprecated_alias( "wxwin-enbed" ) /*Deprecated since 0.8.4*/ add_bool( "wx-bookmarks", 0, NULL, BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, false ); - add_deprecated_alias( "wxwin-bookmarks" ); /*Deprecated since 0.8.4*/ + add_deprecated_alias( "wxwin-bookmarks" ) /*Deprecated since 0.8.4*/ add_bool( "wx-taskbar", 1, NULL, TASKBAR_TEXT, TASKBAR_LONGTEXT, false ); - add_deprecated_alias( "wxwin-taskbar" ); /*Deprecated since 0.8.4*/ + add_deprecated_alias( "wxwin-taskbar" ) /*Deprecated since 0.8.4*/ add_bool( "wx-extended", 0, NULL, EXTENDED_TEXT, EXTENDED_LONGTEXT, false ); add_bool( "wx-minimal", 0, NULL, MINIMAL_TEXT, MINIMAL_LONGTEXT, true ); - add_deprecated_alias( "wxwin-minimal" ); /*Deprecated since 0.8.4*/ + add_deprecated_alias( "wxwin-minimal" ) /*Deprecated since 0.8.4*/ add_bool( "wx-autosize", 1, NULL, SIZE_TO_VIDEO_TEXT, SIZE_TO_VIDEO_LONGTEXT, true ); - add_deprecated_alias( "wxwin-autosize" ); /*Deprecated since 0.8.4*/ + add_deprecated_alias( "wxwin-autosize" ) /*Deprecated since 0.8.4*/ add_integer( "wx-playlist-view", 0, NULL, PLAYLIST_TEXT, PLAYLIST_LONGTEXT, false ); change_integer_list( pi_playlist_views, psz_playlist_views, NULL ); @@ -153,25 +153,25 @@ vlc_module_begin(); #ifdef wxHAS_TASK_BAR_ICON add_bool( "wx-systray", 0, NULL, SYSTRAY_TEXT, SYSTRAY_LONGTEXT, false ); - add_deprecated_alias( "wxwin-systray" ); /*Deprecated since 0.8.4*/ + add_deprecated_alias( "wxwin-systray" ) /*Deprecated since 0.8.4*/ #endif #endif - add_bool( "wx-labels", 0, NULL, LABEL_TEXT, LABEL_LONGTEXT, true); + add_bool( "wx-labels", 0, NULL, LABEL_TEXT, LABEL_LONGTEXT, true) add_string( "wx-config-last", NULL, NULL, N_("last config"), N_("last config"), true ); - change_autosave(); - change_internal(); - add_deprecated_alias( "wxwin-config-last" ); /*Deprecated since 0.8.4*/ + change_autosave () + change_internal () + add_deprecated_alias( "wxwin-config-last" ) /*Deprecated since 0.8.4*/ - add_submodule(); - set_description( N_("wxWidgets dialogs provider") ); - set_capability( "dialogs provider", 50 ); - set_callbacks( OpenDialogs, Close ); + add_submodule () + set_description( N_("wxWidgets dialogs provider") ) + set_capability( "dialogs provider", 50 ) + set_callbacks( OpenDialogs, Close ) #if !defined(WIN32) - linked_with_a_crap_library_which_uses_atexit(); + linked_with_a_crap_library_which_uses_atexit () #endif -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Open: initialize and create window diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c index e6493e0e2e..36e5ae302d 100644 --- a/modules/meta_engine/folder.c +++ b/modules/meta_engine/folder.c @@ -54,13 +54,13 @@ static int FindMeta( vlc_object_t * ); * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( N_( "Folder" ) ); - set_description( N_("Folder meta data") ); +vlc_module_begin () + set_shortname( N_( "Folder" ) ) + set_description( N_("Folder meta data") ) - set_capability( "art finder", 90 ); - set_callbacks( FindMeta, NULL ); -vlc_module_end(); + set_capability( "art finder", 90 ) + set_callbacks( FindMeta, NULL ) +vlc_module_end () /***************************************************************************** *****************************************************************************/ diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c index 45d33fc048..fd0210160c 100644 --- a/modules/meta_engine/id3tag.c +++ b/modules/meta_engine/id3tag.c @@ -53,11 +53,11 @@ static int ParseTags ( vlc_object_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("ID3v1/2 and APEv1/2 tags parser" ) ); - set_capability( "meta reader", 70 ); - set_callbacks( ParseTags, NULL ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("ID3v1/2 and APEv1/2 tags parser" ) ) + set_capability( "meta reader", 70 ) + set_callbacks( ParseTags, NULL ) +vlc_module_end () /***************************************************************************** * ParseID3Tag : parse an id3tag into the info structures diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index e08f5e7f5f..21b9ae33be 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -62,16 +62,16 @@ static int ReadMeta ( vlc_object_t * ); static int DownloadArt ( vlc_object_t * ); static int WriteMeta ( vlc_object_t * ); -vlc_module_begin(); - set_capability( "meta reader", 1000 ); - set_callbacks( ReadMeta, NULL ); - add_submodule(); - set_capability( "art downloader", 50 ); - set_callbacks( DownloadArt, NULL ); - add_submodule(); - set_capability( "meta writer", 50 ); - set_callbacks( WriteMeta, NULL ); -vlc_module_end(); +vlc_module_begin () + set_capability( "meta reader", 1000 ) + set_callbacks( ReadMeta, NULL ) + add_submodule () + set_capability( "art downloader", 50 ) + set_callbacks( DownloadArt, NULL ) + add_submodule () + set_capability( "meta writer", 50 ) + set_callbacks( WriteMeta, NULL ) +vlc_module_end () using namespace TagLib; diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c index d464118cf3..ae4c1e6c2f 100644 --- a/modules/misc/audioscrobbler.c +++ b/modules/misc/audioscrobbler.c @@ -154,18 +154,18 @@ static void HandleInterval ( mtime_t *, unsigned int * ); "%s\r\n" \ "\r\n" -vlc_module_begin(); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); - set_shortname( N_( "Audioscrobbler" ) ); - set_description( N_("Submission of played songs to last.fm") ); +vlc_module_begin () + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) + set_shortname( N_( "Audioscrobbler" ) ) + set_description( N_("Submission of played songs to last.fm") ) add_string( "lastfm-username", "", NULL, USERNAME_TEXT, USERNAME_LONGTEXT, false ); add_password( "lastfm-password", "", NULL, PASSWORD_TEXT, PASSWORD_LONGTEXT, false ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: initialize and create stuff diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c index 2bad913733..fdaf8df89b 100644 --- a/modules/misc/dummy/dummy.c +++ b/modules/misc/dummy/dummy.c @@ -57,55 +57,55 @@ "open." ) #endif -vlc_module_begin(); - set_shortname( N_("Dummy")); - set_description( N_("Dummy interface function") ); - set_capability( "interface", 0 ); - add_shortcut( "vlc" ); - set_callbacks( OpenIntf, NULL ); +vlc_module_begin () + set_shortname( N_("Dummy")) + set_description( N_("Dummy interface function") ) + set_capability( "interface", 0 ) + add_shortcut( "vlc" ) + set_callbacks( OpenIntf, NULL ) #ifdef WIN32 - set_section( N_( "Dummy Interface" ), NULL ); - add_category_hint( N_("Interface"), NULL, false ); - add_bool( "dummy-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ); + set_section( N_( "Dummy Interface" ), NULL ) + add_category_hint( N_("Interface"), NULL, false ) + add_bool( "dummy-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ) #endif - add_submodule(); - set_description( N_("Dummy access function") ); - set_capability( "access", 0 ); - set_callbacks( OpenAccess, NULL ); - add_submodule(); - set_description( N_("Dummy demux function") ); - set_capability( "demux", 0 ); - set_callbacks( OpenDemux, CloseDemux ); - add_submodule(); - set_section( N_( "Dummy decoder" ), NULL ); - set_description( N_("Dummy decoder function") ); - set_capability( "decoder", 0 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_bool( "dummy-save-es", 0, NULL, SAVE_TEXT, SAVE_LONGTEXT, true ); - add_submodule(); - set_section( N_( "Dump decoder" ), NULL ); - set_description( N_("Dump decoder function") ); - set_capability( "decoder", -1 ); - set_callbacks( OpenDecoderDump, CloseDecoder ); - add_shortcut( "dump" ); - add_submodule(); - set_description( N_("Dummy encoder function") ); - set_capability( "encoder", 0 ); - set_callbacks( OpenEncoder, CloseEncoder ); - add_submodule(); - set_description( N_("Dummy audio output function") ); - set_capability( "audio output", 1 ); - set_callbacks( OpenAudio, NULL ); - add_submodule(); - set_description( N_("Dummy video output function") ); - set_section( N_( "Dummy Video output" ), NULL ); - set_capability( "video output", 1 ); - set_callbacks( OpenVideo, NULL ); - add_category_hint( N_("Video"), NULL, false ); - add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ); - add_submodule(); - set_description( N_("Dummy font renderer function") ); - set_capability( "text renderer", 1 ); - set_callbacks( OpenRenderer, NULL ); -vlc_module_end(); + add_submodule () + set_description( N_("Dummy access function") ) + set_capability( "access", 0 ) + set_callbacks( OpenAccess, NULL ) + add_submodule () + set_description( N_("Dummy demux function") ) + set_capability( "demux", 0 ) + set_callbacks( OpenDemux, CloseDemux ) + add_submodule () + set_section( N_( "Dummy decoder" ), NULL ) + set_description( N_("Dummy decoder function") ) + set_capability( "decoder", 0 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_bool( "dummy-save-es", 0, NULL, SAVE_TEXT, SAVE_LONGTEXT, true ) + add_submodule () + set_section( N_( "Dump decoder" ), NULL ) + set_description( N_("Dump decoder function") ) + set_capability( "decoder", -1 ) + set_callbacks( OpenDecoderDump, CloseDecoder ) + add_shortcut( "dump" ) + add_submodule () + set_description( N_("Dummy encoder function") ) + set_capability( "encoder", 0 ) + set_callbacks( OpenEncoder, CloseEncoder ) + add_submodule () + set_description( N_("Dummy audio output function") ) + set_capability( "audio output", 1 ) + set_callbacks( OpenAudio, NULL ) + add_submodule () + set_description( N_("Dummy video output function") ) + set_section( N_( "Dummy Video output" ), NULL ) + set_capability( "video output", 1 ) + set_callbacks( OpenVideo, NULL ) + add_category_hint( N_("Video"), NULL, false ) + add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ) + add_submodule () + set_description( N_("Dummy font renderer function") ) + set_capability( "text renderer", 1 ) + set_callbacks( OpenRenderer, NULL ) +vlc_module_end () diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c index e65baeffac..2f36f99eb0 100644 --- a/modules/misc/freetype.c +++ b/modules/misc/freetype.c @@ -130,11 +130,11 @@ static const char *const ppsz_color_descriptions[] = { N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"), N_("Teal"), N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"), N_("Aqua") }; -vlc_module_begin(); - set_shortname( N_("Text renderer")); - set_description( N_("Freetype2 font renderer") ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_SUBPIC ); +vlc_module_begin () + set_shortname( N_("Text renderer")) + set_description( N_("Freetype2 font renderer") ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_SUBPIC ) add_file( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT, false ); @@ -160,10 +160,10 @@ vlc_module_begin(); add_bool( "freetype-yuvp", 0, NULL, YUVP_TEXT, YUVP_LONGTEXT, true ); - set_capability( "text renderer", 100 ); - add_shortcut( "text" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + set_capability( "text renderer", 100 ) + add_shortcut( "text" ) + set_callbacks( Create, Destroy ) +vlc_module_end () diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index 0131015c87..2543935851 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -85,30 +85,30 @@ static void CloseServer (vlc_object_t *); "This is the maximum number of resumed TLS sessions that " \ "the cache will hold." ) -vlc_module_begin(); - set_shortname( "GnuTLS" ); - set_description( N_("GnuTLS transport layer security") ); - set_capability( "tls client", 1 ); - set_callbacks( OpenClient, CloseClient ); - set_category( CAT_ADVANCED ); - set_subcategory( SUBCAT_ADVANCED_MISC ); - - add_obsolete_bool( "tls-check-cert" ); - add_obsolete_bool( "tls-check-hostname" ); - - add_submodule(); - set_description( N_("GnuTLS server") ); - set_capability( "tls server", 1 ); - set_category( CAT_ADVANCED ); - set_subcategory( SUBCAT_ADVANCED_MISC ); - set_callbacks( OpenServer, CloseServer ); - - add_obsolete_integer( "gnutls-dh-bits" ); +vlc_module_begin () + set_shortname( "GnuTLS" ) + set_description( N_("GnuTLS transport layer security") ) + set_capability( "tls client", 1 ) + set_callbacks( OpenClient, CloseClient ) + set_category( CAT_ADVANCED ) + set_subcategory( SUBCAT_ADVANCED_MISC ) + + add_obsolete_bool( "tls-check-cert" ) + add_obsolete_bool( "tls-check-hostname" ) + + add_submodule () + set_description( N_("GnuTLS server") ) + set_capability( "tls server", 1 ) + set_category( CAT_ADVANCED ) + set_subcategory( SUBCAT_ADVANCED_MISC ) + set_callbacks( OpenServer, CloseServer ) + + add_obsolete_integer( "gnutls-dh-bits" ) add_integer( "gnutls-cache-timeout", CACHE_TIMEOUT, NULL, CACHE_TIMEOUT_TEXT, CACHE_TIMEOUT_LONGTEXT, true ); add_integer( "gnutls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT, CACHE_SIZE_LONGTEXT, true ); -vlc_module_end(); +vlc_module_end () static vlc_mutex_t gnutls_mutex = VLC_STATIC_MUTEX; diff --git a/modules/misc/gtk_main.c b/modules/misc/gtk_main.c index cfbfa4d1f2..4941138831 100644 --- a/modules/misc/gtk_main.c +++ b/modules/misc/gtk_main.c @@ -59,28 +59,28 @@ static vlc_object_t * p_gtk_main = NULL; /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); +vlc_module_begin () int i_cap; - set_description( N_("Gtk+ GUI helper") ); + set_description( N_("Gtk+ GUI helper") ) #if defined(MODULE_NAME_IS_gtk_main) i_cap = 90; - add_shortcut( "gtk" ); + add_shortcut( "gtk" ) #elif defined(MODULE_NAME_IS_gnome_main) i_cap = 100; - add_shortcut( "gtk" ); - add_shortcut( "gnome" ); + add_shortcut( "gtk" ) + add_shortcut( "gnome" ) #elif defined(MODULE_NAME_IS_gtk2_main) i_cap = 95; - add_shortcut( "gtk2" ); + add_shortcut( "gtk2" ) #elif defined(MODULE_NAME_IS_gnome2_main) i_cap = 105; - add_shortcut( "gtk2" ); - add_shortcut( "gnome2" ); + add_shortcut( "gtk2" ) + add_shortcut( "gnome2" ) #endif - set_capability( "gui-helper", i_cap ); - set_callbacks( Open, Close ); - linked_with_a_crap_library_which_uses_atexit(); -vlc_module_end(); + set_capability( "gui-helper", i_cap ) + set_callbacks( Open, Close ) + linked_with_a_crap_library_which_uses_atexit () +vlc_module_end () static vlc_mutex_t gtk_lock = VLC_STATIC_MUTEX; diff --git a/modules/misc/inhibit.c b/modules/misc/inhibit.c index b50d8e95ac..2fe1dd602c 100644 --- a/modules/misc/inhibit.c +++ b/modules/misc/inhibit.c @@ -62,11 +62,11 @@ struct intf_sys_t /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Power Management Inhibitor") ); - set_capability( "interface", 0 ); - set_callbacks( Activate, Deactivate ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Power Management Inhibitor") ) + set_capability( "interface", 0 ) + set_callbacks( Activate, Deactivate ) +vlc_module_end () /***************************************************************************** * Activate: initialize and create stuff diff --git a/modules/misc/logger.c b/modules/misc/logger.c index e56e81bd8d..9fce6b9452 100644 --- a/modules/misc/logger.c +++ b/modules/misc/logger.c @@ -137,12 +137,12 @@ static const char *const mode_list_text[] = { N_("Text"), "HTML" "\"text\" (default) and \"html\".") #endif -vlc_module_begin(); - set_shortname( N_( "Logging" ) ); - set_description( N_("File logging") ); +vlc_module_begin () + set_shortname( N_( "Logging" ) ) + set_description( N_("File logging") ) - set_category( CAT_ADVANCED ); - set_subcategory( SUBCAT_ADVANCED_MISC ); + set_category( CAT_ADVANCED ) + set_subcategory( SUBCAT_ADVANCED_MISC ) add_file( "logfile", NULL, NULL, N_("Log filename"), N_("Specify the log filename."), false ); @@ -153,9 +153,9 @@ vlc_module_begin(); add_file( "rrd-file", NULL, NULL, N_("RRD output file") , N_("Output data for RRDTool in this file." ), true ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: initialize and create stuff diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c index dcf87b12f5..7e9c701ee4 100644 --- a/modules/misc/lua/vlc.c +++ b/modules/misc/lua/vlc.c @@ -57,39 +57,39 @@ #define CONFIG_TEXT N_("Lua interface configuration") #define CONFIG_LONGTEXT N_("Lua interface configuration string. Format is: '[\"\"] = {