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.

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 0cb3ea9fe82ee033c35e5e79644c4178009d9111..41e3374a4f8582eeea864a464cd33576699c5bd9 100644 (file)
--- 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 ) \
 /* 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));
 
 #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 8773162cf6242c005ef2fb2c756330d885ad3d61..c74e89ab4ef28b0f8826b3df34c434fd0a40efa9 100644 (file)
--- 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") };
 
     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 );
 
     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 );
                      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
         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-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 );
 
     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-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 );
         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 );
 
         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 3d1cadb6b369565eea95de96178c358a74396e52..cae73673469e47d9ac38e2df39f36e30e60ecd55 100644 (file)
--- 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." )
 
     "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-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." ),
 
     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_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 */
 
 
 /* how many blocks VCDRead will read in each loop */

diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c
index 9bbcc29217205ba76af48b789db6e5d6f600658c..c16272ad20dcfb7337e10c0eeeabb3c9d2a2c4fc 100644 (file)
--- 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
  *****************************************************************************/
 
  * 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,
 
     /* Configuration options */
     add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB,


@@ -172,7 +172,7 @@ vlc_module_begin();
 #endif /* LIBCDIO_VERSION_NUM >= 72 */
 
 #ifdef HAVE_LIBCDDB
 #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"),
     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*/
 
               false );
 #endif /*HAVE_LIBCDDB*/
 

-vlc_module_end();
+vlc_module_end ()

diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 381e14a73050a0d080798d276b1164ad543e170a..abd1bed29540a3e9bbcea3944346ae675510d62c 100644 (file)
--- 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 );
 
 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
 {
 
 typedef struct __dc_camera
 {

diff --git a/modules/access/directory.c b/modules/access/directory.c
index aba105f1487285d1517a92f9017659e98541fa7e..1fffcefe7636774dba0143c8222b2cb3c59d5d11 100644 (file)
--- 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." )
 
         "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 );
     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 7b2e96a321ef571d622f643ae38a399031067d48..f7c7e36756bfa3372be8338924c98083d1d7b611 100644 (file)
--- 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 * );
 
 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_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_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_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 );
 
     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_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
 
 /*****************************************************************************
  * DirectShow elementary stream descriptor

diff --git a/modules/access/dv.c b/modules/access/dv.c
index a0b004b127336b1fe17d9301296f5cdd87efc057..88129edb512350551a92d94690afcfee87879274 100644 (file)
--- 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." )
 
     "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
 {
 
 typedef struct
 {

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 687d9cb16254f8179189e8cd68cf084885444259..98e448b1b8dbd03fd0cee82abd97f5aec0832acf 100644 (file)
--- 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" )
 
 #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 );
 
     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 );
                  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) */
     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 );
               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,
     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 );
                  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 */
     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,
     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
 
                 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 5a200cbf2da6330e616db171cafdae962eb64730..f1349bc6536333ced9ebd7a06e9f47897468035c 100644 (file)
--- 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 * );
 
 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 );
     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
 
 /* 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 8e1757a5f9f048df813d3aaed692a1c3d6d1f073..c17d0afd5a72fe4d598372e32a4338ed8898480d 100644 (file)
--- 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 * );
 
 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,
     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 );
     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
 
 /* 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 81d448e40923ac5a8f4e515247b7c97a7b0b0875..dad8c053f1c5b1ee085df6b36ac49fe9aec6668b 100644 (file)
--- 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." )
 
     "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 );
 
 
     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);
     add_integer( "eyetv-caching", DEFAULT_PTS_DELAY / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, true);

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Access: local prototypes
 
 /*****************************************************************************
  * Access: local prototypes

diff --git a/modules/access/fake.c b/modules/access/fake.c
index 03ac7b15c9bac8ccc53458bb4e22c9256e353a9f..2e0d990f2ad37c0bf22318713930ed1ddb416e61 100644 (file)
--- 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).")
 
     "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_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_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
 
 /*****************************************************************************
  * Access: local prototypes

diff --git a/modules/access/file.c b/modules/access/file.c
index 5a798b236f11c0737d294531f51de8fc342218ee..83306b45f5a43a301589dbbc76ec16badd6bd471 100644 (file)
--- 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." )
 
     "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 79cf667b14c24daa7c782e3cd710f4ba19e3dd27..8cb24f89b328219a1b8543f85706fcd2112608bb 100644 (file)
--- 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.")
 
 #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,
     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 );
                 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index fb8f56bed8e3e000edd9113cc5e2b07eec55e472..65880fc670f444acf19fcc7dc29c8ad067f1460f 100644 (file)
--- 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." )
 
     "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 75bde96735fa418df4419173fef51fe42fd79de9..b50dc5ae1476d028dfb1bb746872c1f45024bc1e 100644 (file)
--- 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 ")
 
 #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 );
 
     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 );
               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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/jack.c b/modules/access/jack.c
index f8ca4243883b3038610897ef3b7f76aea2518810..f40340ee8c87417bd3a6a8c4141d736ee84cf296 100644 (file)
--- 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." )
 
 #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 );
 
      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_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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/mmap.c b/modules/access/mmap.c
index 2315e2b49613c607c1ef9293e661d0b22b909002..cbec77022d0b4f4f17374b0e1de49a3d4ceb0f63 100644 (file)
--- 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 *);
 
 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);
     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);
 
 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 fca871e372845940b093867f9737cb7b6479e805..04763ff2a4050238cf8e2aa92e360260cf1f5dc4 100644 (file)
--- 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.")
 
 #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 );
 
     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_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_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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index ada1a85f7187c0c6c103bb6706e9e4c9269a4095..13e65cb1b7f12bf323aee4b700eb0ffa0f260fa3 100644 (file)
--- 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 };
 
 
 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 );
 
     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-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,
     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 );
                  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
 
 /*****************************************************************************
  * Prototypes

diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m
index b1fbdd370546a52d06292764ea136afbd8273879..ce856aa0daf9cc2769ddf82d498012036a84a596 100644 (file)
--- a/modules/access/qtcapture.m
+++ b/modules/access/qtcapture.m
@@ -51,15 +51,15 @@ static int Control( demux_t *, int, va_list );
 /*****************************************************************************
 * Module descriptor
 *****************************************************************************/
 /*****************************************************************************
 * 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 e0878779e75a6fc62d772b180b1b8d2e999b9e1f..870c48d3ed0386690cd4fc89265e1a608a94ec68 100644 (file)
--- 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 * );
 
 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 );
 
 
     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 722b9d38b6d6fc1d2fff57a3baa2afa8ab49181d..9ba74d97f85cbff24761203cdc57590b0273907e 100644 (file)
--- 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." )
 
     "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 );
     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 8287967b2498fde6a7645529274e867af2b9fc27..79e825552ed132a9a02efe9dbd072ad0d34e29dc 100644 (file)
--- 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
 
 #   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_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
 
 #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
     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
 
         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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 9b6d4c6f58073c7b0dbc38ed90a24bd2c14d463e..ecbacf1ac45214597b4ed607eb21b2be1b5657fa 100644 (file)
--- 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.")
 
 #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,
     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 );
                 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index 6b3a0a7111345dee316b82ad97f8c1eb6d46736b..e3466864426cb8f3d397dcaddb75ae2884589d55 100644 (file)
--- 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 * );
 
 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 );
 
 
     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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/udp.c b/modules/access/udp.c
index 0c22b434fc0fa075e923a3057c6fc2937b26b26c..4587ade85019d8e75bc9ef4ea63c0d0389411375 100644 (file)
--- 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 * );
 
 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_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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/v4l.c b/modules/access/v4l.c
index d54bcd40e8e175c36dd8da9a3b17f27ae87c821f..f9b24a56b8139f8c1b1cd16471cdd19ff5cf1df1 100644 (file)
--- 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") };
 
 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 );
 
     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 );
                 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-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-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_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-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,
     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_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
 
 /*****************************************************************************
  * Access: local prototypes

diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index 063698faa8ac6b4c4d30065efa2f07a2aa8ad97f..bbe8cccc7536db7ae5abaa1ef8c1fe4a35d48044 100644 (file)
--- 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-"
 
 #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,
     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 );
                 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,
     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 );
 
     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,
     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_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 */
     /* 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
 
 /*****************************************************************************
  * Access: local prototypes

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 575ff326686a9b0343a577442561414b1196f725..5059b776c40a5aa0f43860a4b2d494f88e0980aa 100644 (file)
--- 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." )
 
     "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_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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index e4d525f8bd31dd68b5d8bada2dd933b60f68af14..93bf8ec6cc08a386224b537202aa7543c343db13 100644 (file)
--- 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
  *****************************************************************************/
 
  * 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,
 
     /* 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 );
 
                 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 cb786772e3f68e02129904d26b5ccedf7f4b0ead..995ee8aced0754879ac46b7971e2cf287ad51b5a 100644 (file)
--- 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 */
 
 
 /* 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);
 
     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);
 
 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 a6c51b9871727f255d15b94d479dd99177fdd9d1..932e919033185b2b50d38c343a926dca7f483abd 100644 (file)
--- 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 *);
 
 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);
 
     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);
 
 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 0a124baa8587671d27b401251cfae5288cf54996..8a612069b8c1d2953848df86b9392a421ef00ce8 100644 (file)
--- 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." )
 
 #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_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 );
     add_bool( "timeshift-force", false, NULL, FORCE_TEXT, FORCE_LONGTEXT,
               false );

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access_output/dummy.c b/modules/access_output/dummy.c
index 183e41d323d201768f15f7c47ac2da90b2f2bf09..4a392f780d9076347bb79b9438abec3bf2f5985f 100644 (file)
--- 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 * );
 
 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 56ccd02ddc4557315844c4f8aa25da96a89edfe1..83ded48963e04563d13f249dc175238df3e2ae79 100644 (file)
--- 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.")
 
 #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 );
     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 a55a1d497ebfbefc5a8d6c1769c19d5820b2dfe1..5644352ff4ca1918917b586836182c96a7c41098 100644 (file)
--- 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." )
 
 
 #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,
     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);
                 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 bc7caa35961412e7c6388c4956ebd0df95811144..f2155c714ae85931e80c321d0f7b989527da7893 100644 (file)
--- 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-"
 
 
 #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 );
     add_bool( "rtmp-connect", false, NULL, RTMP_CONNECT_TEXT,
               RTMP_CONNECT_LONGTEXT, false );

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c
index 5a73958666648492a5e91e98fb4c959482f76bca..6fc3a47f4c5beb3a51b390891a70f951afbb3b9d 100644 (file)
--- 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." )
 
                            "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",
     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 );
                 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
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index 9cc5d11d510c5a41da68858b5b9c600760c70139..8952c4640879ef0638dc1a66b1b30a059d9dd3c6 100644 (file)
--- 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." )
 
                           "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_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
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/audio_filter/channel_mixer/dolby.c b/modules/audio_filter/channel_mixer/dolby.c
index 0cfb7c0403c86e438e5481f4131aab81004c2b3c..3b54cae2c2105a372943cfe7ce5b3b98f599b306 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Internal data structures

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index f854d8dadba6339b988aa45006edb0e54d7888b0..f791ac3aa9ed973c7c191744ed13deb4f4347d15 100644 (file)
--- 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.")
 
      "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 );
 
     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 );
 
     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 */
 
     /* 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 6e6be609349603a066ef8b7390b76f79402282eb..221a5b9589abc523fef1d301b0b8258ea1da9c4d 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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 );
 
     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 );
 
         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
 
 /* 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 7fa42580da2a0bd97401a69bebed518b54f8491b..00f644a0d9b61edbe3966319b484f90836d37d5b 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c
index 0f8cd21adb267dc9810649927ac771e5433c9727..ee393ed48deac87a410381317b587a827b08d844 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Create: allocate trivial channel mixer

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index 699ca3f30bcbf60462a13c5e172ed7cd866e2491..f8a900dffb92c3116f7b9c9a3f60bc2364f80602 100644 (file)
--- 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).")
 
 #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:
 
 /*****************************************************************************
  * Create:

diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c
index 3f08c85a34b26d4204031ce7b4d162506ae7ab10..58f463bed79f4b2801576b72e55e509400d30858 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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:
 
 /*****************************************************************************
  * Create:

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index 4041cb7cff8dfee93dbebf2417e0487b1a2a022a..0028e13cab822bc9e08b9e3b02e32afc7864c596 100644 (file)
--- 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.")
 
     "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:
 
 /*****************************************************************************
  * Create:

diff --git a/modules/audio_filter/converter/dtstospdif.c b/modules/audio_filter/converter/dtstospdif.c
index 4fce3130b8ca9badbba27d35da8e1705178a9e53..9a6a8bf9911fc15e16779794aa77e27178f55982 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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:
 
 /*****************************************************************************
  * Create:

diff --git a/modules/audio_filter/converter/fixed.c b/modules/audio_filter/converter/fixed.c
index ec592d56327b58ea95debbd04a85ff1be026af12..1282838feffc00011b3ddca11ad2830324e07929 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * F32 to S16

diff --git a/modules/audio_filter/converter/float.c b/modules/audio_filter/converter/float.c
index 7d9c0227b68296b0ad676e3d79aa5a884ed794c3..10dbe28e981fca553c1f3cd2b29291743fc09741 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Fixed 32 to Float 32 and backwards

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 5e8de153d5a9f2b5047bac3fdc16e2b0400fdc0c..357ccb8b6c88cab7bd1dff3f5e83e2c6c58171cb 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -66,18 +66,18 @@ struct filter_sys_t
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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:
 
 /*****************************************************************************
  * Create:

diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c
index de3476059ccaa14e1852a6d75f66c2ce761138d4..ae456f312ee013a87d86266f5124ba382ad914c9 100644 (file)
--- 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)." )
 
 #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 );
 
     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 );
               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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c
index b90f109f2d2ed49ee74a5790147c78410d728d8f..0811231b104a31ce661f3fde102299723099b0e7 100644 (file)
--- a/modules/audio_filter/format.c
+++ b/modules/audio_filter/format.c
@@ -201,13 +201,13 @@ static const struct
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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:
 
 /*****************************************************************************
  * Open:

diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c
index 8b9f34272ba0f6e393a6fc6de832f064fee7bb31..8f5dc48f4cd1443332b8e8ec8bb0421070da5f05 100644 (file)
--- 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." )
 
                "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 );
     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
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c
index 53c000f0e739162ef0f43e7db13c07b2bdcc4729..4479d57a7d76fbc76fcf6343a52794b3292ed605 100644 (file)
--- 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 * );
 
 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_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_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_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_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 );
 
     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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index 3eddef55bf45f0949f66e472a0a5d25f6ae0dc47..12e1f0b5138a50c8140baf09e12567b52b5f7898 100644 (file)
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -92,18 +92,18 @@ struct filter_sys_t
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Create: allocate linear resampler

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index 59c6e95d34def0a3f12788ed373a25f4db3262ec..35ecee8f8fb7dd0a649530de9b5bcc291614a286 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -63,18 +63,18 @@ struct filter_sys_t
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Create: allocate linear resampler

diff --git a/modules/audio_filter/resampler/trivial.c b/modules/audio_filter/resampler/trivial.c
index 859ec5c6ee16d43d154297e4203748f3cb56ead1..75586041e7d12fe361eeab406bada93ecb21d993 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Create: allocate trivial resampler

diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index 7d9053b044cce2daccd28b6f30a4bf4b113275a5..3dab7af3bd19741d9b6bb70d3d8682a63a5f8c48 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Create: allocate ugly resampler

diff --git a/modules/audio_filter/scaletempo.c b/modules/audio_filter/scaletempo.c
index 08541f175c179e32f6904f04daba869a8d117555..cb534ca2c77aad56001e33207854b48c5e6585cc 100644 (file)
--- 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 * );
 
 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 );
 
     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 );
 
     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
 
 /*
  * 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 6977d3a85a696cb3412ba9b9997799343e5c90e9..672d4a1b305caf514c42799e0251697d11b1cd77 100644 (file)
--- 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 ""
 
 #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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c
index 0792a50581a3a8ae181f3e98112d171faa2f2e96..e3f905464dc6abe0d9c08edeed121d3a7970afec 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Create: allocate mixer

diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c
index bd183f3d0bc5c76505f06ceaabb70010a5450597..f74f4212c01470c4fb81334fbaf4abd22e65439f 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Create: allocate spdif mixer

diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c
index 5c93d9b8e26e08c310d848693a8fbce7eeb4d177..2512981ae52ce5f94e2b7452b5da8d9673c4bf74 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Create: allocate trivial mixer

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 2a0f46dbd2337af40dd1473b140997755c021884..3dbd8b70698f7b2c847ba10fa6835a3f132f5074 100644 (file)
--- 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") };
  *****************************************************************************/
 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_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_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
 
 /*****************************************************************************
  * 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 525787d5818a0bf2b7e15a8ab2b5aa1fe8045531..169bad7be4e7a8a281cd44c8209feec81bd50879 100644 (file)
--- a/modules/audio_output/arts.c
+++ b/modules/audio_output/arts.c
@@ -61,14 +61,14 @@ static void Play         ( aout_instance_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Open: open an aRts socket

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 22bfd43936b35e05ec71a6c294627bc74a1dd2e6..0e29526c896742d7dca2b117ff2349c75759504d 100644 (file)
--- 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.")
 
     "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
 
 /*****************************************************************************
  * Open: open macosx audio output

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 265a39e7e7d867b3ceb4d56cea91641ee648ee8e..1a6b504628469fc7901666d0c5a44994a404a0e3 100644 (file)
--- 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)." )
 
     "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 );
     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
 
 /*****************************************************************************
  * OpenAudio: open the audio device

diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c
index b56b99cb9890facf6927a0e228a3700306096683..be91c4af7ae74f95f8c253e4d763d7070ee2b350 100644 (file)
--- a/modules/audio_output/esd.c
+++ b/modules/audio_output/esd.c
@@ -66,16 +66,16 @@ static void Play         ( aout_instance_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Open: open an esd socket

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index ff075999b5023d5f3a577d8622a113b9f8c58150..2916b6382c48a93f8ffb75cfec7c9ea8d6342507 100644 (file)
--- 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")
 
 #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 );
 
     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 );
                  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
 
 /*****************************************************************************
  * Open: open a dummy audio device

diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp
index cb01386c222498ed5c45048b17c37e3ea75eabda..a317cdf4cbeb5a9deb62b5ad9967d565a1353f53 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Open: open a dummy audio device

diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c
index f87d4cbe011ed09390e4c97b8a011f6f949f0106..b15bbfab88a5a5f0c8e3cb5802b82800076d3807 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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 );
     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
 
 /*****************************************************************************
  * Open: create a JACK client

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 2b3de848dfd652e7d67d8d72d13bb3a802425c6a..6e8d362954c936c1f5eaeae3ae1c74fa06e7da94 100644 (file)
--- 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." )
 
     "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_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
 
 /*****************************************************************************
  * 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 6256e7532507b15891b07e2743945732d366e947..9f90d06d38356d0041d0409c7541b66e75580371 100644 (file)
--- 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")
 
 #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_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
 
 /* 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 5d0c39daeb3766af1b944f6b1c911cd2c51c2773..d1e5d505e1790e683733101a31a9a7afa3e38944 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Open: open the audio device

diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index 7dc215f1e4d4cb23a159d5fde676d6d7fd2335b6..5a5ccc14ad2cf448e3634ce93246b8eaf1f99063 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Open: open the audio device

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 26d878176f3bdfe84b5018a362b324f670384446..44f916a3b2ccf5339340ce03d7f346b9eac921ce 100644 (file)
--- 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")
 
                        "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_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_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
 
 /*****************************************************************************
  * aout_sys_t: waveOut audio output method descriptor

diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index edba4f121b349fdee3b10bd5337d245f30fca4d8..82112f930a64280b79f5928e9c17ba980f2e7884 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * decoder_sys_t : decoder descriptor

diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c
index c647f806ed8c30cff647d5292ce5c81d199c3516..d0b9988321f8a423c68a69cbb795383f912d8641 100644 (file)
--- 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 ** );
 
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/aes3.c b/modules/codec/aes3.c
index 226a3c69ef98e96fef7e04084e0f7e2656edc504..e1f1c15ecf5ce34759f9785b8f72a4295eb7d4e5 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * decoder_sys_t : aes3 decoder descriptor

diff --git a/modules/codec/araw.c b/modules/codec/araw.c
index 93cb691c968f47e9ed30a58fe53a7a7c425d1a6f..7a5ec825eb6e065671e49f17184cc1aee4534cf2 100644 (file)
--- 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
 
 static void EncoderClose( vlc_object_t * );
 #endif
 

-vlc_module_begin();
+vlc_module_begin ()

     /* audio decoder module */
     /* 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 */
 
 #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
 #endif

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 87c7daab0c3589304a6cc1762e769c1063212c38..151082e591770d64c92e8a9aa31de82542c63e5c 100644 (file)
--- 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")
 
         "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))
     /* 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
 #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
 #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,
     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 );
         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 );
     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 );
     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 );
     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 */
 
 #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 );
 
     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 */
 #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;
 
 
 vlc_mutex_t avcodec_lock = VLC_STATIC_MUTEX;
 

diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index 4db6b31a7f476d30102bb50bbe7713a0eb16ee2a..e00afb3742d90947be39d6658afe7e7b17d338e9 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c
index ae0f5bacd822e4fd9c3386b7c22e73f36b371901..3269061fbbed3769472ac7dbdac607e93595f7f4 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Open: probe the decoder and return score

diff --git a/modules/codec/cmml/cmml.c b/modules/codec/cmml/cmml.c
index 14fe347a0db4a3f534781e9d7a6a69abe10c895a..69763a5184d955ecd64693f12c8d8d5ece070554 100644 (file)
--- a/modules/codec/cmml/cmml.c
+++ b/modules/codec/cmml/cmml.c
@@ -69,16 +69,16 @@ void CloseIntf ( vlc_object_t * );
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/csri.c b/modules/codec/csri.c
index f1f6de07a7e2a8bdf7a1a77fb0d684e760ca8e92..dfcd13b242dae4153331b4e47ad98672377d90b0 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c
index a2d1a76d86560b3964bf7f7dacac8576105a4fd0..b3e1456c782c9c5c3189dbf1f7fd822a8659ff80 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c
index 87fb11bba1a634def1bc026d08952fa5ed73b659..bb37518f4c3894c64bbcfd4059c64dba47afabc2 100644 (file)
--- 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)." )
 
 #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 );
 
     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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index cb077976c58b2d076d7878e6f7406985293909b7..8ae2aaba9ff951f504c790f3473fbd24c40bb194 100644 (file)
--- 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 * );
 
                     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-"
 
 #   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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index f9ed084aae7dc89282bbd5fed8daa860007c7a84..1dd9379ec749f0631cb2ab82c8767889ef50bb98 100644 (file)
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -96,16 +96,16 @@ static block_t       *GetSoutBuffer( decoder_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index 0310fa4441fe32f69c2c0fcc60f971d5c51f63cf..61b61762daf6d3cd9f37c0e678e6411c58062674 100644 (file)
--- 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 * );
 
 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-"
 #   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 );
         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-"
 
 #   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 };
 
 
 static const char *const ppsz_enc_options[] = { "x", "y", NULL };
 

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 901ad311405e6da1ba1f390761918dcc48ae36d9..521b272e3b42c34c449c0294e270bca1dc7cef5f 100644 (file)
--- 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 * );
 
 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
 
 /****************************************************************************
  * Local prototypes

diff --git a/modules/codec/fake.c b/modules/codec/fake.c
index 5974564a90c4a616e3c27173fa98094eb35d8ae0..282f3ffdf7f6ee73d66dd7e31e9e0272bc879c47 100644 (file)
--- a/modules/codec/fake.c
+++ b/modules/codec/fake.c
@@ -83,14 +83,14 @@ static const char *const ppsz_deinterlace_type[] =
     "deinterlace", "ffmpeg-deinterlace"
 };
 
     "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 );
 
     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 );
         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
 {
 
 struct decoder_sys_t
 {

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 0971a5043094b501995389b97b41beb65352385f..c9d806959f9cacdec7357704962144e12568b86e 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 #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
 #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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 2bb5ee7898178a4cd2a382ee7f51108c6d9a9884..0025da24361da0bca518a37ee8ded41a593f5a13 100644 (file)
--- 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 *);
 
 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);
     add_file ("soundfont", "", NULL,
               SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false);

-vlc_module_end();
+vlc_module_end ()

 
 
 struct decoder_sys_t
 
 
 struct decoder_sys_t

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 20090c1a47058542705997ff25ef1e121f5f9393..ced41c9cc1396b37a968705befca78d73248703e 100644 (file)
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -108,28 +108,28 @@ static void ParseKateComments( decoder_t * );
 #endif
 
 
 #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
 
 #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
 #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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index 0fa34ce7621f3ae09b4a34b0128879d74e8ab6b5..32a6a1ef076e69ae6e1b212fb1f37ad91617b43d 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 2c8ddecf0d482245df0b60b0e69ce0464d655c56..11dbb2fec20c14224edf744c0c7e8a69f8fa4792 100644 (file)
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -99,14 +99,14 @@ static void GetAR( decoder_t *p_dec );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index 1d98488dfe515988db3509aa3d24b9dbc8053607..35751005c26ed45efbc629e21f8c1312e76672f5 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -81,20 +81,20 @@ static void *DecodeFrame  ( decoder_t *, block_t ** );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
index 7895eb6427965d3e1601750c79decb01e4505216..88533cb4796230bc183ea3fe6473c73ca3625648 100644 (file)
--- a/modules/codec/mash.cpp
+++ b/modules/codec/mash.cpp
@@ -67,13 +67,13 @@ static block_t   *SendFrame  ( decoder_t *, block_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index 6e7d8692807d727727a35506a9c5ffd621407ef5..96fe2aa8c1e68b91ad55dc604b94296e9ce12f9a 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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)
 #if defined(UNDER_CE)

-   set_capability( "decoder", 5 );
+   set_capability( "decoder", 5 )

 #else
 #else

-    set_capability( "decoder", 100 );
+    set_capability( "decoder", 100 )

 #endif
 #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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/png.c b/modules/codec/png.c
index 7fe5f0794d53a40f7640d58b60ef3445ba7b2033..b6c0f4ea2380865c886e3554a4698a1a2058c340 100644 (file)
--- a/modules/codec/png.c
+++ b/modules/codec/png.c
@@ -53,14 +53,14 @@ static picture_t *DecodeBlock  ( decoder_t *, block_t ** );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index e4e24cf359e45c927431f8057067a182bc6e8b10..a42ccce76f17250a792f05010e6f4dc39c785b65 100644 (file)
--- 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 * );
 
 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 a83a40f54e1e893659a4b415caa2fb5834fa88cf..eed5ab2414c98eae0da731167211231e3155f1a5 100644 (file)
--- a/modules/codec/rawvideo.c
+++ b/modules/codec/rawvideo.c
@@ -69,18 +69,18 @@ static block_t   *SendFrame  ( decoder_t *, block_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/realaudio.c b/modules/codec/realaudio.c
index caa768643b9078b13dda2b45439f6d68bc3c9ad4..1945f2aa76c0567f30761159dc066b8bd1113a86 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/realvideo.c b/modules/codec/realvideo.c
index 04d7e8467632cbb1c13a49b30d9d7e069ec6550f..60e43fb5e9e3fe6cc59af3ec194a4d0cc79e1cf3 100644 (file)
--- 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 ** );
 
 //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 1725e3602b17e50cb32846ba08e0ff410b40c08b..4bb392a6e6474e2ff7cb3a5e6fefaa2c4d3f1938 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c
index dcc558d25661a706e2bedea6920b047d461e7ecd..861bcb1b14903368dfdbab282c88c04fe6fff04c 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 {
 
 static const struct supported_fmt_t
 {

diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index bd4305b96b7868f859a3de3f4b09fa90fcd6bb32..b9853eae81dc0f14a91bbb086161edd85a24aedd 100644 (file)
--- 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
 };
 
     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 );
 
     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 );
 
     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 );
 
     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 );
 
     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, */
 
 
     /* 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
 
 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 5f4e83e3e7455ad650b0a109cf5ff884ab120983..f527a9c2b379c0ed5fc6cc6ff48cc353859719ef 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c
index 24b9021dfb5b61b4e0574520680c74ddb4bcc83e..0b9173224d2cde8892854a60e8ba5acadabffeae 100644 (file)
--- 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 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 );
 
     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 );
               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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c
index 6b21e12621dead0e9e38061793158583d8a8dc5b..ab7756bc5a4d16a423c36d98d4486bae872aa4aa 100644 (file)
--- 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.
  *****************************************************************************/
 
  * 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 */
     /* We inherit subsdec-align and subsdec-formatted from subsdec.c */

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/subtitles/t140.c b/modules/codec/subtitles/t140.c
index 01b31629c641c5a282ac73677497abb68afc3d62..76ae1ef1f15fefbebec8b0cfc6dc1d89c0ae9c9c 100644 (file)
--- 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 * );
 
 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 * );
 
 
 static block_t *Encode ( encoder_t *, subpicture_t * );

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index d5e5e9dac7b4a0a3f5ff20ad77ea6f24c094c878..184311510b59b6588e0fb88e4d0b11fd0ab465ae 100644 (file)
--- 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" )
 
     "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_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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/tarkin.c b/modules/codec/tarkin.c
index 5b86788da131077a71ff0fe95a3ebceaa03c4c98..2a35e496f3c2374315729c50df90efd9080c9b22 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/telx.c b/modules/codec/telx.c
index 1cc96d538158a69fc13310fd114b3056e0ebd51e..9743b440f3ba9df49cd64f3616e3aec4f0ae8301 100644 (file)
--- 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.")
 
         "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 );
 
     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 );
 
     add_bool( "telx-french-workaround", 0, NULL,
               FRENCH_WORKAROUND_TEXT, FRENCH_WORKAROUND_LONGTEXT, true );
 

-vlc_module_end();
+vlc_module_end ()

 
 /****************************************************************************
  * Local structures
 
 /****************************************************************************
  * Local structures

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index b6411c93a788ba85951922246b65c12de779282b..2380b234af1601c832f9377c1ea20a32b0460514 100644 (file)
--- 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." )
 
   "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 );
 
 #   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
 
 static const char *const ppsz_enc_options[] = {
     "quality", NULL

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 0f300efb7273cb010d3e588937544395a59c80be..418f080d27f1a3e2fc17096e03094adf49a485a4 100644 (file)
--- 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") };
 
 
 { 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 );
 
     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 );
               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
 
 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 72176432631b9e686e5cf8e613b2a9deb961d865..312951d87473b0b4179e42ee33b677932c89ff18 100644 (file)
--- 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)." )
 
 #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
 #ifdef MODULE_NAME_IS_tremor

-    set_capability( "decoder", 90 );
+    set_capability( "decoder", 90 )

 #else
 #else

-    set_capability( "decoder", 100 );
+    set_capability( "decoder", 100 )

 #endif
 #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-"
 
 #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)
 #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,
 #endif
 
     add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT,


@@ -213,7 +213,7 @@ vlc_module_begin();
                  ENC_CBR_LONGTEXT, false );
 #endif
 
                  ENC_CBR_LONGTEXT, false );
 #endif
 

-vlc_module_end();
+vlc_module_end ()

 
 #ifndef MODULE_NAME_IS_tremor
 static const char *const ppsz_enc_options[] = {
 
 #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 79f56a11da8a493b570941cf493d89f6caef29a2..6e749a7f0ce9ef8d3c76c12d9d9d757efc438b08 100644 (file)
--- 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
 
   { 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 */
 
 
 /* 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_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 );
 
     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,
 
 #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 );
 
     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 );
 
 #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 );
 #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 );
 #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,
 #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 );
 
     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_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_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 );
 
     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 );
 
     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 );
 
 #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 );
 #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 );
 
     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 );
 
     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 );
 
     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 );
 
     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 );
 
     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 );
 
     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 );
 
     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,
 
 #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 );
 
     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 );
 
     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 );
 
     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 );
 #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
     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_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 );
 
     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 );
 #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 */
 #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 );
 
     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,
 #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 );
 
     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,
 
 #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 );
 #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 */
 #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 );
 #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 );
 #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 );
 
     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 */
 #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 );
 
     add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT,
                 STATS_LONGTEXT, false );
 

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/codec/xvmc/xxmc.c b/modules/codec/xvmc/xxmc.c
index 7941bc8e1d52d81a35112b2bfa845776e76e65ec..e502780c4efeca83d362eabd1db670cbafd977af 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 833c88684502144ff928d3f3737f9f4b4bbafa4b..868d03747d5704c2a8616b1b3aa941ff6946d973 100644 (file)
--- 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") };
 
 { 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-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 );
         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
 
 /****************************************************************************
  * Local structures

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 972a19c3d968e1fed87923426bb6a78a24b598f0..bb6776ecbb83320b4de52efe062e923ea5054276 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -107,14 +107,14 @@ struct intf_sys_t
  * Module descriptor
  *****************************************************************************/
 
  * 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
 
 /*****************************************************************************
  * Methods

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 940bbc42cd0c776e69954cfbe9e7918a761e8ee3..5a187bb6ef3446dbdf6778d59fcd89019d182ed2 100644 (file)
--- 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") };
 
 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 );
     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
 
 /*****************************************************************************
  * OpenIntf: initialize interface

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index e6c2ddb2d5d42080540ed3f6ff1cdba93020da2b..73b0e718279d798ef51c418f7c7316d5239d8e90 100644 (file)
--- 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.")
 
 #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
 
 /*****************************************************************************
  * Open: initialize interface

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 08becdf796f0912ca5c384bf44d9417444827859..0c1cd34bb0ff00be2acb087582d88ffccf0d5b2e 100644 (file)
--- 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." )
 
 #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 )
 #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
 #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 c82dcc588641c113cf528b7cfd21bc2ff7958424..467f48229a948ddcd3ff50fec94368c58f82c8f5 100644 (file)
--- 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 * );
 
 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 );
 
     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
 
 /*****************************************************************************
  * intf_sys_t: description and status of FB interface

diff --git a/modules/control/motion.c b/modules/control/motion.c
index 6219f7b6c1b80e97f6d498f7c84baec4611b5fc5..c788857fb9374d9521f3abe2daee339fc56f61d4 100644 (file)
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -74,19 +74,19 @@ static int GetOrientation( intf_thread_t *p_intf );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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_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
 
 /*****************************************************************************
  * OpenIntf: initialise interface

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 3b4b7bc3df53a14f3c66cab5360df6cd32598675..d005e6acf4c85361f02e2547c86eb2455ef9c3a3 100644 (file)
--- 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." )
 
 #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 );
 
 
     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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c
index 7432db8542240ca820aa06fed6944cd95c7e2df2..e7bd2891199fa2744b4ab656c0648063e7fa5b2e 100644 (file)
--- 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)")
 
     "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,
     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 );
 
     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
 {
 
 struct intf_sys_t
 {

diff --git a/modules/control/rc.c b/modules/control/rc.c
index a43fbb9fd132c773063a1b6ca367a2425b2ddb05..cb6d0cfcb76b22cb1c36f857afef1a50c8c52f23 100644 (file)
--- 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
 
     "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
 
 #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)
 #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
 #endif

-    add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, true );
+    add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, true )

 #endif
 #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
 
 /*****************************************************************************
  * Activate: initialize and create stuff

diff --git a/modules/control/showintf.c b/modules/control/showintf.c
index a59cad6c899dc5450597c37cc1cc09cc801542b1..01ec57e345b6eb0b154ee9992b9c85e172bf2475 100644 (file)
--- 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." )
 
 #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
 
 /*****************************************************************************
  * Open: initialize interface

diff --git a/modules/control/signals.c b/modules/control/signals.c
index 840a8114e431312c7bde62c835453b24766d67d9..1b481ccd7dbaf53fca75e226d517b90b4ea71d03 100644 (file)
--- 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 *);
 
 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
 {
 
 struct intf_sys_t
 {

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index dcd286326d9bf911c561e7bcab808b49faad2cd6..6cf4b6d64a449941bbb9d53393197690e5a4e6fb 100644 (file)
--- 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"
 
     "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 );
     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.
 
 /*****************************************************************************
  * Local prototypes.

diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c
index 092357493a627b6e5e8ea02c993b851de0d50b7f..186606713b561e7b941ee139d25a393e05144f90 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 6169d6b6654c8ed3eb9ca74b1fa2e8eb9ecfa818..a7e9e201b3b324b915031e9a1cfc6706af1a24bf 100644 (file)
--- 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 * );
 
 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 58da050f6175464eaebb058ac23be30221b76a0f..87fb9e42379e962064aa7139a75b9d16fa9b66c6 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c
index 59a5862fd279aef65b2ee41f62fd8fbc434a3f4a..8c45258aa6413371414c562f6fa7b949d1a4749d 100644 (file)
--- a/modules/demux/avformat/avformat.c
+++ b/modules/demux/avformat/avformat.c
@@ -45,21 +45,21 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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 */
 
 #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 );
     add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
                 MUX_LONGTEXT, true );

-    set_callbacks( OpenMux, CloseMux );
+    set_callbacks( OpenMux, CloseMux )

 #endif
 #endif

-vlc_module_end();
+vlc_module_end ()

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index eb7cbfbb86f9a7264580378379ee070fd2b6bd0c..8c8a0223da04d8494f9b89ab7c42bcb36a204461 100644 (file)
--- 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") };
 
 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 );
 
     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 );
 
               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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c
index d2fc7899126b5d4acc50a4aabe74f768cb9e717f..a4d16f541078b2adb8e6c1a7665b24ef5ccdbf52 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/decomp.c b/modules/demux/decomp.c
index 82ae4bc1902c508c591e3d6af0a34f80cf82e5c8..1489db3b2a7b90f7601a62d5b2ae49c63c78139d 100644 (file)
--- 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 *);
 
 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 */
 
     /* 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);
 
 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 1dd677377bc853c30c30044b3a03de5301f84779..3ef046a55154dea21a44367569b897b840290af1 100644 (file)
--- 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 * );
 
 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 );
     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 81db480d9449cdaf242ecb0117d81331fd5e0b7e..5203cffdda19a9b95174ec5120d1f1ad8c2928db 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/gme.cpp b/modules/demux/gme.cpp
index 2dfb5c957a216e5d658cd7e1759b76dd32f073c3..e24f04b9d059b8134d3ffea83ecc0a39f1c08bf1 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 6a09c4f7c83a4b4db26abadc3f59df7e1c00de7d..415510d902bf3dbdb9786abb9b1ea10079abd66b 100644 (file)
--- 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.")
 
 #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 );
         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 );
                     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 5415864d0d402eb7907cbab818ae7918b0740f19..fff153f4bca26e411b6b86fad50767669a571707 100644 (file)
--- 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).")
 
     "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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 2c1e96734567fb6ee9dff99c37972bb286eaef82..ae7329afba0590c2624a01577be99f21d203c6b9 100644 (file)
--- 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 * );
 
 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"),
 
     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 );
 
             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;
 
 
 class demux_sys_t;
 

diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 69128ecc998ce707e06f1d37c0a97b02c8a7b58d..19c002b698b47bb4bca7ca8425f792efd7f2ddc9 100644 (file)
--- 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." )
 
 #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 );
 
     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 );
 
     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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 0a099175b3ddad87efed7cb41198483f8febf755..369c6322387c0bf31bf830df1fe4e135c4bd40d8 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index d6d4ed3ea4378a28be242009694cd1cb0b7044e4..d0a9d931f971db82855629b328359db77654048d 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
index d86a5a010e5b263d882a1ef80e831fb68a541674..dbac5dab5fa8850d59f0647d10eb885b5c5e8673 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/mpeg/h264.c b/modules/demux/mpeg/h264.c
index a529cabff25db8b2cc457294481cb3f7dd244ea3..5f6071c48220737855b4e7753ada1e7e945100f3 100644 (file)
--- 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.")
 
 
 #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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/mpeg/m4v.c b/modules/demux/mpeg/m4v.c
index d51ab695e30c69d0138936a2121d33ab274323c6..2f48a9e2cebe9af9e62f2af2268de22ee1f4e8b5 100644 (file)
--- 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.")
 
 #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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/mpeg/mpgv.c b/modules/demux/mpeg/mpgv.c
index b1f1251187d4306f5ddf1777b447570443109d3a..946739aa3c07e190e96ea08907b8bfc08122d6c5 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c
index c889af9a8e3f321e2a127ec9fd2e043c24649e17..c401c0b5f2a6c3a4ea67a031b89a1f1b14873539 100644 (file)
--- 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 * );
 
 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 );
 
 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 8af188efc6cc649d44f026fe747d023c0c4acdb0..34890534b03af6705d308532c2d7077e39162f9c 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c
index 0a7c8917c8876941765c4ba2945d8d0892ad1acc..c6a87b45ac6fea1580c9cd0af234c289b0c37bc9 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index db22e7c8ff5f09a081a20abb37d9b1e5005d44b8..2a85c3f27626b73f13e5034cd078ff6f3465bb6c 100644 (file)
--- 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 * );
 
 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 3b8374d5e14ca9092dc6f739e74721979a3533a8..1e22d6f4fef7233e87459b6df1e800e07719f3e7 100644 (file)
--- 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." )
 
 #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_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 );
 
 
     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_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 274dc0bfee9c7f24a516e6b3e2a667aab26b0e16..ddd507256721998ebf3d63e07be703db5e4008a3 100644 (file)
--- 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 * );
 
 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_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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/pva.c b/modules/demux/pva.c
index a3f13a01fbd88475c3ece76f920101e4f74fb066..68093d98df0e8ab65dd9887d1874c48d29ef2f02 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c
index 627220aee6f157175939ddaa62a21ddbdf82e485..611be06aece1b9e0a638e3be4cf70c9617a1b105 100644 (file)
--- 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 * );
 
 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 542f20ab6f1b63f50f179c77e3ae71d2b2ad83b6..d39ba0a5fcfc55c031c216616643990648111466 100644 (file)
--- 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." )
 
 #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 );
     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
 
 /*****************************************************************************
  * Definitions of structures used by this plugin

diff --git a/modules/demux/real.c b/modules/demux/real.c
index 571b6f85b96c44de0d78dbbbfa408df600f8125e..f3eb09408b193ffc6d44981eab7b06d0e69ff5ce 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/rtp.c b/modules/demux/rtp.c
index 5978918c09aab433d6c3cc1c613c4805b240d1bc..86d3d96dac38cdc50ccdc1224c8466825698c83b 100644 (file)
--- a/modules/demux/rtp.c
+++ b/modules/demux/rtp.c
@@ -78,39 +78,39 @@ static void Close (vlc_object_t *);
 /*
  * Module descriptor
  */
 /*
  * 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);
 
     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);
     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);
     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);
     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
 
 /*
  * TODO: so much stuff

diff --git a/modules/demux/smf.c b/modules/demux/smf.c
index 2785cec366009b88920f2e9ecb83b33ef7d2ef29..ec02487eadd796098494b3cb21359f57386bad6e 100644 (file)
--- 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 *);
 
 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);
 
 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 7b2009446d1a4de995c025dda1b1bacd0a7ff9bc..87a914c2ddc0518a1bea6fccea7b019f8933941f 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -70,12 +70,12 @@ static const char *const ppsz_sub_type[] =
     "subviewer1"
 };
 
     "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 );
     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 );
     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:
 
 /*****************************************************************************
  * Prototypes:

diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c
index 53899e1dd0189c7ec52399acaeb6072d27aa4daa..9c499e3f3f3eccde06e8dc0e8fbbe385321db09b 100644 (file)
--- 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.")
 
 #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 );
     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 );
                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:
 
 /*****************************************************************************
  * Prototypes:

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 862ccd6f39d4603e2c11da5ec5fd01072eee5716..7394db283192e1703c8fe3c9fc08d514d58d3218 100644 (file)
--- 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." )
 
     "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_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 );
 
     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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index eca6ac5fba8f0a1b448bb118a1fc192eb2366c22..3f295c92ea9aabb8912a68093ed7f7a5b87536f2 100644 (file)
--- 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 * );
 
 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
 
 
 #define TTA_FRAMETIME 1.04489795918367346939
 

diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index 11511b4ff99c4ae66b5eee6553a87db4f1100cab..a4db231772801801dcbc191ec7e92cc3cbf732e1 100644 (file)
--- 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 * );
 
 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.
      */
     /* 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/vc1.c b/modules/demux/vc1.c
index 31f78c1767b34a364727c6718b2f45c5976f8c77..99b8f934e05a722a2efdcfd071bd7858d5eb1d0a 100644 (file)
--- 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.")
 
 #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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index fe9cf2782d9c25e8b303dbff8ca857728472e640..b3a460d588e7ebf3c38f1ba0b2ce753ca69ed75d 100644 (file)
--- 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 );
 
 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:
 
 /*****************************************************************************
  * Prototypes:

diff --git a/modules/demux/voc.c b/modules/demux/voc.c
index e6c9356759bf5ea37f6bd1ce9a15e1afeff4cb3c..13d86d1b28feb78de8bae83fa220bb5d273703fe 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index c300c7b40331493a3105448b57698c0a661cb86d..be7f848baf88ab278d03adacbd73b396e4a6b231 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/demux/xa.c b/modules/demux/xa.c
index b98a78ed8f47e6a585225fe6a61192ebb9997d2c..65a3f2eca904e3fb666047b939aa95a0524359e9 100644 (file)
--- 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 * );
 
 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
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/gui/beos/BeOS.cpp b/modules/gui/beos/BeOS.cpp
index c1dc7e84b1543a3baef5bffd2bbd497020589af6..337e85bae021f64b7563aa4e16657a7a26dce6f7 100644 (file)
--- a/modules/gui/beos/BeOS.cpp
+++ b/modules/gui/beos/BeOS.cpp
@@ -49,19 +49,19 @@ void CloseVideo   ( vlc_object_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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 2ac42b6d2607acfa4390182c1310e51029b0ae36..c91a1f203934fc996c0e218b51df16578a73b025 100644 (file)
--- 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") };
 
                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 );
 
     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 );
 
     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-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 );
 
         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,
     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 );
 
     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
 
 /*****************************************************************************
  * fbosd_render_t: render descriptor

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 9d4404dcb00fbf846e33096d47151f3a7248d834..e7810c5446a06af88eb69ce1a24a03afbbc77218 100644 (file)
--- 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.")
 
 #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,
     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_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 );
 
         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 );
                   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 4319b1a615d391a20dd44098dad1eece39c8f145..49cd6b1806c181f095b1c84c87b2a70fae7f90f2 100644 (file)
--- 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
  *****************************************************************************/
 
  * Module descriptor
  *****************************************************************************/
 

-vlc_module_begin();
+vlc_module_begin ()

     /* Minimal interface. see intf.m */
     /* 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 */
         /* 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 c09377ed06b3f864e63bed8bb963da3f77c0dcdd..48c3b18d3094642000cdd26ae501aaec878707b9 100644 (file)
--- 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.")
 
     "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
 
 /*****************************************************************************
  * intf_sys_t: description and status of ncurses interface

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index e5eecb07a25762c68aa9b9eaa6a76f41d10e6aeb..e26f802ac5bb69f608d0348d0a49e95ff3893c9c 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Open: initialize and create window

diff --git a/modules/gui/pda/pda_support.c b/modules/gui/pda/pda_support.c
index 36b73e8a0b3a998da7879be0592e8dd80715963d..4526c9c520b2d288468063b9c290502d7e10c7f8 100644 (file)
--- 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))
   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 e07fb40cde2c7bc53f371c6fe018212c4d91ae9a..1de9e95f304fd30c9026150b7d2bf2884a322f2e 100644 (file)
--- a/modules/gui/qnx/qnx.c
+++ b/modules/gui/qnx/qnx.c
@@ -43,14 +43,14 @@ void CloseVideo   ( vlc_object_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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 4308ab46414870775a415932880e81e964802cf6..2dc829331dbaf722f784c4f3c7bec9e2abc4cba2 100644 (file)
--- 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 };
 
 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 );
     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_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);
 
     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 );
               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 );
 
     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 );
 
     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
 
 /* 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 e2857a30279e7016090886268bc21fddc8fec82a..6878aead7f53cd0dbcbd2b17328cae132051f9b1 100644 (file)
--- 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")
 
 #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 );
     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 );
     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 );
 #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 );
 
     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 68869333768e70f429f49ac4a370cc25787fd74c..bcc12b97b8f286bb7362f8367d2239eabebbc9cd 100644 (file)
--- 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.")
 
 #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_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;
 
 
 HINSTANCE hInstance = 0;
 

diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
index cf65e0a009feab93b78182eddfa854cae1d11022..09aaccd5a3fab1abe1f87e2bd78c02a95d76c50b 100644 (file)
--- 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") };
 
 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_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_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_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_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_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 );
     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 );
 #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
 #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 );
     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)
 
 #if !defined(WIN32)

-    linked_with_a_crap_library_which_uses_atexit();
+    linked_with_a_crap_library_which_uses_atexit ()

 #endif
 #endif

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Open: initialize and create window
 
 /*****************************************************************************
  * Open: initialize and create window

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index e6493e0e2e8d5545a72a26397196d8cba7843f78..36e5ae302d46c2ac26a3b9e8fd212089db623a07 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -54,13 +54,13 @@ static int FindMeta( vlc_object_t * );
  * Module descriptor
  *****************************************************************************/
 
  * 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 45d33fc0482ee94c0f33e4ecc04698bb0c5f18b7..fd0210160c1bf8b94d8b82011aa5524a45926cd6 100644 (file)
--- a/modules/meta_engine/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -53,11 +53,11 @@ static int  ParseTags ( vlc_object_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * ParseID3Tag : parse an id3tag into the info structures

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index e08f5e7f5fcfce81e09f0fba94f72e1edfe9a77d..21b9ae33bec1710ed9ffcbf4415928060832e771 100644 (file)
--- 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 * );
 
 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;
 
 
 using namespace TagLib;
 

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index d464118cf39546367c4975b544bcce1847c1cab1..ae4c1e6c2fd409be39c727bd25080367567f1de0 100644 (file)
--- 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"
 
                         "%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 );
     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
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 2bad9137332ba27e6362054067caa2b03d0f87cb..fdaf8df89b686042544dfbe31e94c2964beb871c 100644 (file)
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -57,55 +57,55 @@
     "open." )
 #endif
 
     "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
 #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
 #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 e65baeffac1f7956ae423b73813f98b6af3fe1a8..2f36f99eb08ab9f91dded097aca96655ef81a2cc 100644 (file)
--- 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") };
 
   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 );
 
     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 );
 
     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 0131015c878ec04ac7addbd4f9ca34aa85515b9a..2543935851e5faaca65b8ccf19bf1d5879775002 100644 (file)
--- 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." )
 
     "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 );
         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;
 
 
 static vlc_mutex_t gnutls_mutex = VLC_STATIC_MUTEX;
 

diff --git a/modules/misc/gtk_main.c b/modules/misc/gtk_main.c
index cfbfa4d1f205dd00384180ccd23ea4cf326e41f6..4941138831dea7bc34b8d347fffccb8bc36b2c0c 100644 (file)
--- 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
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
+vlc_module_begin ()

     int i_cap;
     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;
 #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;
 #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;
 #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;
 #elif defined(MODULE_NAME_IS_gnome2_main)
     i_cap = 105;

-    add_shortcut( "gtk2" );
-    add_shortcut( "gnome2" );
+    add_shortcut( "gtk2" )
+    add_shortcut( "gnome2" )

 #endif
 #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;
 
 
 static vlc_mutex_t gtk_lock = VLC_STATIC_MUTEX;
 

diff --git a/modules/misc/inhibit.c b/modules/misc/inhibit.c
index b50d8e95acc0a744363bd9c03c81ccf4704d997b..2fe1dd602cfa837f2d75a311bd9ac2aa0ed9d741 100644 (file)
--- a/modules/misc/inhibit.c
+++ b/modules/misc/inhibit.c
@@ -62,11 +62,11 @@ struct intf_sys_t
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * 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
 
 /*****************************************************************************
  * Activate: initialize and create stuff

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index e56e81bd8d46653cfe277944bad72e7e396dc12d..9fce6b9452429e9c796a767aaab486811431693a 100644 (file)
--- 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
 
   "\"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 );
 
     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 );
 
     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
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index dcf87b12f5618039161c3f2e02851e322f1388a2..7e9c701ee42513ede3f78eba053cc639f83d208f 100644 (file)
--- 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: '[\"<interface module name>\"] = { <option> = <value>, ...}, ...'.")
 
 #define CONFIG_TEXT N_("Lua interface configuration")
 #define CONFIG_LONGTEXT N_("Lua interface configuration string. Format is: '[\"<interface module name>\"] = { <option> = <value>, ...}, ...'.")
 

-vlc_module_begin();
-        set_shortname( N_( "Lua Art" ) );
-        set_description( N_("Fetch artwork using lua scripts") );
-        set_capability( "art finder", 10 );
-        set_callbacks( FindArt, NULL );
-
-    add_submodule();
-        add_shortcut( "luaplaylist" );
-        set_category( CAT_INPUT );
-        set_subcategory( SUBCAT_INPUT_DEMUX );
-        set_shortname( N_("Lua Playlist") );
-        set_description( N_("Lua Playlist Parser Interface") );
-        set_capability( "demux", 2 );
-        set_callbacks( Import_LuaPlaylist, Close_LuaPlaylist );
-
-    add_submodule();
-        add_shortcut( "luaintf" );
-        add_shortcut( "luarc" );
-        /* add_shortcut( "rc" ); */
-        add_shortcut( "luahotkeys" );
-        /* add_shortcut( "hotkeys" ); */
-        add_shortcut( "luatelnet" );
-        /* add_shortcut( "telnet" ); */
-        add_shortcut( "luahttp" );
-        /* add_shortcut( "http" ); */
-        set_description( N_("Lua Interface Module") );
-        set_capability( "interface", 0 );
+vlc_module_begin ()
+        set_shortname( N_( "Lua Art" ) )
+        set_description( N_("Fetch artwork using lua scripts") )
+        set_capability( "art finder", 10 )
+        set_callbacks( FindArt, NULL )
+
+    add_submodule ()
+        add_shortcut( "luaplaylist" )
+        set_category( CAT_INPUT )
+        set_subcategory( SUBCAT_INPUT_DEMUX )
+        set_shortname( N_("Lua Playlist") )
+        set_description( N_("Lua Playlist Parser Interface") )
+        set_capability( "demux", 2 )
+        set_callbacks( Import_LuaPlaylist, Close_LuaPlaylist )
+
+    add_submodule ()
+        add_shortcut( "luaintf" )
+        add_shortcut( "luarc" )
+        /* add_shortcut( "rc" ) */
+        add_shortcut( "luahotkeys" )
+        /* add_shortcut( "hotkeys" ) */
+        add_shortcut( "luatelnet" )
+        /* add_shortcut( "telnet" ) */
+        add_shortcut( "luahttp" )
+        /* add_shortcut( "http" ) */
+        set_description( N_("Lua Interface Module") )
+        set_capability( "interface", 0 )

         add_string( "lua-intf", "dummy", NULL,
                     INTF_TEXT, INTF_LONGTEXT, false );
         add_string( "lua-config", "", NULL,
                     CONFIG_TEXT, CONFIG_LONGTEXT, false );
         add_string( "lua-intf", "dummy", NULL,
                     INTF_TEXT, INTF_LONGTEXT, false );
         add_string( "lua-config", "", NULL,
                     CONFIG_TEXT, CONFIG_LONGTEXT, false );

-        set_callbacks( Open_LuaIntf, Close_LuaIntf );
-vlc_module_end();
+        set_callbacks( Open_LuaIntf, Close_LuaIntf )
+vlc_module_end ()

 
 /*****************************************************************************
  *
 
 /*****************************************************************************
  *

diff --git a/modules/misc/memcpy/memcpy.c b/modules/misc/memcpy/memcpy.c
index 90790220be4f773c9a67b4c09e10d6c9e35b3d2c..cae7f2fb7e511e2a7954e4af7c3d9578d4675539 100644 (file)
--- a/modules/misc/memcpy/memcpy.c
+++ b/modules/misc/memcpy/memcpy.c
@@ -75,32 +75,32 @@ static int Activate ( vlc_object_t *p_this )
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_category( CAT_ADVANCED );
-    set_subcategory( SUBCAT_ADVANCED_MISC );
+vlc_module_begin ()
+    set_category( CAT_ADVANCED )
+    set_subcategory( SUBCAT_ADVANCED_MISC )

 #ifdef MODULE_NAME_IS_memcpy
 #ifdef MODULE_NAME_IS_memcpy

-    set_description( N_("libc memcpy") );
-    add_shortcut( "c" );
-    add_shortcut( "libc" );
+    set_description( N_("libc memcpy") )
+    add_shortcut( "c" )
+    add_shortcut( "libc" )

 #elif defined( MODULE_NAME_IS_memcpy3dn )
 #elif defined( MODULE_NAME_IS_memcpy3dn )

-    set_description( N_("3D Now! memcpy") );
-    add_requirement( 3DNOW );
-    add_shortcut( "3dn" );
-    add_shortcut( "3dnow" );
-    add_shortcut( "memcpy3dn" );
-    add_shortcut( "memcpy3dnow" );
+    set_description( N_("3D Now! memcpy") )
+    add_requirement( 3DNOW )
+    add_shortcut( "3dn" )
+    add_shortcut( "3dnow" )
+    add_shortcut( "memcpy3dn" )
+    add_shortcut( "memcpy3dnow" )

 #elif defined( MODULE_NAME_IS_memcpymmx )
 #elif defined( MODULE_NAME_IS_memcpymmx )

-    set_description( N_("MMX memcpy") );
-    add_requirement( MMX );
-    add_shortcut( "mmx" );
-    add_shortcut( "memcpymmx" );
+    set_description( N_("MMX memcpy") )
+    add_requirement( MMX )
+    add_shortcut( "mmx" )
+    add_shortcut( "memcpymmx" )

 #elif defined( MODULE_NAME_IS_memcpymmxext )
 #elif defined( MODULE_NAME_IS_memcpymmxext )

-    set_description( N_("MMX EXT memcpy") );
-    add_requirement( MMXEXT );
-    add_shortcut( "mmxext" );
-    add_shortcut( "memcpymmxext" );
+    set_description( N_("MMX EXT memcpy") )
+    add_requirement( MMXEXT )
+    add_shortcut( "mmxext" )
+    add_shortcut( "memcpymmxext" )

 #endif
 #endif

-    set_capability( "memcpy", PRIORITY );
-    set_callbacks( Activate, NULL );
-vlc_module_end();
+    set_capability( "memcpy", PRIORITY )
+    set_callbacks( Activate, NULL )
+vlc_module_end ()

 
 

diff --git a/modules/misc/memcpy/memcpyaltivec.c b/modules/misc/memcpy/memcpyaltivec.c
index d1c7fb5404dd52e38914d4f283846900c2248ec8..2f75063ea31f4fd157c3e02faa24d04b2e4a387f 100644 (file)
--- a/modules/misc/memcpy/memcpyaltivec.c
+++ b/modules/misc/memcpy/memcpyaltivec.c
@@ -55,15 +55,15 @@ static int Activate ( vlc_object_t *p_this )
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("AltiVec memcpy") );
-    set_category( CAT_ADVANCED );
-    set_subcategory( SUBCAT_ADVANCED_MISC );
-    add_requirement( ALTIVEC );
-    set_capability( "memcpy", 100 );
-    set_callbacks( Activate, NULL );
-    add_shortcut( "altivec" );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("AltiVec memcpy") )
+    set_category( CAT_ADVANCED )
+    set_subcategory( SUBCAT_ADVANCED_MISC )
+    add_requirement( ALTIVEC )
+    set_capability( "memcpy", 100 )
+    set_callbacks( Activate, NULL )
+    add_shortcut( "altivec" )
+vlc_module_end ()

 
 #else
 typedef unsigned long size_t;
 
 #else
 typedef unsigned long size_t;

diff --git a/modules/misc/notify/growl.m b/modules/misc/notify/growl.m
index 53c6a4e82534735e04be399c4f780ad7e5f8f3d1..157ceee4e1b25b0a505d9d961e9b3748a54f8cdd 100644 (file)
--- a/modules/misc/notify/growl.m
+++ b/modules/misc/notify/growl.m
@@ -89,14 +89,14 @@ static CFDataRef readFile(const char *);
  * Module descriptor
  ****************************************************************************/
 
  * Module descriptor
  ****************************************************************************/
 

-vlc_module_begin();
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_shortname( "Growl" );
-    set_description( N_("Growl Notification Plugin") );
-    set_capability( "interface", 0 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_CONTROL )
+    set_shortname( "Growl" )
+    set_description( N_("Growl Notification Plugin") )
+    set_capability( "interface", 0 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Open: initialize and create stuff
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/misc/notify/growl_udp.c b/modules/misc/notify/growl_udp.c
index 565b5bb30c8260c9a563a978b582d621a9dbaf5e..ea6e1c5a4f05c8935119f83f8694f583d2d66b15 100644 (file)
--- a/modules/misc/notify/growl_udp.c
+++ b/modules/misc/notify/growl_udp.c
@@ -66,11 +66,11 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset );
 #define PORT_TEXT N_("UDP port")
 #define PORT_LONGTEXT N_("Growl UDP port on the Growl server.")
 
 #define PORT_TEXT N_("UDP port")
 #define PORT_LONGTEXT N_("Growl UDP port on the Growl server.")
 

-vlc_module_begin();
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_shortname( "Growl-UDP" );
-    set_description( N_("Growl UDP Notification Plugin") );
+vlc_module_begin ()
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_CONTROL )
+    set_shortname( "Growl-UDP" )
+    set_description( N_("Growl UDP Notification Plugin") )

 
     add_string( "growl-server", SERVER_DEFAULT, NULL,
                 SERVER_TEXT, SERVER_LONGTEXT, false );
 
     add_string( "growl-server", SERVER_DEFAULT, NULL,
                 SERVER_TEXT, SERVER_LONGTEXT, false );


@@ -79,9 +79,9 @@ vlc_module_begin();
     add_integer( "growl-port", 9887, NULL,
                 PORT_TEXT, PORT_LONGTEXT, true );
 
     add_integer( "growl-port", 9887, NULL,
                 PORT_TEXT, PORT_LONGTEXT, 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
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/misc/notify/msn.c b/modules/misc/notify/msn.c
index 0a2db77cb0e7142378112ed55e5163265b846bb0..a609cb452af237a216ec06e041f0cb6c35c53c36 100644 (file)
--- a/modules/misc/notify/msn.c
+++ b/modules/misc/notify/msn.c
@@ -68,18 +68,18 @@ static int SendToMSN( const char * psz_msg );
 #define FORMAT_LONGTEXT N_("Format of the string to send to MSN " \
 "{0} Artist, {1} Title, {2} Album. Defaults to \"Artist - Title\" ({0} - {1}).")
 
 #define FORMAT_LONGTEXT N_("Format of the string to send to MSN " \
 "{0} Artist, {1} Title, {2} Album. Defaults to \"Artist - Title\" ({0} - {1}).")
 

-vlc_module_begin();
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_shortname( "MSN" );
-    set_description( N_("MSN Now-Playing") );
+vlc_module_begin ()
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_CONTROL )
+    set_shortname( "MSN" )
+    set_description( N_("MSN Now-Playing") )

 
     add_string( "msn-format", FORMAT_DEFAULT, NULL,
                 FORMAT_TEXT, FORMAT_LONGTEXT, false );
 
 
     add_string( "msn-format", FORMAT_DEFAULT, NULL,
                 FORMAT_TEXT, FORMAT_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
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index f1bcf9a1f48f305e5f3067acb68cb9ffe34bc9ca..f812c4a61a1524fa0bb35f3c682375fabba3fc5c 100644 (file)
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -64,18 +64,18 @@ struct intf_sys_t
 #define TIMEOUT_TEXT N_("Timeout (ms)")
 #define TIMEOUT_LONGTEXT N_("How long the notification will be displayed ")
 
 #define TIMEOUT_TEXT N_("Timeout (ms)")
 #define TIMEOUT_LONGTEXT N_("How long the notification will be displayed ")
 

-vlc_module_begin();
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_shortname( N_( "Notify" ) );
-    set_description( N_("LibNotify Notification Plugin") );
+vlc_module_begin ()
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_CONTROL )
+    set_shortname( N_( "Notify" ) )
+    set_description( N_("LibNotify Notification Plugin") )

 
     add_integer( "notify-timeout", 4000,NULL,
                 TIMEOUT_TEXT, TIMEOUT_LONGTEXT, true );
 
 
     add_integer( "notify-timeout", 4000,NULL,
                 TIMEOUT_TEXT, TIMEOUT_LONGTEXT, 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
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/misc/notify/telepathy.c b/modules/misc/notify/telepathy.c
index 0795bb6cfe454a9db6d5d398509275b6c3623a66..32b9e80802f735602e00eb9a6c29242fa858c21a 100644 (file)
--- a/modules/misc/notify/telepathy.c
+++ b/modules/misc/notify/telepathy.c
@@ -74,18 +74,18 @@ static int SendToTelepathy( intf_thread_t *, const char * );
 "$I Video Title, $L Time Remaining, $N Name, $O Audio language, $P Position, " \
 "$R Rate, $S Sample rate, $T Time elapsed, $U Publisher, $V Volume")
 
 "$I Video Title, $L Time Remaining, $N Name, $O Audio language, $P Position, " \
 "$R Rate, $S Sample rate, $T Time elapsed, $U Publisher, $V Volume")
 

-vlc_module_begin();
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_shortname( "Telepathy" );
-    set_description( N_("Telepathy \"Now Playing\" using MissionControl") );
+vlc_module_begin ()
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_CONTROL )
+    set_shortname( "Telepathy" )
+    set_description( N_("Telepathy \"Now Playing\" using MissionControl") )

 
     add_string( "telepathy-format", FORMAT_DEFAULT, NULL,
                 FORMAT_TEXT, FORMAT_LONGTEXT, false );
 
 
     add_string( "telepathy-format", FORMAT_DEFAULT, NULL,
                 FORMAT_TEXT, FORMAT_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
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/misc/notify/xosd.c b/modules/misc/notify/xosd.c
index 13c37582dc61cab82ff0254aad45e261e2d28738..0b7615da9715075bab95f170a38b792e4a037701 100644 (file)
--- a/modules/misc/notify/xosd.c
+++ b/modules/misc/notify/xosd.c
@@ -83,13 +83,13 @@ static int PlaylistNext( vlc_object_t *p_this, const char *psz_variable,
 #define COLOUR_TEXT N_("Color")
 #define COLOUR_LONGTEXT N_("Color used to display text in the XOSD output.")
 
 #define COLOUR_TEXT N_("Color")
 #define COLOUR_LONGTEXT N_("Color used to display text in the XOSD output.")
 

-vlc_module_begin();
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_description( N_("XOSD interface") );
-    set_shortname( "XOSD" );
-    add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, true );
-    add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, true );
+vlc_module_begin ()
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_CONTROL )
+    set_description( N_("XOSD interface") )
+    set_shortname( "XOSD" )
+    add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, true )
+    add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, true )

     add_integer( "xosd-shadow-offset", 2, NULL,
                  SHD_OFS_TEXT, SHD_OFS_LONGTEXT, true );
     add_string( "xosd-font",
     add_integer( "xosd-shadow-offset", 2, NULL,
                  SHD_OFS_TEXT, SHD_OFS_LONGTEXT, true );
     add_string( "xosd-font",


@@ -97,9 +97,9 @@ vlc_module_begin();
                 NULL, FONT_TEXT, FONT_LONGTEXT, true );
     add_string( "xosd-colour", "LawnGreen",
                     NULL, COLOUR_TEXT, COLOUR_LONGTEXT, true );
                 NULL, FONT_TEXT, FONT_LONGTEXT, true );
     add_string( "xosd-colour", "LawnGreen",
                     NULL, COLOUR_TEXT, COLOUR_LONGTEXT, true );

-    set_capability( "interface", 10 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_capability( "interface", 10 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Open: initialize and create stuff
 
 /*****************************************************************************
  * Open: initialize and create stuff

diff --git a/modules/misc/osd/parser.c b/modules/misc/osd/parser.c
index 39918d8e9f4a7717d7562912a843739c4a76b443..48d21c00b125eb19c410b8178999e78df8ce2a45 100644 (file)
--- a/modules/misc/osd/parser.c
+++ b/modules/misc/osd/parser.c
@@ -51,24 +51,24 @@ static void osd_parser_Close( vlc_object_t *p_this );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
+vlc_module_begin ()

 
 

-    set_category( CAT_OSD );
-    set_subcategory( SUBCAT_OSD_IMPORT );
+    set_category( CAT_OSD )
+    set_subcategory( SUBCAT_OSD_IMPORT )

 
 

-    add_submodule();
-        set_description( N_("OSD configuration importer") );
-        add_shortcut( "import-osd" );
-        set_capability( "osd parser", 0);
-        set_callbacks( osd_parser_simpleOpen, osd_parser_Close );
+    add_submodule ()
+        set_description( N_("OSD configuration importer") )
+        add_shortcut( "import-osd" )
+        set_capability( "osd parser", 0)
+        set_callbacks( osd_parser_simpleOpen, osd_parser_Close )

 
 

-    add_submodule();
-        set_description( N_("XML OSD configuration importer") );
-        add_shortcut( "import-osd-xml" );
-        set_capability( "osd parser", 0);
-        set_callbacks( osd_parser_xmlOpen, osd_parser_Close );
+    add_submodule ()
+        set_description( N_("XML OSD configuration importer") )
+        add_shortcut( "import-osd-xml" )
+        set_capability( "osd parser", 0)
+        set_callbacks( osd_parser_xmlOpen, osd_parser_Close )

 
 

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * osd_parser_Close: Free all osd menu structure resources
 
 /*****************************************************************************
  * osd_parser_Close: Free all osd menu structure resources

diff --git a/modules/misc/playlist/export.c b/modules/misc/playlist/export.c
index 7b05a4c7cecbf90728983b7d55079242440681da..7ca77f0011163b00c38f1fc32687912756a760a4 100644 (file)
--- a/modules/misc/playlist/export.c
+++ b/modules/misc/playlist/export.c
@@ -42,32 +42,32 @@ int xspf_export_playlist( vlc_object_t *p_intf );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
+vlc_module_begin ()

 
 

-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_EXPORT );
-    add_submodule();
-        set_description( N_("M3U playlist exporter") );
-        add_shortcut( "export-m3u" );
-        set_capability( "playlist export" , 0 );
-        set_callbacks( Export_M3U , NULL );
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_EXPORT )
+    add_submodule ()
+        set_description( N_("M3U playlist exporter") )
+        add_shortcut( "export-m3u" )
+        set_capability( "playlist export" , 0 )
+        set_callbacks( Export_M3U , NULL )

 
 

-    add_submodule();
-        set_description( N_("Old playlist exporter") );
-        add_shortcut( "export-old" );
-        set_capability( "playlist export" , 0 );
-        set_callbacks( Export_Old , NULL );
+    add_submodule ()
+        set_description( N_("Old playlist exporter") )
+        add_shortcut( "export-old" )
+        set_capability( "playlist export" , 0 )
+        set_callbacks( Export_Old , NULL )

 
 

-    add_submodule();
-        set_description( N_("XSPF playlist export") );
-        add_shortcut( "export-xspf" );
-        set_capability( "playlist export" , 0 );
-        set_callbacks( xspf_export_playlist , NULL );
+    add_submodule ()
+        set_description( N_("XSPF playlist export") )
+        add_shortcut( "export-xspf" )
+        set_capability( "playlist export" , 0 )
+        set_callbacks( xspf_export_playlist , NULL )

 
 

-    add_submodule();
-        set_description( N_("HTML playlist export") );
-        add_shortcut( "export-html" );
-        set_capability( "playlist export", 0 );
-        set_callbacks( Export_HTML, NULL );
+    add_submodule ()
+        set_description( N_("HTML playlist export") )
+        add_shortcut( "export-html" )
+        set_capability( "playlist export", 0 )
+        set_callbacks( Export_HTML, NULL )

 
 

-vlc_module_end();
+vlc_module_end ()

diff --git a/modules/misc/probe/hal.c b/modules/misc/probe/hal.c
index 29c6c776d536b3500cc3e4f76914c2ce14fdd3d6..28fec81fd46e76804e1af8d8b68ddf920a110cca 100644 (file)
--- a/modules/misc/probe/hal.c
+++ b/modules/misc/probe/hal.c
@@ -54,11 +54,11 @@ static device_t * ParseDisc( device_probe_t *p_probe,  char *psz_device );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("HAL devices detection") );
-    set_capability( "devices probe", 0 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("HAL devices detection") )
+    set_capability( "devices probe", 0 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/misc/qte_main.cpp b/modules/misc/qte_main.cpp
index 550eaf30f81c553df418343a7d6719cc2a969acd..05ab4b4290418d013b99e5a5591d4525582c4e74 100644 (file)
--- a/modules/misc/qte_main.cpp
+++ b/modules/misc/qte_main.cpp
@@ -72,13 +72,13 @@ static qte_thread_t * p_qte_main = NULL;
     "Qt/Embedded GUI Server. This option is equivalent to the -qws option " \
     "from normal Qt.")
 
     "Qt/Embedded GUI Server. This option is equivalent to the -qws option " \
     "from normal Qt.")
 

-vlc_module_begin();
-    set_description( N_("Qt Embedded GUI helper") );
-    set_capability( "gui-helper", 90 );
-    add_bool( "qte-guiserver", 0, NULL, STANDALONE_TEXT, STANDALONE_LONGTEXT, false );
-    add_shortcut( "qte" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Qt Embedded GUI helper") )
+    set_capability( "gui-helper", 90 )
+    add_bool( "qte-guiserver", 0, NULL, STANDALONE_TEXT, STANDALONE_LONGTEXT, false )
+    add_shortcut( "qte" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 } /* extern "C" */
 
 
 } /* extern "C" */
 

diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
index e0c6cb40e0f5d99369fcf4577ccffd87a5392408..b9f1f36ca95d3f27290d2716629d03cd9ece58c3 100644 (file)
--- a/modules/misc/quartztext.c
+++ b/modules/misc/quartztext.c
@@ -108,11 +108,11 @@ static const int pi_sizes[] = { 20, 18, 16, 12, 6 };
 static const char *const ppsz_sizes_text[] = {
     N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"), N_("Larger") };
 
 static const char *const ppsz_sizes_text[] = {
     N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"), N_("Larger") };
 

-vlc_module_begin();
-    set_shortname( N_("Mac Text renderer"));
-    set_description( N_("Quartz font renderer") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
+vlc_module_begin ()
+    set_shortname( N_("Mac Text renderer"))
+    set_description( N_("Quartz font renderer") )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC )

 
     add_string( "quartztext-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
               false );
 
     add_string( "quartztext-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
               false );


@@ -122,10 +122,10 @@ vlc_module_begin();
     add_integer( "quartztext-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false );
         change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
     add_integer( "quartztext-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false );
         change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );

-    set_capability( "text renderer", 150 );
-    add_shortcut( "text" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_capability( "text renderer", 150 )
+    add_shortcut( "text" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 typedef struct offscreen_bitmap_t offscreen_bitmap_t;
 struct offscreen_bitmap_t
 
 typedef struct offscreen_bitmap_t offscreen_bitmap_t;
 struct offscreen_bitmap_t

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index 048b864f50b4ca43c0d8bf79bd93acc58b68e1a9..5583c6499fd6205be3d33632ae6eb8e4801ceefb 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -79,22 +79,22 @@ static void Close( vlc_object_t * );
     "the timeout option entirely. This is needed by some IPTV STBs (such as " \
     "those made by HansunTech) which get confused by it. The default is 5." )
 
     "the timeout option entirely. This is needed by some IPTV STBs (such as " \
     "those made by HansunTech) which get confused by it. The default is 5." )
 

-vlc_module_begin();
-    set_shortname( N_("RTSP VoD" ) );
-    set_description( N_("RTSP VoD server") );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_VOD );
-    set_capability( "vod server", 1 );
-    set_callbacks( Open, Close );
-    add_shortcut( "rtsp" );
-    add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true );
+vlc_module_begin ()
+    set_shortname( N_("RTSP VoD" ) )
+    set_description( N_("RTSP VoD server") )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_VOD )
+    set_capability( "vod server", 1 )
+    set_callbacks( Open, Close )
+    add_shortcut( "rtsp" )
+    add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )

     add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT,
                 RAWMUX_TEXT, true );
     add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT,
                                            THROTLE_LONGTEXT, true );
     add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
                  SESSION_TIMEOUT_LONGTEXT, true );
     add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT,
                 RAWMUX_TEXT, true );
     add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT,
                                            THROTLE_LONGTEXT, true );
     add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
                  SESSION_TIMEOUT_LONGTEXT, true );

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 47b2725a3b637cec3e8066aeed95a846fd46dd83..62525b9f17e64676aa080e208fbc3a66af73385a 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -84,11 +84,11 @@ struct intf_sys_t
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("X Screensaver disabler") );
-    set_capability( "interface", 0 );
-    set_callbacks( Activate, Deactivate );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("X Screensaver disabler") )
+    set_capability( "interface", 0 )
+    set_callbacks( Activate, Deactivate )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: initialize and create stuff
 
 /*****************************************************************************
  * Activate: initialize and create stuff

diff --git a/modules/misc/stats/stats.c b/modules/misc/stats/stats.c
index fe78b7c5f18664a2a2ae670013ed5bea4774bc3c..23232524342c81caf2e48b15ff0a5ad411c435b6 100644 (file)
--- a/modules/misc/stats/stats.c
+++ b/modules/misc/stats/stats.c
@@ -44,26 +44,26 @@
  * Module descriptor
  *****************************************************************************/
 
  * Module descriptor
  *****************************************************************************/
 

-vlc_module_begin();
-    set_shortname( _("Stats"));
-    set_description( _("Stats encoder function") );
-    set_capability( "encoder", 0 );
-    add_shortcut( "stats" );
-    set_callbacks( OpenEncoder, CloseEncoder );
-    add_submodule();
-        set_section( N_( "Stats decoder" ), NULL );
-        set_description( _("Stats decoder function") );
-        set_capability( "decoder", 0 );
-        set_callbacks( OpenDecoder, CloseDecoder );
-    add_submodule();
-        set_section( N_( "Stats demux" ), NULL );
-        set_description( _("Stats demux function") );
-        set_capability( "demux", 0 );
-        set_callbacks( OpenDemux, CloseDemux );
-    add_submodule();
-        set_section( N_( "Stats video output" ), NULL );
-        set_description( _("Stats video output function") );
-        set_capability( "video output", 0 );
-        set_callbacks( OpenVideo, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( _("Stats"))
+    set_description( _("Stats encoder function") )
+    set_capability( "encoder", 0 )
+    add_shortcut( "stats" )
+    set_callbacks( OpenEncoder, CloseEncoder )
+    add_submodule ()
+        set_section( N_( "Stats decoder" ), NULL )
+        set_description( _("Stats decoder function") )
+        set_capability( "decoder", 0 )
+        set_callbacks( OpenDecoder, CloseDecoder )
+    add_submodule ()
+        set_section( N_( "Stats demux" ), NULL )
+        set_description( _("Stats demux function") )
+        set_capability( "demux", 0 )
+        set_callbacks( OpenDemux, CloseDemux )
+    add_submodule ()
+        set_section( N_( "Stats video output" ), NULL )
+        set_description( _("Stats video output function") )
+        set_capability( "video output", 0 )
+        set_callbacks( OpenVideo, NULL )
+vlc_module_end ()

 
 

diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index 5841aebaf4a0e0629777af82cecfcfcbe2d73250..aaa94c896e3f11eb84406253a024b653dc32b1f8 100644 (file)
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -71,14 +71,14 @@ static char *svg_GetTemplate( vlc_object_t *p_this );
 #define TEMPLATE_LONGTEXT N_( "Location of a file holding a SVG template "\
         "for automatic string conversion" )
 
 #define TEMPLATE_LONGTEXT N_( "Location of a file holding a SVG template "\
         "for automatic string conversion" )
 

-vlc_module_begin();
- set_category( CAT_INPUT);
- set_category( SUBCAT_INPUT_SCODEC );
- set_capability( "text renderer", 99 );
- add_shortcut( "svg" );
- add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+ set_category( CAT_INPUT)
+ set_category( SUBCAT_INPUT_SCODEC )
+ set_capability( "text renderer", 99 )
+ add_shortcut( "svg" )
+ add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /**
    Describes a SVG string to be displayed on the video
 
 /**
    Describes a SVG string to be displayed on the video

diff --git a/modules/misc/testsuite/test1.c b/modules/misc/testsuite/test1.c
index 6c54cfae3ef28a69e8d7567929d52275ae75bcf1..1cf69bc17c3b44ce95069c41636137b00fb916b8 100644 (file)
--- a/modules/misc/testsuite/test1.c
+++ b/modules/misc/testsuite/test1.c
@@ -34,7 +34,7 @@
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("C module that does nothing") );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("C module that does nothing") )
+vlc_module_end ()

 
 

diff --git a/modules/misc/testsuite/test2.cpp b/modules/misc/testsuite/test2.cpp
index 63fb6ae0f7ad99422b90a6ea25891c5ee1fe0cc7..b616c220fdcf986fb3a480426027b46bfa89a3cc 100644 (file)
--- a/modules/misc/testsuite/test2.cpp
+++ b/modules/misc/testsuite/test2.cpp
@@ -36,10 +36,10 @@
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/

-vlc_module_begin();
+vlc_module_begin ()

     /* Minimal C++ usage */
     std::string description = "C++ module that does nothing";
     /* Minimal C++ usage */
     std::string description = "C++ module that does nothing";

-    set_description( (char*)_( description.c_str() ) );
-vlc_module_end();
+    set_description( (char*)_( description.c_str() ) )
+vlc_module_end ()

 
 
 
 

diff --git a/modules/misc/testsuite/test3.m b/modules/misc/testsuite/test3.m
index b593b66cde39283e226e2e13479bef8462cf752e..cc7e570a777d80f5da6c20f3539d399ff93a4f33 100644 (file)
--- a/modules/misc/testsuite/test3.m
+++ b/modules/misc/testsuite/test3.m
@@ -52,8 +52,8 @@
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_([Desc ription]) );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_([Desc ription]) )
+vlc_module_end ()

 
 
 
 

diff --git a/modules/misc/testsuite/test4.c b/modules/misc/testsuite/test4.c
index 091de4618b8731b3a955c268438eb97557822f4b..56fad6d91dc49240257f9d815e2972558fc43ce3 100644 (file)
--- a/modules/misc/testsuite/test4.c
+++ b/modules/misc/testsuite/test4.c
@@ -63,8 +63,8 @@ static int    Signal    ( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Miscellaneous stress tests") );
+vlc_module_begin ()
+    set_description( N_("Miscellaneous stress tests") )

     var_Create( p_module->p_libvlc, "foo-test",
                 VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
     var_AddCallback( p_module->p_libvlc, "foo-test", Foo, NULL );
     var_Create( p_module->p_libvlc, "foo-test",
                 VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
     var_AddCallback( p_module->p_libvlc, "foo-test", Foo, NULL );


@@ -77,7 +77,7 @@ vlc_module_begin();
     var_Create( p_module->p_libvlc, "signal",
                 VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
     var_AddCallback( p_module->p_libvlc, "signal", Signal, NULL );
     var_Create( p_module->p_libvlc, "signal",
                 VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
     var_AddCallback( p_module->p_libvlc, "signal", Signal, NULL );

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Foo: put anything here
 
 /*****************************************************************************
  * Foo: put anything here

diff --git a/modules/misc/win32text.c b/modules/misc/win32text.c
index 9c16c12c70e58c581d0905fa3481176591969b23..b82e2a0df68c5da5f7563f6a5eb726a65ea9c89d 100644 (file)
--- a/modules/misc/win32text.c
+++ b/modules/misc/win32text.c
@@ -88,11 +88,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") };
 
   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_("Win32 font renderer") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
+vlc_module_begin ()
+    set_shortname( N_("Text renderer"))
+    set_description( N_("Win32 font renderer") )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC )

 
     add_integer( "win32text-fontsize", 0, NULL, FONTSIZE_TEXT,
                  FONTSIZE_LONGTEXT, true );
 
     add_integer( "win32text-fontsize", 0, NULL, FONTSIZE_TEXT,
                  FONTSIZE_LONGTEXT, true );


@@ -110,10 +110,10 @@ vlc_module_begin();
                  FONTSIZER_LONGTEXT, false );
         change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
 
                  FONTSIZER_LONGTEXT, false );
         change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
 

-    set_capability( "text renderer", 50 );
-    add_shortcut( "text" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_capability( "text renderer", 50 )
+    add_shortcut( "text" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * filter_sys_t: win32text local data
 
 /*****************************************************************************
  * filter_sys_t: win32text local data

diff --git a/modules/misc/xml/libxml.c b/modules/misc/xml/libxml.c
index 1b25a828c54b221ff0db7c0bc3b800b77a576426..f4bad582767dc51396df6164b260d486c9fd9f6b 100644 (file)
--- a/modules/misc/xml/libxml.c
+++ b/modules/misc/xml/libxml.c
@@ -41,11 +41,11 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("XML Parser (using libxml2)") );
-    set_capability( "xml", 10 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("XML Parser (using libxml2)") )
+    set_capability( "xml", 10 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 struct xml_reader_sys_t
 {
 
 struct xml_reader_sys_t
 {

diff --git a/modules/misc/xml/xtag.c b/modules/misc/xml/xtag.c
index 602c4e5a9ac49023ba927ab21bad82b810bb576d..e59a1c125ded33de7eab3e9be07ab313c4858e7b 100644 (file)
--- a/modules/misc/xml/xtag.c
+++ b/modules/misc/xml/xtag.c
@@ -87,11 +87,11 @@ typedef struct _XTagParser
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Simple XML Parser") );
-    set_capability( "xml", 5 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Simple XML Parser") )
+    set_capability( "xml", 5 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 struct xml_reader_sys_t
 {
 
 struct xml_reader_sys_t
 {

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index fbcc6081fd3dfa6bd2636d5e522b5b11d9041260..d9cd5a3eba2b176d6135b0191081ef4b369bf68d 100644 (file)
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -65,16 +65,16 @@ static void Close  ( vlc_object_t * );
 #define BITRATE_LONGTEXT N_("Do not try to guess ASF bitrate. Setting this, allows you to control how Windows Media Player will cache streamed content. Set to audio+video bitrate in bytes")
 
 
 #define BITRATE_LONGTEXT N_("Do not try to guess ASF bitrate. Setting this, allows you to control how Windows Media Player will cache streamed content. Set to audio+video bitrate in bytes")
 
 

-vlc_module_begin();
-    set_description( N_("ASF muxer") );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    set_shortname( "ASF" );
+vlc_module_begin ()
+    set_description( N_("ASF muxer") )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    set_shortname( "ASF" )

 
 

-    set_capability( "sout mux", 5 );
-    add_shortcut( "asf" );
-    add_shortcut( "asfh" );
-    set_callbacks( Open, Close );
+    set_capability( "sout mux", 5 )
+    add_shortcut( "asf" )
+    add_shortcut( "asfh" )
+    set_callbacks( Open, Close )

 
     add_string( SOUT_CFG_PREFIX "title", "", NULL, TITLE_TEXT, TITLE_LONGTEXT,
                                  true );
 
     add_string( SOUT_CFG_PREFIX "title", "", NULL, TITLE_TEXT, TITLE_LONGTEXT,
                                  true );


@@ -91,7 +91,7 @@ vlc_module_begin();
     add_integer( SOUT_CFG_PREFIX "bitrate-override", 0, NULL, BITRATE_TEXT,
                                  BITRATE_LONGTEXT, true );
 
     add_integer( SOUT_CFG_PREFIX "bitrate-override", 0, NULL, BITRATE_TEXT,
                                  BITRATE_LONGTEXT, true );
 

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Locales prototypes
 
 /*****************************************************************************
  * Locales prototypes

diff --git a/modules/mux/avi.c b/modules/mux/avi.c
index e12019eb0b8e9de6efe111fc5718c46ba2aef4ff..e70e5ddd892d7ee0e7fbc1fd83a6ac81ed3c361b 100644 (file)
--- a/modules/mux/avi.c
+++ b/modules/mux/avi.c
@@ -43,14 +43,14 @@
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("AVI muxer") );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    set_capability( "sout mux", 5 );
-    add_shortcut( "avi" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("AVI muxer") )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    set_capability( "sout mux", 5 )
+    add_shortcut( "avi" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/mux/dummy.c b/modules/mux/dummy.c
index 56f5e3018c315b7a07785f9f6a0fbf321472ae06..51e11adaa2b2f243ebc53002b31d446da9e7e3c8 100644 (file)
--- a/modules/mux/dummy.c
+++ b/modules/mux/dummy.c
@@ -41,16 +41,16 @@
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Dummy/Raw muxer") );
-    set_capability( "sout mux", 5 );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    add_shortcut( "dummy" );
-    add_shortcut( "raw" );
-    add_shortcut( "es" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Dummy/Raw muxer") )
+    set_capability( "sout mux", 5 )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    add_shortcut( "dummy" )
+    add_shortcut( "raw" )
+    add_shortcut( "es" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index ab8526f98a1113f31d5b3ac141e6727b2ca0b89f..3c93a9c485fb335e96951a27b21d916ddf924dd9 100644 (file)
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -56,21 +56,21 @@ static void Close  ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-mp4-"
 
 
 #define SOUT_CFG_PREFIX "sout-mp4-"
 

-vlc_module_begin();
-    set_description( N_("MP4/MOV muxer") );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    set_shortname( "MP4" );
+vlc_module_begin ()
+    set_description( N_("MP4/MOV muxer") )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    set_shortname( "MP4" )

 
     add_bool( SOUT_CFG_PREFIX "faststart", 1, NULL,
               FASTSTART_TEXT, FASTSTART_LONGTEXT,
               true );
 
     add_bool( SOUT_CFG_PREFIX "faststart", 1, NULL,
               FASTSTART_TEXT, FASTSTART_LONGTEXT,
               true );

-    set_capability( "sout mux", 5 );
-    add_shortcut( "mp4" );
-    add_shortcut( "mov" );
-    add_shortcut( "3gp" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_capability( "sout mux", 5 )
+    add_shortcut( "mp4" )
+    add_shortcut( "mov" )
+    add_shortcut( "3gp" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index 6459c07d4dc48e7f87b4d3a02c3a938718d027b5..a5a062f4a0eaa7f8c399715114986a0c3be699d3 100644 (file)
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -61,22 +61,22 @@ static void    Close  ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-ps-"
 
 
 #define SOUT_CFG_PREFIX "sout-ps-"
 

-vlc_module_begin();
-    set_description( N_("PS muxer") );
-    set_shortname( "MPEG-PS" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    set_capability( "sout mux", 50 );
-    add_shortcut( "ps" );
-    add_shortcut( "mpeg1" );
-    add_shortcut( "dvd" );
-    set_callbacks( Open, Close );
+vlc_module_begin ()
+    set_description( N_("PS muxer") )
+    set_shortname( "MPEG-PS" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    set_capability( "sout mux", 50 )
+    add_shortcut( "ps" )
+    add_shortcut( "mpeg1" )
+    add_shortcut( "dvd" )
+    set_callbacks( Open, Close )

 
     add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT,
                  DTS_LONGTEXT, true );
     add_integer( SOUT_CFG_PREFIX "pes-max-size", PES_PAYLOAD_SIZE_MAX, NULL,
                  PES_SIZE_TEXT, PES_SIZE_LONGTEXT, true );
 
     add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT,
                  DTS_LONGTEXT, true );
     add_integer( SOUT_CFG_PREFIX "pes-max-size", PES_PAYLOAD_SIZE_MAX, NULL,
                  PES_SIZE_TEXT, PES_SIZE_LONGTEXT, true );

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 6afe0c83d54b927b00c60632c03890ad0267d533..80fd15b94e8a00b6bde8a505a052e3d9fdfc202f 100644 (file)
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -188,13 +188,13 @@ static void    Close  ( vlc_object_t * );
 #endif
 #define MAX_PMT_PID 64       /* Maximum pids in each pmt.  FIXME: I just chose an arbitary number. Where is the maximum in the spec? */
 
 #endif
 #define MAX_PMT_PID 64       /* Maximum pids in each pmt.  FIXME: I just chose an arbitary number. Where is the maximum in the spec? */
 

-vlc_module_begin();
-    set_description( N_("TS muxer (libdvbpsi)") );
-    set_shortname( "MPEG-TS");
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    set_capability( "sout mux", 120 );
-    add_shortcut( "ts" );
+vlc_module_begin ()
+    set_description( N_("TS muxer (libdvbpsi)") )
+    set_shortname( "MPEG-TS")
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    set_capability( "sout mux", 120 )
+    add_shortcut( "ts" )

 
     add_integer( SOUT_CFG_PREFIX "pid-video", 0, NULL,VPID_TEXT, VPID_LONGTEXT,
                                   true );
 
     add_integer( SOUT_CFG_PREFIX "pid-video", 0, NULL,VPID_TEXT, VPID_LONGTEXT,
                                   true );


@@ -214,9 +214,9 @@ vlc_module_begin();
                 PMTPROG_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT,
               true );
                 PMTPROG_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT,
               true );

-    add_string( SOUT_CFG_PREFIX "muxpmt", NULL, NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, true );
+    add_string( SOUT_CFG_PREFIX "muxpmt", NULL, NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, true )

 #ifdef HAVE_DVBPSI_SDT
 #ifdef HAVE_DVBPSI_SDT

-    add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true );
+    add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true )

 #endif
     add_bool( SOUT_CFG_PREFIX "alignment", true, NULL, ALIGNMENT_TEXT,
               ALIGNMENT_LONGTEXT, true );
 #endif
     add_bool( SOUT_CFG_PREFIX "alignment", true, NULL, ALIGNMENT_TEXT,
               ALIGNMENT_LONGTEXT, true );


@@ -246,10 +246,10 @@ vlc_module_begin();
                 true );
     add_string( SOUT_CFG_PREFIX "csa-use", "1", NULL, CU_TEXT, CU_LONGTEXT,
                 true );
                 true );
     add_string( SOUT_CFG_PREFIX "csa-use", "1", NULL, CU_TEXT, CU_LONGTEXT,
                 true );

-    add_integer( SOUT_CFG_PREFIX "csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true );
+    add_integer( SOUT_CFG_PREFIX "csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true )

 
 

-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Local data structures
 
 /*****************************************************************************
  * Local data structures

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index 0d53522a5977fde31a1cc9553b116f0e4e86b526..1511373046365afbf98d7e8e9c8a82055706cc28 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -42,16 +42,16 @@ static void Close  ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-mpjpeg-"
 
 
 #define SOUT_CFG_PREFIX "sout-mpjpeg-"
 

-vlc_module_begin();
-    set_shortname( "MPJPEG" );
-    set_description( N_("Multipart JPEG muxer") );
-    set_capability( "sout mux", 5 );
-    add_obsolete_string( SOUT_CFG_PREFIX "separator" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    set_callbacks( Open, Close );
-    add_shortcut( "mpjpeg" );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "MPJPEG" )
+    set_description( N_("Multipart JPEG muxer") )
+    set_capability( "sout mux", 5 )
+    add_obsolete_string( SOUT_CFG_PREFIX "separator" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    set_callbacks( Open, Close )
+    add_shortcut( "mpjpeg" )
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index bc420a24bf3774e6cb343dde602a6e0ecac5d81a..e9dd7212af007d0c2e919258c6d90084d1770a86 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -48,15 +48,15 @@
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Ogg/OGM muxer") );
-    set_capability( "sout mux", 10 );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    add_shortcut( "ogg" );
-    add_shortcut( "ogm" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Ogg/OGM muxer") )
+    set_capability( "sout mux", 10 )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    add_shortcut( "ogg" )
+    add_shortcut( "ogm" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/mux/wav.c b/modules/mux/wav.c
index e1a505db604af26408ee1d513712c200e5edafa5..7a8968f08fa78b657a10657e4dc893476e0af4d7 100644 (file)
--- a/modules/mux/wav.c
+++ b/modules/mux/wav.c
@@ -42,14 +42,14 @@
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("WAV muxer") );
-    set_capability( "sout mux", 5 );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    set_callbacks( Open, Close );
-    add_shortcut( "wav" );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("WAV muxer") )
+    set_capability( "sout mux", 5 )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    set_callbacks( Open, Close )
+    add_shortcut( "wav" )
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index e62ce1bdd250eba1a4f165cb16694d27002d9068..661e406c1458573ddf76391330bc42ae84de52ba 100644 (file)
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -41,13 +41,13 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_PACKETIZER );
-    set_description( N_("Copy packetizer") );
-    set_capability( "packetizer", 1 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_PACKETIZER )
+    set_description( N_("Copy packetizer") )
+    set_capability( "packetizer", 1 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 5ef269a15db4701a284842772feb83dee24f15d5..719805d5f4e35f592f579638b16e47e51d8e95e5 100644 (file)
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -47,13 +47,13 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_PACKETIZER );
-    set_description( N_("H.264 video packetizer") );
-    set_capability( "packetizer", 50 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_PACKETIZER )
+    set_description( N_("H.264 video packetizer") )
+    set_capability( "packetizer", 50 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /****************************************************************************
 
 
 /****************************************************************************

diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index 762268efd7cce30f52c694e1c0e96ef75ffce534..784248048780ea464e7de376eea2e5a9ccbc09d9 100644 (file)
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -176,13 +176,13 @@ static block_t *PacketizeStreamBlock( decoder_t *, block_t ** );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_PACKETIZER );
-    set_description( N_("MPEG4 audio packetizer") );
-    set_capability( "packetizer", 50 );
-    set_callbacks( OpenPacketizer, ClosePacketizer );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_PACKETIZER )
+    set_description( N_("MPEG4 audio packetizer") )
+    set_capability( "packetizer", 50 )
+    set_callbacks( OpenPacketizer, ClosePacketizer )
+vlc_module_end ()

 
 /*****************************************************************************
  * OpenPacketizer: probe the packetizer and return score
 
 /*****************************************************************************
  * OpenPacketizer: probe the packetizer and return score

diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index a7ad59a0fb412d1818ad26f09122f503a8433f19..7f953c35b2e1739cd2cd0ea8c2a8a2ec73536a9f 100644 (file)
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -46,13 +46,13 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_PACKETIZER );
-    set_description( N_("MPEG4 video packetizer") );
-    set_capability( "packetizer", 50 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_PACKETIZER )
+    set_description( N_("MPEG4 video packetizer") )
+    set_capability( "packetizer", 50 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /****************************************************************************
  * Local prototypes
 
 /****************************************************************************
  * Local prototypes

diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c
index 4b1545c32b833b5a529a23871dbfe738a4a3ec46..0296da5265ab2850f4ef7e1b718ef0440868a9b6 100644 (file)
--- a/modules/packetizer/mpegvideo.c
+++ b/modules/packetizer/mpegvideo.c
@@ -64,16 +64,16 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_PACKETIZER );
-    set_description( N_("MPEG-I/II video packetizer") );
-    set_capability( "packetizer", 50 );
-    set_callbacks( Open, Close );
+vlc_module_begin ()
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_PACKETIZER )
+    set_description( N_("MPEG-I/II video packetizer") )
+    set_capability( "packetizer", 50 )
+    set_callbacks( Open, Close )

 
     add_bool( "packetizer-mpegvideo-sync-iframe", 0, NULL, SYNC_INTRAFRAME_TEXT,
               SYNC_INTRAFRAME_LONGTEXT, true );
 
     add_bool( "packetizer-mpegvideo-sync-iframe", 0, NULL, SYNC_INTRAFRAME_TEXT,
               SYNC_INTRAFRAME_LONGTEXT, true );

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/packetizer/vc1.c b/modules/packetizer/vc1.c
index 64e7c65f08f5c3cdbd609e4b07cf540af7a6258d..15ee82a187ca43372ef245985013ea528d35ca31 100644 (file)
--- a/modules/packetizer/vc1.c
+++ b/modules/packetizer/vc1.c
@@ -44,13 +44,13 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_PACKETIZER );
-    set_description( N_("VC-1 packetizer") );
-    set_capability( "packetizer", 50 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_PACKETIZER )
+    set_description( N_("VC-1 packetizer") )
+    set_capability( "packetizer", 50 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index 817dc6ecf26c117f36e9cc48ad16d0b8a35ac834..23a30e877fb12ac6ba46ed6b93b82641464bc10b 100644 (file)
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -49,14 +49,14 @@
     static int  Open ( vlc_object_t * );
     static void Close( vlc_object_t * );
 
     static int  Open ( vlc_object_t * );
     static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_shortname( "Bonjour" );
-    set_description( N_("Bonjour services") );
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
-    set_capability( "services_discovery", 0 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "Bonjour" )
+    set_description( N_("Bonjour services") )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )
+    set_capability( "services_discovery", 0 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Local structures
 
 /*****************************************************************************
  * Local structures

diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c
index 884bf5ae1f72374f968e81896a2d60081cc6c91a..bd4e8e1c7da384bf2b1a27d7ebac13523dd3e81b 100644 (file)
--- a/modules/services_discovery/hal.c
+++ b/modules/services_discovery/hal.c
@@ -79,15 +79,15 @@ services_discovery_t        *p_sd_global;
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("HAL devices detection") );
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
+vlc_module_begin ()
+    set_description( N_("HAL devices detection") )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )

 
 

-    set_capability( "services_discovery", 0 );
-    set_callbacks( Open, Close );
+    set_capability( "services_discovery", 0 )
+    set_callbacks( Open, Close )

 
 

-vlc_module_end();
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 57e9ae24aa07acc19ac5e2b58e79d7dbd875bd7b..a59ae2ecfc1c2a2b18fc564f3ca7f052682325f8 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -60,20 +60,20 @@ static void Close( vlc_object_t * );
 #define URLS_LONGTEXT N_("Enter the list of podcasts to retrieve, " \
                          "separated by '|' (pipe)." )
 
 #define URLS_LONGTEXT N_("Enter the list of podcasts to retrieve, " \
                          "separated by '|' (pipe)." )
 

-vlc_module_begin();
-    set_shortname( "Podcast");
-    set_description( N_("Podcasts") );
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
+vlc_module_begin ()
+    set_shortname( "Podcast")
+    set_description( N_("Podcasts") )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )

 
     add_string( "podcast-urls", NULL, NULL,
                 URLS_TEXT, URLS_LONGTEXT, false );
 
     add_string( "podcast-urls", NULL, NULL,
                 URLS_TEXT, URLS_LONGTEXT, false );

-        change_autosave();
+        change_autosave ()

 
 

-    set_capability( "services_discovery", 0 );
-    set_callbacks( Open, Close );
+    set_capability( "services_discovery", 0 )
+    set_callbacks( Open, Close )

 
 

-vlc_module_end();
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index d9ca9b4243245d8468cf8d13fbf217b83cd6ea2c..6e61f2238ed2d67ae2b2acde5f11c119f22bebfd 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -123,11 +123,11 @@
     static int  OpenDemux ( vlc_object_t * );
     static void CloseDemux ( vlc_object_t * );
 
     static int  OpenDemux ( vlc_object_t * );
     static void CloseDemux ( vlc_object_t * );
 

-vlc_module_begin();
-    set_shortname( N_("SAP"));
-    set_description( N_("SAP Announcements") );
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
+vlc_module_begin ()
+    set_shortname( N_("SAP"))
+    set_description( N_("SAP Announcements") )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )

 
     add_string( "sap-addr", NULL, NULL,
                 SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true );
 
     add_string( "sap-addr", NULL, NULL,
                 SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true );


@@ -148,15 +148,15 @@ vlc_module_begin();
     add_bool( "sap-timeshift", 0 , NULL,
               SAP_TIMESHIFT_TEXT,SAP_TIMESHIFT_LONGTEXT, true );
 
     add_bool( "sap-timeshift", 0 , NULL,
               SAP_TIMESHIFT_TEXT,SAP_TIMESHIFT_LONGTEXT, true );
 

-    set_capability( "services_discovery", 0 );
-    set_callbacks( Open, Close );
+    set_capability( "services_discovery", 0 )
+    set_callbacks( Open, Close )

 
 

-    add_submodule();
-        set_description( N_("SDP Descriptions parser") );
-        add_shortcut( "sdp" );
-        set_capability( "demux", 51 );
-        set_callbacks( OpenDemux, CloseDemux );
-vlc_module_end();
+    add_submodule ()
+        set_description( N_("SDP Descriptions parser") )
+        add_shortcut( "sdp" )
+        set_capability( "demux", 51 )
+        set_callbacks( OpenDemux, CloseDemux )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c
index 4be2f1095d04f95091dc022877ee2c45dabdf148..c6148bac272ab5a390da620f81c116c2e492c181 100644 (file)
--- a/modules/services_discovery/shout.c
+++ b/modules/services_discovery/shout.c
@@ -100,40 +100,40 @@ OPEN( ShoutTV )
 OPEN( Freebox )
 OPEN( FrenchTV )
 
 OPEN( Freebox )
 OPEN( FrenchTV )
 

-vlc_module_begin();
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
-
-    add_obsolete_integer( "shoutcast-limit" );
-
-        set_shortname( "Shoutcast");
-        set_description( N_("Shoutcast radio listings") );
-        set_capability( "services_discovery", 0 );
-        set_callbacks( OpenShoutRadio, Close );
-        add_shortcut( "shoutcast" );
-
-    add_submodule();
-        set_shortname( "ShoutcastTV" );
-        set_description( N_("Shoutcast TV listings") );
-        set_capability( "services_discovery", 0 );
-        set_callbacks( OpenShoutTV, Close );
-        add_shortcut( "shoutcasttv" );
-
-    add_submodule();
-        set_shortname( "frenchtv");
-        set_description( N_("French TV") );
-        set_capability( "services_discovery", 0 );
-        set_callbacks( OpenFrenchTV, Close );
-        add_shortcut( "frenchtv" );
-
-    add_submodule();
-        set_shortname( "Freebox");
-        set_description( N_("Freebox TV listing (French ISP free.fr services)") );
-        set_capability( "services_discovery", 0 );
-        set_callbacks( OpenFreebox, Close );
-        add_shortcut( "freebox" );
-
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )
+
+    add_obsolete_integer( "shoutcast-limit" )
+
+        set_shortname( "Shoutcast")
+        set_description( N_("Shoutcast radio listings") )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( OpenShoutRadio, Close )
+        add_shortcut( "shoutcast" )
+
+    add_submodule ()
+        set_shortname( "ShoutcastTV" )
+        set_description( N_("Shoutcast TV listings") )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( OpenShoutTV, Close )
+        add_shortcut( "shoutcasttv" )
+
+    add_submodule ()
+        set_shortname( "frenchtv")
+        set_description( N_("French TV") )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( OpenFrenchTV, Close )
+        add_shortcut( "frenchtv" )
+
+    add_submodule ()
+        set_shortname( "Freebox")
+        set_description( N_("Freebox TV listing (French ISP free.fr services)") )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( OpenFreebox, Close )
+        add_shortcut( "freebox" )
+
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/services_discovery/upnp_cc.cpp b/modules/services_discovery/upnp_cc.cpp
index 209225c80a6113643f06e58d78603ac3a50396fd..3ec13c11aeb55c0b0e679243d40c9d64604da167 100644 (file)
--- a/modules/services_discovery/upnp_cc.cpp
+++ b/modules/services_discovery/upnp_cc.cpp
@@ -57,16 +57,16 @@ using namespace CyberLink;
     static int  Open ( vlc_object_t * );
     static void Close( vlc_object_t * );
 
     static int  Open ( vlc_object_t * );
     static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_shortname( "UPnP");
-    set_description( N_("Universal Plug'n'Play discovery") );
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
+vlc_module_begin ()
+    set_shortname( "UPnP")
+    set_description( N_("Universal Plug'n'Play discovery") )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )

 
 

-    set_capability( "services_discovery", 0 );
-    set_callbacks( Open, Close );
+    set_capability( "services_discovery", 0 )
+    set_callbacks( Open, Close )

 
 

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Run: main UPnP thread
 
 /*****************************************************************************
  * Run: main UPnP thread

diff --git a/modules/services_discovery/upnp_intel.cpp b/modules/services_discovery/upnp_intel.cpp
index 9778121da21b6aacc87c10dd562e9ebd12bf79f7..b3389ad146164dd3cac9c2872adb5a0c51170d85 100644 (file)
--- a/modules/services_discovery/upnp_intel.cpp
+++ b/modules/services_discovery/upnp_intel.cpp
@@ -52,14 +52,14 @@
 static int Open( vlc_object_t* );
 static void Close( vlc_object_t* );
 
 static int Open( vlc_object_t* );
 static void Close( vlc_object_t* );
 

-vlc_module_begin();
-    set_shortname( "UPnP" );
-    set_description( N_( "Universal Plug'n'Play discovery ( Intel SDK )" ) );
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
-    set_capability( "services_discovery", 0 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "UPnP" )
+    set_description( N_( "Universal Plug'n'Play discovery ( Intel SDK )" ) )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )
+    set_capability( "services_discovery", 0 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/stream_out/autodel.c b/modules/stream_out/autodel.c
index 9cc8c4b719b65d702c17b7075cccb6ac0f8e4d7f..a04eff738f12b8ea597ec77751c55af4d4a0d0b3 100644 (file)
--- a/modules/stream_out/autodel.c
+++ b/modules/stream_out/autodel.c
@@ -42,13 +42,13 @@ static void Close   ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-autodel-"
 
 
 #define SOUT_CFG_PREFIX "sout-autodel-"
 

-vlc_module_begin();
-    set_shortname( N_("Autodel"));
-    set_description( N_("Automatically add/delete input streams"));
-    set_capability( "sout stream", 50 );
-    add_shortcut( "autodel" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( N_("Autodel"))
+    set_description( N_("Automatically add/delete input streams"))
+    set_capability( "sout stream", 50 )
+    add_shortcut( "autodel" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index 53893110e56382d278264fe94a8ef790b173ae9e..d329f834dc61d286dc5318bc0d1d3c219fc77bd9 100644 (file)
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -88,28 +88,28 @@ static void CloseIn ( vlc_object_t * );
 #define SOUT_CFG_PREFIX_OUT "sout-bridge-out-"
 #define SOUT_CFG_PREFIX_IN "sout-bridge-in-"
 
 #define SOUT_CFG_PREFIX_OUT "sout-bridge-out-"
 #define SOUT_CFG_PREFIX_IN "sout-bridge-in-"
 

-vlc_module_begin();
-    set_shortname( N_("Bridge"));
-    set_description( N_("Bridge stream output"));
-    add_submodule();
-    set_section( N_("Bridge out"), NULL );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "bridge-out" );
+vlc_module_begin ()
+    set_shortname( N_("Bridge"))
+    set_description( N_("Bridge stream output"))
+    add_submodule ()
+    set_section( N_("Bridge out"), NULL )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "bridge-out" )

     /* Only usable with VLM. No category so not in gui preferences
     /* Only usable with VLM. No category so not in gui preferences

-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );*/
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )*/

     add_integer( SOUT_CFG_PREFIX_OUT "id", 0, NULL, ID_TEXT, ID_LONGTEXT,
                  false );
     add_string( SOUT_CFG_PREFIX_OUT "in-name", "default", NULL,
                 DEST_TEXT, DEST_LONGTEXT, false );
     add_integer( SOUT_CFG_PREFIX_OUT "id", 0, NULL, ID_TEXT, ID_LONGTEXT,
                  false );
     add_string( SOUT_CFG_PREFIX_OUT "in-name", "default", NULL,
                 DEST_TEXT, DEST_LONGTEXT, false );

-    set_callbacks( OpenOut, CloseOut );
-
-    add_submodule();
-    set_section( N_("Bridge in"), NULL );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "bridge-in" );
-    /*set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );*/
+    set_callbacks( OpenOut, CloseOut )
+
+    add_submodule ()
+    set_section( N_("Bridge in"), NULL )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "bridge-in" )
+    /*set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )*/

     add_integer( SOUT_CFG_PREFIX_IN "delay", 0, NULL, DELAY_TEXT,
                  DELAY_LONGTEXT, false );
     add_integer( SOUT_CFG_PREFIX_IN "id-offset", 8192, NULL, ID_OFFSET_TEXT,
     add_integer( SOUT_CFG_PREFIX_IN "delay", 0, NULL, DELAY_TEXT,
                  DELAY_LONGTEXT, false );
     add_integer( SOUT_CFG_PREFIX_IN "id-offset", 8192, NULL, ID_OFFSET_TEXT,


@@ -122,9 +122,9 @@ vlc_module_begin();
                  PLACEHOLDER_DELAY_TEXT, PLACEHOLDER_DELAY_LONGTEXT, false );
     add_bool( SOUT_CFG_PREFIX_IN "placeholder-switch-on-iframe", true, NULL,
               PLACEHOLDER_IFRAME_TEXT, PLACEHOLDER_IFRAME_LONGTEXT, false );
                  PLACEHOLDER_DELAY_TEXT, PLACEHOLDER_DELAY_LONGTEXT, false );
     add_bool( SOUT_CFG_PREFIX_IN "placeholder-switch-on-iframe", true, NULL,
               PLACEHOLDER_IFRAME_TEXT, PLACEHOLDER_IFRAME_LONGTEXT, false );

-    set_callbacks( OpenIn, CloseIn );
+    set_callbacks( OpenIn, CloseIn )

 
 

-vlc_module_end();
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c
index e38b71780daa4fc3ef01290d7cac07eec482a69a..219dcb05eb9ccbe1e8d6e3595c23a5f2b20e40fd 100644 (file)
--- a/modules/stream_out/description.c
+++ b/modules/stream_out/description.c
@@ -50,12 +50,12 @@ static int               Send( sout_stream_t *, sout_stream_id_t *, block_t* );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Description stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "description" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Description stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "description" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 struct sout_stream_sys_t
 {
 
 struct sout_stream_sys_t
 {

diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index 997b49f707c6f851a186ffc2fb89be9ac9e4ca50..88b5595e4ab41c3434989f308113b6e57af85573 100644 (file)
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -50,21 +50,21 @@ static void Close( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-display-"
 
 
 #define SOUT_CFG_PREFIX "sout-display-"
 

-vlc_module_begin();
-    set_shortname( N_("Display"));
-    set_description( N_("Display stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "display" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
+vlc_module_begin ()
+    set_shortname( N_("Display"))
+    set_description( N_("Display stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "display" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )

     add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT,
               AUDIO_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT,
               VIDEO_LONGTEXT, true );
     add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT,
                  DELAY_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT,
               AUDIO_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT,
               VIDEO_LONGTEXT, true );
     add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT,
                  DELAY_LONGTEXT, true );

-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c
index de7834c78f6425018922534737b5404e850d5841..fbf7a2ed59585132f5f0a12cf0b28de318b58e6b 100644 (file)
--- a/modules/stream_out/dummy.c
+++ b/modules/stream_out/dummy.c
@@ -47,13 +47,13 @@ static int               Send( sout_stream_t *, sout_stream_id_t *, block_t* );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Dummy stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "dummy" );
-    add_shortcut( "drop" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Dummy stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "dummy" )
+    add_shortcut( "drop" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Open:
 
 /*****************************************************************************
  * Open:

diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c
index 4585638739c968d6862a6b67980d980c1d91eceb..d1939fcb7f86e87ce6ecdb3fce8385075e8dd249 100644 (file)
--- a/modules/stream_out/duplicate.c
+++ b/modules/stream_out/duplicate.c
@@ -40,15 +40,15 @@
 static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 
 static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Duplicate stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "duplicate" );
-    add_shortcut( "dup" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Duplicate stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "duplicate" )
+    add_shortcut( "dup" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index 03cb79483f496ab78910a84058e55b4531f9c829..abdd29dbb82428cbe276185ceb52abd44c006848 100644 (file)
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -74,15 +74,15 @@ static void     Close   ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-es-"
 
 
 #define SOUT_CFG_PREFIX "sout-es-"
 

-vlc_module_begin();
-    set_shortname( "ES" );
-    set_description( N_("Elementary stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "es" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
-
-    set_section( N_("Generic"), NULL );
+vlc_module_begin ()
+    set_shortname( "ES" )
+    set_description( N_("Elementary stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "es" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
+
+    set_section( N_("Generic"), NULL )

     add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
                 ACCESS_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
     add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
                 ACCESS_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,


@@ -90,7 +90,7 @@ vlc_module_begin();
     add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
                 DEST_LONGTEXT, true );
 
     add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
                 DEST_LONGTEXT, true );
 

-    set_section( N_("Audio"), NULL );
+    set_section( N_("Audio"), NULL )

     add_string( SOUT_CFG_PREFIX "access-audio", "", NULL, ACCESSA_TEXT,
                 ACCESSA_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mux-audio", "", NULL, MUXA_TEXT,
     add_string( SOUT_CFG_PREFIX "access-audio", "", NULL, ACCESSA_TEXT,
                 ACCESSA_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mux-audio", "", NULL, MUXA_TEXT,


@@ -98,7 +98,7 @@ vlc_module_begin();
     add_string( SOUT_CFG_PREFIX "dst-audio", "", NULL, DESTA_TEXT,
                 DESTA_LONGTEXT, true );
 
     add_string( SOUT_CFG_PREFIX "dst-audio", "", NULL, DESTA_TEXT,
                 DESTA_LONGTEXT, true );
 

-    set_section( N_("Video"), NULL );
+    set_section( N_("Video"), NULL )

     add_string( SOUT_CFG_PREFIX "access-video", "", NULL, ACCESSV_TEXT,
                 ACCESSV_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mux-video", "", NULL, MUXV_TEXT,
     add_string( SOUT_CFG_PREFIX "access-video", "", NULL, ACCESSV_TEXT,
                 ACCESSV_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mux-video", "", NULL, MUXV_TEXT,


@@ -106,8 +106,8 @@ vlc_module_begin();
     add_string( SOUT_CFG_PREFIX "dst-video", "", NULL, DESTV_TEXT,
                 DESTV_LONGTEXT, true );
 
     add_string( SOUT_CFG_PREFIX "dst-video", "", NULL, DESTV_TEXT,
                 DESTV_LONGTEXT, true );
 

-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c
index e14eb44d44562e547bc797000abfb51539ff2ead..41778d7cb4268fb3b347579296431416e5de17fa 100644 (file)
--- a/modules/stream_out/gather.c
+++ b/modules/stream_out/gather.c
@@ -40,12 +40,12 @@
 static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 
 static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Gathering stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "gather" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Gathering stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "gather" )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index f26e84ea23551bfb21df9bce95648b37f785d952..daec5cdb93d9eb460c824aac71a2651249582889 100644 (file)
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -168,11 +168,11 @@ static int yCallback( vlc_object_t *, char const *,
 
 #define CFG_PREFIX "sout-mosaic-bridge-"
 
 
 #define CFG_PREFIX "sout-mosaic-bridge-"
 

-vlc_module_begin();
-    set_shortname( N_( "Mosaic bridge" ) );
-    set_description(N_("Mosaic bridge stream output") );
-    set_capability( "sout stream", 0 );
-    add_shortcut( "mosaic-bridge" );
+vlc_module_begin ()
+    set_shortname( N_( "Mosaic bridge" ) )
+    set_description(N_("Mosaic bridge stream output") )
+    set_capability( "sout stream", 0 )
+    add_shortcut( "mosaic-bridge" )

 
     add_string( CFG_PREFIX "id", "Id", NULL, ID_TEXT, ID_LONGTEXT,
                 false );
 
     add_string( CFG_PREFIX "id", "Id", NULL, ID_TEXT, ID_LONGTEXT,
                 false );


@@ -190,11 +190,11 @@ vlc_module_begin();
 
     add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
                             ALPHA_TEXT, ALPHA_LONGTEXT, false );
 
     add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
                             ALPHA_TEXT, ALPHA_LONGTEXT, false );

-    add_integer( CFG_PREFIX "x", -1, NULL, X_TEXT, X_LONGTEXT, false );
-    add_integer( CFG_PREFIX "y", -1, NULL, Y_TEXT, Y_LONGTEXT, false );
+    add_integer( CFG_PREFIX "x", -1, NULL, X_TEXT, X_LONGTEXT, false )
+    add_integer( CFG_PREFIX "y", -1, NULL, Y_TEXT, Y_LONGTEXT, false )

 
 

-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 static const char *const ppsz_sout_options[] = {
     "id", "width", "height", "sar", "vfilter", "chroma", "alpha", "x", "y", NULL
 
 static const char *const ppsz_sout_options[] = {
     "id", "width", "height", "sar", "vfilter", "chroma", "alpha", "x", "y", NULL

diff --git a/modules/stream_out/record.c b/modules/stream_out/record.c
index f2cdfa3d589c679839a2de5c15fb7611511cbb69..e64fcf3442c469e0c1ebc8c47787d245e7bb4610 100644 (file)
--- a/modules/stream_out/record.c
+++ b/modules/stream_out/record.c
@@ -52,19 +52,19 @@ static void     Close   ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-record-"
 
 
 #define SOUT_CFG_PREFIX "sout-record-"
 

-vlc_module_begin();
-    set_description( N_("Record stream output") );
-    set_capability( "sout stream", 0 );
-    add_shortcut( "record" );
+vlc_module_begin ()
+    set_description( N_("Record stream output") )
+    set_capability( "sout stream", 0 )
+    add_shortcut( "record" )

 
 

-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )

 
     add_string( SOUT_CFG_PREFIX "dst-prefix", "", NULL, DST_PREFIX_TEXT,
                 DST_PREFIX_LONGTEXT, true );
 
 
     add_string( SOUT_CFG_PREFIX "dst-prefix", "", NULL, DST_PREFIX_TEXT,
                 DST_PREFIX_LONGTEXT, true );
 

-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /* */
 static const char *const ppsz_sout_options[] = {
 
 /* */
 static const char *const ppsz_sout_options[] = {

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 8a035ef4dabf406991e106ea876f57c0f2be7080..72f684e616f79924073a6b809a63e443bd8bd42d 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -157,13 +157,13 @@ static void Close( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-rtp-"
 #define MAX_EMPTY_BLOCKS 200
 
 #define SOUT_CFG_PREFIX "sout-rtp-"
 #define MAX_EMPTY_BLOCKS 200
 

-vlc_module_begin();
-    set_shortname( N_("RTP"));
-    set_description( N_("RTP stream output") );
-    set_capability( "sout stream", 0 );
-    add_shortcut( "rtp" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
+vlc_module_begin ()
+    set_shortname( N_("RTP"))
+    set_description( N_("RTP stream output") )
+    set_capability( "sout stream", 0 )
+    add_shortcut( "rtp" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )

 
     add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
                 DEST_LONGTEXT, true );
 
     add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
                 DEST_LONGTEXT, true );


@@ -208,8 +208,8 @@ vlc_module_begin();
     add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT,
                  RFC3016_LONGTEXT, false );
 
     add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT,
                  RFC3016_LONGTEXT, false );
 

-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index f444646e95b97fade54452f9a5c39115c7bc4f46..dc450250410c9695b750092c80e8c56255fe5d45 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -96,14 +96,14 @@ static void     Close   ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-standard-"
 
 
 #define SOUT_CFG_PREFIX "sout-standard-"
 

-vlc_module_begin();
-    set_shortname( N_("Standard"));
-    set_description( N_("Standard stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "standard" );
-    add_shortcut( "std" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
+vlc_module_begin ()
+    set_shortname( N_("Standard"))
+    set_description( N_("Standard stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "standard" )
+    add_shortcut( "std" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )

 
     add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
                 ACCESS_LONGTEXT, false );
 
     add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
                 ACCESS_LONGTEXT, false );


@@ -130,10 +130,10 @@ vlc_module_begin();
                                         true );
     add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT,
                                         true );
                                         true );
     add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT,
                                         true );

-    add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" );
+    add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" )

 
 

-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c
index a28c4096addd54c647c3861cab68a86850e8ea4a..bb6a5c4940c75a0cecacf4f3fd45702c948cd65c 100644 (file)
--- a/modules/stream_out/switcher.c
+++ b/modules/stream_out/switcher.c
@@ -108,11 +108,11 @@ static block_t *AudioGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
 #define AUDIO_LONGTEXT N_( \
     "Mute audio when command is not 0." )
 
 #define AUDIO_LONGTEXT N_( \
     "Mute audio when command is not 0." )
 

-vlc_module_begin();
-    set_description( N_("MPEG2 video switcher stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "switcher" );
-    set_callbacks( Open, Close );
+vlc_module_begin ()
+    set_description( N_("MPEG2 video switcher stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "switcher" )
+    set_callbacks( Open, Close )

 
     add_string( SOUT_CFG_PREFIX "files", "", NULL, FILES_TEXT,
                 FILES_LONGTEXT, false );
 
     add_string( SOUT_CFG_PREFIX "files", "", NULL, FILES_TEXT,
                 FILES_LONGTEXT, false );


@@ -130,7 +130,7 @@ vlc_module_begin();
                  QSCALE_TEXT, QSCALE_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "mute-audio", 1, NULL,
               AUDIO_TEXT, AUDIO_LONGTEXT, true );
                  QSCALE_TEXT, QSCALE_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "mute-audio", 1, NULL,
               AUDIO_TEXT, AUDIO_LONGTEXT, true );

-vlc_module_end();
+vlc_module_end ()

 
 static const char *const ppsz_sout_options[] = {
     "files", "sizes", "aspect-ratio", "port", "command", "gop", "qscale",
 
 static const char *const ppsz_sout_options[] = {
     "files", "sizes", "aspect-ratio", "port", "command", "gop", "qscale",

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 7d1f7e260b040e5ff10ba9d28e89c4405cd46876..c2040ffb23bdbfb55759bccde566c21894df409d 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -157,15 +157,15 @@ static void Close( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-transcode-"
 
 
 #define SOUT_CFG_PREFIX "sout-transcode-"
 

-vlc_module_begin();
-    set_shortname( N_("Transcode"));
-    set_description( N_("Transcode stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "transcode" );
-    set_callbacks( Open, Close );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
-    set_section( N_("Video"), NULL );
+vlc_module_begin ()
+    set_shortname( N_("Transcode"))
+    set_description( N_("Transcode stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "transcode" )
+    set_callbacks( Open, Close )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
+    set_section( N_("Video"), NULL )

     add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
                 VENC_LONGTEXT, false );
     add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
     add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
                 VENC_LONGTEXT, false );
     add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,


@@ -196,7 +196,7 @@ vlc_module_begin();
                      NULL, NULL,
                      VFILTER_TEXT, VFILTER_LONGTEXT, false );
 
                      NULL, NULL,
                      VFILTER_TEXT, VFILTER_LONGTEXT, false );
 

-    set_section( N_("Audio"), NULL );
+    set_section( N_("Audio"), NULL )

     add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
                 AENC_LONGTEXT, false );
     add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
     add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
                 AENC_LONGTEXT, false );
     add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,


@@ -213,7 +213,7 @@ vlc_module_begin();
                      NULL, NULL,
                      AFILTER_TEXT, AFILTER_LONGTEXT, false );
 
                      NULL, NULL,
                      AFILTER_TEXT, AFILTER_LONGTEXT, false );
 

-    set_section( N_("Overlays/Subtitles"), NULL );
+    set_section( N_("Overlays/Subtitles"), NULL )

     add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT,
                 SENC_LONGTEXT, false );
     add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
     add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT,
                 SENC_LONGTEXT, false );
     add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,


@@ -224,17 +224,17 @@ vlc_module_begin();
                      NULL, NULL,
                      SFILTER_TEXT, SFILTER_LONGTEXT, false );
 
                      NULL, NULL,
                      SFILTER_TEXT, SFILTER_LONGTEXT, false );
 

-    set_section( N_("On Screen Display"), NULL );
+    set_section( N_("On Screen Display"), NULL )

     add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT,
               OSD_LONGTEXT, false );
 
     add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT,
               OSD_LONGTEXT, false );
 

-    set_section( N_("Miscellaneous"), NULL );
+    set_section( N_("Miscellaneous"), NULL )

     add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
                  THREADS_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
               true );
 
     add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
                  THREADS_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
               true );
 

-vlc_module_end();
+vlc_module_end ()

 
 static const char *const ppsz_sout_options[] = {
     "venc", "vcodec", "vb",
 
 static const char *const ppsz_sout_options[] = {
     "venc", "vcodec", "vb",

diff --git a/modules/stream_out/transrate/transrate.c b/modules/stream_out/transrate/transrate.c
index d793746b1ebc5a9256ce4b24bf851f58e14a8838..7d9e2f89bd8acd9fcb15ffc36168404c4e974f98 100644 (file)
--- a/modules/stream_out/transrate/transrate.c
+++ b/modules/stream_out/transrate/transrate.c
@@ -73,13 +73,13 @@ static int  transrate_video_process( sout_stream_t *, sout_stream_id_t *, block_
 
 #define SOUT_CFG_PREFIX "sout-transrate-"
 
 
 #define SOUT_CFG_PREFIX "sout-transrate-"
 

-vlc_module_begin();
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
-    set_description( N_("MPEG2 video transrating stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "transrate" );
-    set_callbacks( Open, Close );
+vlc_module_begin ()
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
+    set_description( N_("MPEG2 video transrating stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "transrate" )
+    set_callbacks( Open, Close )

 
     add_integer( SOUT_CFG_PREFIX "vb", 3 * 100 * 1000, NULL,
                  VB_TEXT, VB_LONGTEXT, false );
 
     add_integer( SOUT_CFG_PREFIX "vb", 3 * 100 * 1000, NULL,
                  VB_TEXT, VB_LONGTEXT, false );


@@ -87,7 +87,7 @@ vlc_module_begin();
                  SHAPING_TEXT, SHAPING_LONGTEXT, false );
     add_bool( SOUT_CFG_PREFIX "mpeg4-matrix", false, NULL,
               MPEG4_MATRIX_TEXT, MPEG4_MATRIX_LONGTEXT, false );
                  SHAPING_TEXT, SHAPING_LONGTEXT, false );
     add_bool( SOUT_CFG_PREFIX "mpeg4-matrix", false, NULL,
               MPEG4_MATRIX_TEXT, MPEG4_MATRIX_LONGTEXT, false );

-vlc_module_end();
+vlc_module_end ()

 
 static const char *const ppsz_sout_options[] = {
     "vb", "shaping", "mpeg4-matrix", NULL
 
 static const char *const ppsz_sout_options[] = {
     "vb", "shaping", "mpeg4-matrix", NULL

diff --git a/modules/video_chroma/grey_yuv.c b/modules/video_chroma/grey_yuv.c
index d8a805cfcfff8ded1146ce89d1deb0897196b1cd..99e150c99fa7b1e37bf38d110d5be09789f8ebf6 100644 (file)
--- a/modules/video_chroma/grey_yuv.c
+++ b/modules/video_chroma/grey_yuv.c
@@ -51,11 +51,11 @@ static picture_t *GREY_YUY2_Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 80 );
-    set_callbacks( Activate, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 80 )
+    set_callbacks( Activate, NULL )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: allocate a chroma function
 
 /*****************************************************************************
  * Activate: allocate a chroma function

diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index 6c608bb2bb9ef7b05d045c3e7fdae17f9e1dd99c..4b884abb5e1b0b9034ab562b25f56e92a6b72f58 100644 (file)
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -68,24 +68,24 @@ static void Set8bppPalette      ( filter_t *, uint8_t * );
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/

-vlc_module_begin();
+vlc_module_begin ()

 #if defined (MODULE_NAME_IS_i420_rgb)
     set_description( N_("I420,IYUV,YV12 to "
                        "RGB2,RV15,RV16,RV24,RV32 conversions") );
 #if defined (MODULE_NAME_IS_i420_rgb)
     set_description( N_("I420,IYUV,YV12 to "
                        "RGB2,RV15,RV16,RV24,RV32 conversions") );

-    set_capability( "video filter2", 80 );
+    set_capability( "video filter2", 80 )

 #elif defined (MODULE_NAME_IS_i420_rgb_mmx)
     set_description( N_( "MMX I420,IYUV,YV12 to "
                         "RV15,RV16,RV24,RV32 conversions") );
 #elif defined (MODULE_NAME_IS_i420_rgb_mmx)
     set_description( N_( "MMX I420,IYUV,YV12 to "
                         "RV15,RV16,RV24,RV32 conversions") );

-    set_capability( "video filter2", 100 );
-    add_requirement( MMX );
+    set_capability( "video filter2", 100 )
+    add_requirement( MMX )

 #elif defined (MODULE_NAME_IS_i420_rgb_sse2)
     set_description( N_( "SSE2 I420,IYUV,YV12 to "
                         "RV15,RV16,RV24,RV32 conversions") );
 #elif defined (MODULE_NAME_IS_i420_rgb_sse2)
     set_description( N_( "SSE2 I420,IYUV,YV12 to "
                         "RV15,RV16,RV24,RV32 conversions") );

-    set_capability( "video filter2", 120 );
-    add_requirement( SSE2 );
+    set_capability( "video filter2", 120 )
+    add_requirement( SSE2 )

 #endif
 #endif

-    set_callbacks( Activate, Deactivate );
-vlc_module_end();
+    set_callbacks( Activate, Deactivate )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: allocate a chroma function
 
 /*****************************************************************************
  * Activate: allocate a chroma function

diff --git a/modules/video_chroma/i420_ymga.c b/modules/video_chroma/i420_ymga.c
index 2859f92425e626471129976833847d0f78cd019e..6e0f77c8a102be984216bd5ce28b9884b66f10f5 100644 (file)
--- a/modules/video_chroma/i420_ymga.c
+++ b/modules/video_chroma/i420_ymga.c
@@ -49,17 +49,17 @@ static picture_t *I420_YMGA_Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
+vlc_module_begin ()

 #if defined (MODULE_NAME_IS_i420_ymga)
 #if defined (MODULE_NAME_IS_i420_ymga)

-    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 80 );
+    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 80 )

 #elif defined (MODULE_NAME_IS_i420_ymga_mmx)
 #elif defined (MODULE_NAME_IS_i420_ymga_mmx)

-    set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 100 );
-    add_requirement( MMX );
+    set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 100 )
+    add_requirement( MMX )

 #endif
 #endif

-    set_callbacks( Activate, NULL );
-vlc_module_end();
+    set_callbacks( Activate, NULL )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: allocate a chroma function
 
 /*****************************************************************************
  * Activate: allocate a chroma function

diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index 757993b535656690b1c0b813dd37454604609e59..15f5ac2fee6d469c27339e27e161b761f1ba043c 100644 (file)
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -84,26 +84,26 @@ static const uint64_t i_80w   = 0x0000000080808080ULL;
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/

-vlc_module_begin();
+vlc_module_begin ()

 #if defined (MODULE_NAME_IS_i420_yuy2)
 #if defined (MODULE_NAME_IS_i420_yuy2)

-    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 80 );
+    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 80 )

 #elif defined (MODULE_NAME_IS_i420_yuy2_mmx)
 #elif defined (MODULE_NAME_IS_i420_yuy2_mmx)

-    set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 160 );
-    add_requirement( MMX );
+    set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 160 )
+    add_requirement( MMX )

 #elif defined (MODULE_NAME_IS_i420_yuy2_sse2)
 #elif defined (MODULE_NAME_IS_i420_yuy2_sse2)

-    set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 250 );
-    add_requirement( SSE2 );
+    set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 250 )
+    add_requirement( SSE2 )

 #elif defined (MODULE_NAME_IS_i420_yuy2_altivec)
     set_description(
             _("AltiVec conversions from " SRC_FOURCC " to " DEST_FOURCC) );
 #elif defined (MODULE_NAME_IS_i420_yuy2_altivec)
     set_description(
             _("AltiVec conversions from " SRC_FOURCC " to " DEST_FOURCC) );

-    set_capability( "video filter2", 250 );
-    add_requirement( ALTIVEC );
+    set_capability( "video filter2", 250 )
+    add_requirement( ALTIVEC )

 #endif
 #endif

-    set_callbacks( Activate, NULL );
-vlc_module_end();
+    set_callbacks( Activate, NULL )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: allocate a chroma function
 
 /*****************************************************************************
  * Activate: allocate a chroma function

diff --git a/modules/video_chroma/i422_i420.c b/modules/video_chroma/i422_i420.c
index ed0c0294f483fee3c1de26e9b4ec194834bb862a..7cb40e3b90ade7db445468696c89cc151869a197 100644 (file)
--- a/modules/video_chroma/i422_i420.c
+++ b/modules/video_chroma/i422_i420.c
@@ -53,11 +53,11 @@ static picture_t *I422_YUVA_Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 60 );
-    set_callbacks( Activate, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 60 )
+    set_callbacks( Activate, NULL )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: allocate a chroma function
 
 /*****************************************************************************
  * Activate: allocate a chroma function

diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index 528ec6893f95e1e8739ec6a475b6d408d4be295d..53dd4fd20089be3f7f9d1ba2fc4779af3acfb963 100644 (file)
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -67,21 +67,21 @@ static picture_t *I422_Y211_Filter  ( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
+vlc_module_begin ()

 #if defined (MODULE_NAME_IS_i422_yuy2)
 #if defined (MODULE_NAME_IS_i422_yuy2)

-    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 80 );
+    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 80 )

 #elif defined (MODULE_NAME_IS_i422_yuy2_mmx)
 #elif defined (MODULE_NAME_IS_i422_yuy2_mmx)

-    set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 100 );
-    add_requirement( MMX );
+    set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 100 )
+    add_requirement( MMX )

 #elif defined (MODULE_NAME_IS_i422_yuy2_sse2)
 #elif defined (MODULE_NAME_IS_i422_yuy2_sse2)

-    set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 120 );
-    add_requirement( SSE2 );
+    set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 120 )
+    add_requirement( SSE2 )

 #endif
 #endif

-    set_callbacks( Activate, NULL );
-vlc_module_end();
+    set_callbacks( Activate, NULL )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: allocate a chroma function
 
 /*****************************************************************************
  * Activate: allocate a chroma function

diff --git a/modules/video_chroma/yuy2_i420.c b/modules/video_chroma/yuy2_i420.c
index 2dfe3fd22baf4e2ea9f0e9d542e12ce72aee4419..3f3e8822cedfb54cc1ca7cc5e6a97ee21981089a 100644 (file)
--- a/modules/video_chroma/yuy2_i420.c
+++ b/modules/video_chroma/yuy2_i420.c
@@ -55,11 +55,11 @@ static picture_t *cyuv_I420_Filter    ( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 80 );
-    set_callbacks( Activate, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 80 )
+    set_callbacks( Activate, NULL )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: allocate a chroma function
 
 /*****************************************************************************
  * Activate: allocate a chroma function

diff --git a/modules/video_chroma/yuy2_i422.c b/modules/video_chroma/yuy2_i422.c
index 4faea42cc0b9d4bd8e609e8c90efd708cff91a51..03d47fd54168608c77965a26eb8e96c1bbe341df 100644 (file)
--- a/modules/video_chroma/yuy2_i422.c
+++ b/modules/video_chroma/yuy2_i422.c
@@ -54,11 +54,11 @@ static picture_t *cyuv_I422_Filter    ( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "video filter2", 80 );
-    set_callbacks( Activate, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 80 )
+    set_callbacks( Activate, NULL )
+vlc_module_end ()

 
 /*****************************************************************************
  * Activate: allocate a chroma function
 
 /*****************************************************************************
  * Activate: allocate a chroma function

diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index a4bf4ef945ee5a0e0eb96d48490ed130d6f968ba..e33a39bf7c3f5fd3440aefea301d8e2b5b26a3ef 100644 (file)
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -78,12 +78,12 @@ static int AdjustCallback( vlc_object_t *p_this, char const *psz_var,
 #define GAMMA_TEXT N_("Image gamma (0-10)")
 #define GAMMA_LONGTEXT N_("Set the image gamma, between 0.01 and 10. Defaults to 1.")
 
 #define GAMMA_TEXT N_("Image gamma (0-10)")
 #define GAMMA_LONGTEXT N_("Set the image gamma, between 0.01 and 10. Defaults to 1.")
 

-vlc_module_begin();
-    set_description( N_("Image properties filter") );
-    set_shortname( N_("Image adjust" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
+vlc_module_begin ()
+    set_description( N_("Image properties filter") )
+    set_shortname( N_("Image adjust" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )

 
     add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL,
                           CONT_TEXT, CONT_LONGTEXT, false );
 
     add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL,
                           CONT_TEXT, CONT_LONGTEXT, false );


@@ -99,9 +99,9 @@ vlc_module_begin();
     add_bool( "brightness-threshold", 0, NULL,
               THRES_TEXT, THRES_LONGTEXT, false );
 
     add_bool( "brightness-threshold", 0, NULL,
               THRES_TEXT, THRES_LONGTEXT, false );
 

-    add_shortcut( "adjust" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "adjust" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "contrast", "brightness", "hue", "saturation", "gamma",
 
 static const char *const ppsz_filter_options[] = {
     "contrast", "brightness", "hue", "saturation", "gamma",

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index b1cacbd7302f046cbbbab948733461a4a3ba371e..462d4e050233bf152f85f39bd777a347820fda96 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -59,20 +59,20 @@ static int MaskCallback( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Alpha mask video filter") );
-    set_shortname( N_("Alpha mask" ));
-    set_help( ALPHAMASK_HELP );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
-    add_shortcut( "alphamask" );
-    add_shortcut( "mask" );
-    set_callbacks( Create, Destroy );
+vlc_module_begin ()
+    set_description( N_("Alpha mask video filter") )
+    set_shortname( N_("Alpha mask" ))
+    set_help( ALPHAMASK_HELP )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )
+    add_shortcut( "alphamask" )
+    add_shortcut( "mask" )
+    set_callbacks( Create, Destroy )

 
     add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT,
                 MASK_LONGTEXT, false );
 
     add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT,
                 MASK_LONGTEXT, false );

-vlc_module_end();
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "mask", NULL
 
 static const char *const ppsz_filter_options[] = {
     "mask", NULL

diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index a2a1655e7a6805925b0af4b665da3677c38bffdb..7a9d02dfe3cfdf25edb5163faf6dc121299d13f8 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -283,14 +283,14 @@ static const char *const ppsz_channel_assignment_descriptions[] = {
 /*****************************************************************************
 * Module descriptor
 *****************************************************************************/
 /*****************************************************************************
 * Module descriptor
 *****************************************************************************/

-vlc_module_begin();
-set_description( N_("AtmoLight Filter") );
-set_help( MODULE_DESCRIPTION );
-set_shortname( N_( "AtmoLight" ));
-set_capability( "video filter2", 0 );
+vlc_module_begin ()
+set_description( N_("AtmoLight Filter") )
+set_help( MODULE_DESCRIPTION )
+set_shortname( N_( "AtmoLight" ))
+set_capability( "video filter2", 0 )

 
 

-set_category( CAT_VIDEO );
-set_subcategory( SUBCAT_VIDEO_VFILTER );
+set_category( CAT_VIDEO )
+set_subcategory( SUBCAT_VIDEO_VFILTER )

 
 #if defined(WIN32)
 set_section( N_("Choose between the built-in AtmoLight "\
 
 #if defined(WIN32)
 set_section( N_("Choose between the built-in AtmoLight "\


@@ -312,7 +312,7 @@ add_string(CFG_PREFIX "serialdev", "COM1", NULL,
 add_file(CFG_PREFIX "atmowinexe", NULL, NULL,
          ATMOWINEXE_TEXT, ATMOWINEXE_LONGTEXT, false );
 #else
 add_file(CFG_PREFIX "atmowinexe", NULL, NULL,
          ATMOWINEXE_TEXT, ATMOWINEXE_LONGTEXT, false );
 #else

-set_section( N_("Enter the connection of your AtmoLight hardware" ), 0 );
+set_section( N_("Enter the connection of your AtmoLight hardware" ), 0 )

 add_string(CFG_PREFIX "serialdev", "/dev/ttyS01", NULL,
            SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false );
 #endif
 add_string(CFG_PREFIX "serialdev", "/dev/ttyS01", NULL,
            SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false );
 #endif


@@ -321,7 +321,7 @@ add_string(CFG_PREFIX "serialdev", "/dev/ttyS01", NULL,
     color which is showed if you want durring pausing
     your movie ... used for both buildin / external
 */
     color which is showed if you want durring pausing
     your movie ... used for both buildin / external
 */

-set_section( N_("Illuminate the room with this color on pause" ), 0 );
+set_section( N_("Illuminate the room with this color on pause" ), 0 )

 add_bool(CFG_PREFIX "usepausecolor", false, NULL,
          PCOLOR_TEXT, PCOLOR_LONGTEXT, false);
 add_integer_with_range(CFG_PREFIX "pcolor-red",   0, 0, 255, NULL,
 add_bool(CFG_PREFIX "usepausecolor", false, NULL,
          PCOLOR_TEXT, PCOLOR_LONGTEXT, false);
 add_integer_with_range(CFG_PREFIX "pcolor-red",   0, 0, 255, NULL,


@@ -337,7 +337,7 @@ add_integer_with_range(CFG_PREFIX "fadesteps", 50, 1, 250, NULL,
     color which is showed if you finished watching your movie ...
     used for both buildin / external
 */
     color which is showed if you finished watching your movie ...
     used for both buildin / external
 */

-set_section( N_("Illuminate the room with this color on shutdown" ), 0 );
+set_section( N_("Illuminate the room with this color on shutdown" ), 0 )

 add_integer_with_range(CFG_PREFIX "ecolor-red",   192, 0, 255, NULL,
                        ECOLOR_RED_TEXT,   ECOLOR_RED_LONGTEXT,   false);
 add_integer_with_range(CFG_PREFIX "ecolor-green", 192, 0, 255, NULL,
 add_integer_with_range(CFG_PREFIX "ecolor-red",   192, 0, 255, NULL,
                        ECOLOR_RED_TEXT,   ECOLOR_RED_LONGTEXT,   false);
 add_integer_with_range(CFG_PREFIX "ecolor-green", 192, 0, 255, NULL,


@@ -353,7 +353,7 @@ add_integer_with_range(CFG_PREFIX "efadesteps",    50, 1, 250, NULL,
 
  definition of parameters for the buildin filter ...
 */
 
  definition of parameters for the buildin filter ...
 */

-set_section( N_("Settings for the built-in Live Video Processor only" ), 0 );
+set_section( N_("Settings for the built-in Live Video Processor only" ), 0 )

 
 add_integer_with_range(CFG_PREFIX "EdgeWeightning",   8, 1, 30, NULL,
                        EDGE_TEXT, EDGE_LONGTEXT, false);
 
 add_integer_with_range(CFG_PREFIX "EdgeWeightning",   8, 1, 30, NULL,
                        EDGE_TEXT, EDGE_LONGTEXT, false);


@@ -390,7 +390,7 @@ add_integer_with_range(CFG_PREFIX "FrameDelay", 18, 0, 35, NULL,
 /*
   output channel reordering
 */
 /*
   output channel reordering
 */

-set_section( N_("Change channel assignment (fixes wrong wiring)" ), 0 );
+set_section( N_("Change channel assignment (fixes wrong wiring)" ), 0 )

 add_integer( CFG_PREFIX "channel_0", 0, NULL,
             CHANNEL_0_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false );
 change_integer_list( pi_channel_assignment_values,
 add_integer( CFG_PREFIX "channel_0", 0, NULL,
             CHANNEL_0_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false );
 change_integer_list( pi_channel_assignment_values,


@@ -419,7 +419,7 @@ change_integer_list( pi_channel_assignment_values,
 /*
   LED color white calibration
 */
 /*
   LED color white calibration
 */

-set_section( N_("Adjust the white light to your LED stripes" ), 0 );
+set_section( N_("Adjust the white light to your LED stripes" ), 0 )

 add_bool(CFG_PREFIX "whiteadj", true, NULL,
          USEWHITEADJ_TEXT, USEWHITEADJ_LONGTEXT, false);
 add_integer_with_range(CFG_PREFIX "white-red",   255, 0, 255, NULL,
 add_bool(CFG_PREFIX "whiteadj", true, NULL,
          USEWHITEADJ_TEXT, USEWHITEADJ_LONGTEXT, false);
 add_integer_with_range(CFG_PREFIX "white-red",   255, 0, 255, NULL,


@@ -441,7 +441,7 @@ Pixel BMP files - which contain your own grayscale... (you can produce funny
 effects with this...) the images MUST not compressed, should have 24-bit per
 pixel, or a simple 256 color grayscale palette
 */
 effects with this...) the images MUST not compressed, should have 24-bit per
 pixel, or a simple 256 color grayscale palette
 */

-set_section( N_("Change gradients" ), 0 );
+set_section( N_("Change gradients" ), 0 )

 add_file(CFG_PREFIX "gradient_zone_0", NULL, NULL,
          ZONE_0_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true );
 add_file(CFG_PREFIX "gradient_zone_1", NULL, NULL,
 add_file(CFG_PREFIX "gradient_zone_0", NULL, NULL,
          ZONE_0_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true );
 add_file(CFG_PREFIX "gradient_zone_1", NULL, NULL,


@@ -469,9 +469,9 @@ add_integer_with_range(CFG_PREFIX "width",  64, 64, 512, NULL,
 add_integer_with_range(CFG_PREFIX "height", 48, 48, 384, NULL,
                        HEIGHT_TEXT,  HEIGHT_LONGTEXT, true);
 
 add_integer_with_range(CFG_PREFIX "height", 48, 48, 384, NULL,
                        HEIGHT_TEXT,  HEIGHT_LONGTEXT, true);
 

-add_shortcut( "atmo" );
-set_callbacks( CreateFilter, DestroyFilter  );
-vlc_module_end();
+add_shortcut( "atmo" )
+set_callbacks( CreateFilter, DestroyFilter  )
+vlc_module_end ()

 
 
 static const char *const ppsz_filter_options[] = {
 
 
 static const char *const ppsz_filter_options[] = {

diff --git a/modules/video_filter/blend.c b/modules/video_filter/blend.c
index c0e9f4081c406a91bbe04d179718360b6dc92389..08fe36f55bb99f5890e2e2d2a9497f8d7d1f9223 100644 (file)
--- a/modules/video_filter/blend.c
+++ b/modules/video_filter/blend.c
@@ -41,11 +41,11 @@
 static int  OpenFilter ( vlc_object_t * );
 static void CloseFilter( vlc_object_t * );
 
 static int  OpenFilter ( vlc_object_t * );
 static void CloseFilter( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Video pictures blending") );
-    set_capability( "video blending", 100 );
-    set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Video pictures blending") )
+    set_capability( "video blending", 100 )
+    set_callbacks( OpenFilter, CloseFilter )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c
index af19f901fa3f84ae10792ebdfd94aec31b8c0175..2e7194c45dbb2bfd4c04227df1df75edd0de6f75 100644 (file)
--- a/modules/video_filter/blendbench.c
+++ b/modules/video_filter/blendbench.c
@@ -70,33 +70,33 @@ static picture_t *Filter( filter_t *, picture_t * );
 
 #define CFG_PREFIX "blendbench-"
 
 
 #define CFG_PREFIX "blendbench-"
 

-vlc_module_begin();
-    set_description( N_("Blending benchmark filter") );
-    set_shortname( N_("blendbench" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
-
-    set_section( N_("Benchmarking"), NULL );
+vlc_module_begin ()
+    set_description( N_("Blending benchmark filter") )
+    set_shortname( N_("blendbench" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )
+
+    set_section( N_("Benchmarking"), NULL )

     add_integer( CFG_PREFIX "loops", 1000, NULL, LOOPS_TEXT,
               LOOPS_LONGTEXT, false );
     add_integer_with_range( CFG_PREFIX "alpha", 128, 0, 255, NULL, ALPHA_TEXT,
               ALPHA_LONGTEXT, false );
 
     add_integer( CFG_PREFIX "loops", 1000, NULL, LOOPS_TEXT,
               LOOPS_LONGTEXT, false );
     add_integer_with_range( CFG_PREFIX "alpha", 128, 0, 255, NULL, ALPHA_TEXT,
               ALPHA_LONGTEXT, false );
 

-    set_section( N_("Base image"), NULL );
+    set_section( N_("Base image"), NULL )

     add_file( CFG_PREFIX "base-image", NULL, NULL, BASE_IMAGE_TEXT,
               BASE_IMAGE_LONGTEXT, false );
     add_string( CFG_PREFIX "base-chroma", "I420", NULL, BASE_CHROMA_TEXT,
               BASE_CHROMA_LONGTEXT, false );
 
     add_file( CFG_PREFIX "base-image", NULL, NULL, BASE_IMAGE_TEXT,
               BASE_IMAGE_LONGTEXT, false );
     add_string( CFG_PREFIX "base-chroma", "I420", NULL, BASE_CHROMA_TEXT,
               BASE_CHROMA_LONGTEXT, false );
 

-    set_section( N_("Blend image"), NULL );
+    set_section( N_("Blend image"), NULL )

     add_file( CFG_PREFIX "blend-image", NULL, NULL, BLEND_IMAGE_TEXT,
               BLEND_IMAGE_LONGTEXT, false );
     add_string( CFG_PREFIX "blend-chroma", "YUVA", NULL, BLEND_CHROMA_TEXT,
               BLEND_CHROMA_LONGTEXT, false );
 
     add_file( CFG_PREFIX "blend-image", NULL, NULL, BLEND_IMAGE_TEXT,
               BLEND_IMAGE_LONGTEXT, false );
     add_string( CFG_PREFIX "blend-chroma", "YUVA", NULL, BLEND_CHROMA_TEXT,
               BLEND_CHROMA_LONGTEXT, false );
 

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "loops", "alpha", "base-image", "base-chroma", "blend-image",
 
 static const char *const ppsz_filter_options[] = {
     "loops", "alpha", "base-image", "base-chroma", "blend-image",

diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index 4c09941dfe8db0ebd8ddb77efb8fb11e20a1edff..52604fa7cabfbb78878c001200bcc5d8ec69d4e8 100644 (file)
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -75,15 +75,15 @@ static int BluescreenCallback( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Bluescreen video filter") );
-    set_shortname( N_("Bluescreen" ));
-    set_help( BLUESCREEN_HELP );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
-    add_shortcut( "bluescreen" );
-    set_callbacks( Create, Destroy );
+vlc_module_begin ()
+    set_description( N_("Bluescreen video filter") )
+    set_shortname( N_("Bluescreen" ))
+    set_help( BLUESCREEN_HELP )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )
+    add_shortcut( "bluescreen" )
+    set_callbacks( Create, Destroy )

 
     add_integer_with_range( CFG_PREFIX "u", 120, 0, 255, NULL,
                             BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, false );
 
     add_integer_with_range( CFG_PREFIX "u", 120, 0, 255, NULL,
                             BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, false );


@@ -95,7 +95,7 @@ vlc_module_begin();
     add_integer_with_range( CFG_PREFIX "vt", 17, 0, 255, NULL,
                             BLUESCREENVTOL_TEXT, BLUESCREENVTOL_LONGTEXT,
                             false );
     add_integer_with_range( CFG_PREFIX "vt", 17, 0, 255, NULL,
                             BLUESCREENVTOL_TEXT, BLUESCREENVTOL_LONGTEXT,
                             false );

-vlc_module_end();
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "u", "v", "ut", "vt", NULL
 
 static const char *const ppsz_filter_options[] = {
     "u", "v", "ut", "vt", NULL

diff --git a/modules/video_filter/canvas.c b/modules/video_filter/canvas.c
index e301c5497783d6600cb30703cf3a301b4c1b64b7..00e3944370cc050fc00b263cdb85f1de7ee7ac12 100644 (file)
--- a/modules/video_filter/canvas.c
+++ b/modules/video_filter/canvas.c
@@ -63,10 +63,10 @@ static int alloc_init( filter_t *, void * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Automatically resize and padd a video") );
-    set_capability( "video filter2", 0 );
-    set_callbacks( Activate, Destroy );
+vlc_module_begin ()
+    set_description( N_("Automatically resize and padd a video") )
+    set_capability( "video filter2", 0 )
+    set_callbacks( Activate, Destroy )

 
     add_integer_with_range( CFG_PREFIX "width", 0, 0, INT_MAX, NULL,
                             WIDTH_TEXT, WIDTH_LONGTEXT, false );
 
     add_integer_with_range( CFG_PREFIX "width", 0, 0, INT_MAX, NULL,
                             WIDTH_TEXT, WIDTH_LONGTEXT, false );


@@ -78,7 +78,7 @@ vlc_module_begin();
 
     add_bool( CFG_PREFIX "padd", true, NULL,
               PADD_TEXT, PADD_LONGTEXT, false );
 
     add_bool( CFG_PREFIX "padd", true, NULL,
               PADD_TEXT, PADD_LONGTEXT, false );

-vlc_module_end();
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "width", "height", "aspect", "padd", NULL
 
 static const char *const ppsz_filter_options[] = {
     "width", "height", "aspect", "padd", NULL

diff --git a/modules/video_filter/chain.c b/modules/video_filter/chain.c
index 1c295bba856d842c800c93b2bf8f014177a23150..4d8b16c4bb543b18483b203a543ec87837a4c6a3 100644 (file)
--- a/modules/video_filter/chain.c
+++ b/modules/video_filter/chain.c
@@ -39,11 +39,11 @@
 static int       Activate   ( vlc_object_t * );
 static void      Destroy    ( vlc_object_t * );
 
 static int       Activate   ( vlc_object_t * );
 static void      Destroy    ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Video filtering using a chain of video filter modules") );
-    set_capability( "video filter2", 1 );
-    set_callbacks( Activate, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Video filtering using a chain of video filter modules") )
+    set_capability( "video filter2", 1 )
+    set_callbacks( Activate, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes.
 
 /*****************************************************************************
  * Local prototypes.

diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index ee97615f5eec0c85bdce47fee35ffaa8d2870404..6339b6e84c7e9f4700438e55f5d5384767fe01cd 100644 (file)
--- a/modules/video_filter/clone.c
+++ b/modules/video_filter/clone.c
@@ -65,19 +65,19 @@ static int  SendEvents( vlc_object_t *, char const *,
 
 #define CFG_PREFIX "clone-"
 
 
 #define CFG_PREFIX "clone-"
 

-vlc_module_begin();
-    set_description( N_("Clone video filter") );
-    set_capability( "video filter", 0 );
-    set_shortname( N_("Clone" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    add_integer( CFG_PREFIX "count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, false );
-    add_string ( CFG_PREFIX "vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, true );
-
-    add_shortcut( "clone" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Clone video filter") )
+    set_capability( "video filter", 0 )
+    set_shortname( N_("Clone" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    add_integer( CFG_PREFIX "count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, false )
+    add_string ( CFG_PREFIX "vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, true )
+
+    add_shortcut( "clone" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "count", "vout-list", NULL
 
 static const char *const ppsz_filter_options[] = {
     "count", "vout-list", NULL

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index b27b7a5ed18b6ff92bd37cfd71d0b516451075d9..fa8d72248c4e8dad0b2450731223833e78c38b2d 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -64,12 +64,12 @@ static const char *const ppsz_color_descriptions[] = {
 
 #define CFG_PREFIX "colorthres-"
 
 
 #define CFG_PREFIX "colorthres-"
 

-vlc_module_begin();
-    set_description( N_("Color threshold filter") );
-    set_shortname( N_("Color threshold" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
+vlc_module_begin ()
+    set_description( N_("Color threshold filter") )
+    set_shortname( N_("Color threshold" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )

     add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false );
         change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
     add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false );
         change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );


@@ -77,8 +77,8 @@ vlc_module_begin();
                  _("Saturaton threshold"), "", false );
     add_integer( CFG_PREFIX "similaritythres", 15, NULL,
                  _("Similarity threshold"), "", false );
                  _("Saturaton threshold"), "", false );
     add_integer( CFG_PREFIX "similaritythres", 15, NULL,
                  _("Similarity threshold"), "", false );

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "color", "saturationthes", "similaritythres", NULL
 
 static const char *const ppsz_filter_options[] = {
     "color", "saturationthes", "similaritythres", NULL

diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c
index f8e7c05b8c4d0a2b39e5208a58680db8b94ca3d9..5176f3a20599af963b47adf83f8f5bd48a213d34 100644 (file)
--- a/modules/video_filter/crop.c
+++ b/modules/video_filter/crop.c
@@ -100,12 +100,12 @@ static int FilterCallback ( vlc_object_t *, char const *,
 #define LUM_LONGTEXT N_("Maximum luminance to consider a pixel as black (0-255).")
 #endif
 
 #define LUM_LONGTEXT N_("Maximum luminance to consider a pixel as black (0-255).")
 #endif
 

-vlc_module_begin();
-    set_description( N_("Crop video filter") );
-    set_shortname( N_("Crop" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter", 0 );
+vlc_module_begin ()
+    set_description( N_("Crop video filter") )
+    set_shortname( N_("Crop" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter", 0 )

 
     add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT,
                                              GEOMETRY_LONGTEXT, false );
 
     add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT,
                                              GEOMETRY_LONGTEXT, false );


@@ -133,9 +133,9 @@ vlc_module_begin();
                             LUM_TEXT, LUM_LONGTEXT, true );
 #endif //BEST_AUTOCROP
 
                             LUM_TEXT, LUM_LONGTEXT, true );
 #endif //BEST_AUTOCROP
 

-    add_shortcut( "crop" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "crop" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: Crop video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: Crop video output method descriptor

diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c
index 0139b71bda849d19219d261e68161414525da5c8..97d96cfca3a382479470a5b8ace711041c4d5d10 100644 (file)
--- a/modules/video_filter/croppadd.c
+++ b/modules/video_filter/croppadd.c
@@ -75,12 +75,12 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Video scaling filter") );
-    set_capability( "video filter2", 0 );
-    set_callbacks( OpenFilter, CloseFilter );
+vlc_module_begin ()
+    set_description( N_("Video scaling filter") )
+    set_capability( "video filter2", 0 )
+    set_callbacks( OpenFilter, CloseFilter )

 
 

-    set_section( N_("Crop"), NULL );
+    set_section( N_("Crop"), NULL )

         add_integer_with_range( CFG_PREFIX "croptop", 0, 0, INT_MAX, NULL,
                                 CROPTOP_TEXT, CROPTOP_LONGTEXT, false );
         add_integer_with_range( CFG_PREFIX "cropbottom", 0, 0, INT_MAX, NULL,
         add_integer_with_range( CFG_PREFIX "croptop", 0, 0, INT_MAX, NULL,
                                 CROPTOP_TEXT, CROPTOP_LONGTEXT, false );
         add_integer_with_range( CFG_PREFIX "cropbottom", 0, 0, INT_MAX, NULL,


@@ -90,7 +90,7 @@ vlc_module_begin();
         add_integer_with_range( CFG_PREFIX "cropright", 0, 0, INT_MAX, NULL,
                                 CROPRIGHT_TEXT, CROPRIGHT_LONGTEXT, false );
 
         add_integer_with_range( CFG_PREFIX "cropright", 0, 0, INT_MAX, NULL,
                                 CROPRIGHT_TEXT, CROPRIGHT_LONGTEXT, false );
 

-    set_section( N_("Padd"), NULL );
+    set_section( N_("Padd"), NULL )

         add_integer_with_range( CFG_PREFIX "paddtop", 0, 0, INT_MAX, NULL,
                                 PADDTOP_TEXT, PADDTOP_LONGTEXT, false );
         add_integer_with_range( CFG_PREFIX "paddbottom", 0, 0, INT_MAX, NULL,
         add_integer_with_range( CFG_PREFIX "paddtop", 0, 0, INT_MAX, NULL,
                                 PADDTOP_TEXT, PADDTOP_LONGTEXT, false );
         add_integer_with_range( CFG_PREFIX "paddbottom", 0, 0, INT_MAX, NULL,


@@ -99,7 +99,7 @@ vlc_module_begin();
                                 PADDLEFT_TEXT, PADDLEFT_LONGTEXT, false );
         add_integer_with_range( CFG_PREFIX "paddright", 0, 0, INT_MAX, NULL,
                                 PADDRIGHT_TEXT, PADDRIGHT_LONGTEXT, false );
                                 PADDLEFT_TEXT, PADDLEFT_LONGTEXT, false );
         add_integer_with_range( CFG_PREFIX "paddright", 0, 0, INT_MAX, NULL,
                                 PADDRIGHT_TEXT, PADDRIGHT_LONGTEXT, false );

-vlc_module_end();
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "croptop", "cropbottom", "cropleft", "cropright",
 
 static const char *const ppsz_filter_options[] = {
     "croptop", "cropbottom", "cropleft", "cropright",

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 523999f8c1a05fdeb2848198d89aad8bb5b6b5a3..4ec51a2d726f3201fcaaf020e9d5028f982adefc 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -122,29 +122,29 @@ static const char *const mode_list[] = {
 static const char *const mode_list_text[] = {
     N_("Discard"), N_("Blend"), N_("Mean"), N_("Bob"), N_("Linear"), "X" };
 
 static const char *const mode_list_text[] = {
     N_("Discard"), N_("Blend"), N_("Mean"), N_("Bob"), N_("Linear"), "X" };
 

-vlc_module_begin();
-    set_description( N_("Deinterlacing video filter") );
-    set_shortname( N_("Deinterlace" ));
-    set_capability( "video filter", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    set_section( N_("Display"),NULL);
+vlc_module_begin ()
+    set_description( N_("Deinterlacing video filter") )
+    set_shortname( N_("Deinterlace" ))
+    set_capability( "video filter", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    set_section( N_("Display"),NULL)

     add_string( "deinterlace-mode", "discard", NULL, MODE_TEXT,
                 MODE_LONGTEXT, false );
         change_string_list( mode_list, mode_list_text, 0 );
 
     add_string( "deinterlace-mode", "discard", NULL, MODE_TEXT,
                 MODE_LONGTEXT, false );
         change_string_list( mode_list, mode_list_text, 0 );
 

-    add_shortcut( "deinterlace" );
-    set_callbacks( Create, Destroy );
+    add_shortcut( "deinterlace" )
+    set_callbacks( Create, Destroy )

 
 

-    add_submodule();
-    set_capability( "video filter2", 0 );
-    set_section( N_("Streaming"),NULL);
+    add_submodule ()
+    set_capability( "video filter2", 0 )
+    set_section( N_("Streaming"),NULL)

     add_string( FILTER_CFG_PREFIX "mode", "blend", NULL, SOUT_MODE_TEXT,
                 SOUT_MODE_LONGTEXT, false );
         change_string_list( mode_list, mode_list_text, 0 );
     add_string( FILTER_CFG_PREFIX "mode", "blend", NULL, SOUT_MODE_TEXT,
                 SOUT_MODE_LONGTEXT, false );
         change_string_list( mode_list, mode_list_text, 0 );

-    set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();
+    set_callbacks( OpenFilter, CloseFilter )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "mode", NULL
 
 static const char *const ppsz_filter_options[] = {
     "mode", NULL

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
index 03a3fd6e1fcfc9f929bdb30b240e9c11d029ff50..be3327dd0114bc83cb209a12250f8060e078f243 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
@@ -61,21 +61,21 @@ static int AdjustCallback( vlc_object_t *p_this, char const *psz_var,
 #define OUTPUT_TEXT N_("Output FIFO")
 #define OUTPUT_LONGTEXT N_("FIFO which will be written to for responses")
 
 #define OUTPUT_TEXT N_("Output FIFO")
 #define OUTPUT_LONGTEXT N_("FIFO which will be written to for responses")
 

-vlc_module_begin();
-    set_description( N_("Dynamic video overlay") );
-    set_shortname( N_("Overlay" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "sub filter", 0 );
+vlc_module_begin ()
+    set_description( N_("Dynamic video overlay") )
+    set_shortname( N_("Overlay" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "sub filter", 0 )

 
     add_file( "overlay-input", NULL, NULL, INPUT_TEXT, INPUT_LONGTEXT,
               false );
     add_file( "overlay-output", NULL, NULL, OUTPUT_TEXT, OUTPUT_LONGTEXT,
               false );
 
 
     add_file( "overlay-input", NULL, NULL, INPUT_TEXT, INPUT_LONGTEXT,
               false );
     add_file( "overlay-output", NULL, NULL, OUTPUT_TEXT, OUTPUT_LONGTEXT,
               false );
 

-    add_shortcut( "overlay" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "overlay" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "input", "output", NULL
 
 static const char *const ppsz_filter_options[] = {
     "input", "output", NULL

diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index 33f507bf2ef86099b7b04d6bfd7d046dc9bd2d3f..a01423014e63d392366532cc4387644a9172120f 100644 (file)
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -62,21 +62,21 @@ static int EraseCallback( vlc_object_t *, char const *,
 
 #define CFG_PREFIX "erase-"
 
 
 #define CFG_PREFIX "erase-"
 

-vlc_module_begin();
-    set_description( N_("Erase video filter") );
-    set_shortname( N_( "Erase" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_description( N_("Erase video filter") )
+    set_shortname( N_( "Erase" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
     add_file( CFG_PREFIX "mask", NULL, NULL,
               MASK_TEXT, MASK_LONGTEXT, false );
 
     add_file( CFG_PREFIX "mask", NULL, NULL,
               MASK_TEXT, MASK_LONGTEXT, false );

-    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, false );
-    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, false );
+    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, false )
+    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, false )

 
 

-    add_shortcut( "erase" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "erase" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "mask", "x", "y", NULL
 
 static const char *const ppsz_filter_options[] = {
     "mask", "x", "y", NULL

diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c
index 192eda0b84e82e779ae95272d024bf55b24b7888..3a038c5d1d45a3712bf9914971e96ac780c4318e 100644 (file)
--- a/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@ -71,20 +71,20 @@ static const char *const ppsz_component_descriptions[] = {
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Extract RGB component video filter") );
-    set_shortname( N_("Extract" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
-    add_shortcut( "extract" );
+vlc_module_begin ()
+    set_description( N_("Extract RGB component video filter") )
+    set_shortname( N_("Extract" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )
+    add_shortcut( "extract" )

 
     add_integer_with_range( FILTER_PREFIX "component", 0xFF0000, 1, 0xFFFFFF,
                  NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, false );
         change_integer_list( pi_component_values, ppsz_component_descriptions, NULL );
 
 
     add_integer_with_range( FILTER_PREFIX "component", 0xFF0000, 1, 0xFFFFFF,
                  NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, false );
         change_integer_list( pi_component_values, ppsz_component_descriptions, NULL );
 

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "component", NULL
 
 static const char *const ppsz_filter_options[] = {
     "component", NULL

diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c
index f0df0109070b1364dfeed39ae5bdc511c9535e1e..5819337b412777e27ff0921ed4a163bccddd02b1 100644 (file)
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -51,18 +51,18 @@ static void Destroy   ( vlc_object_t * );
 
 #define FILTER_PREFIX "gaussianblur-"
 
 
 #define FILTER_PREFIX "gaussianblur-"
 

-vlc_module_begin();
-    set_description( N_("Gaussian blur video filter") );
-    set_shortname( N_( "Gaussian Blur" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_description( N_("Gaussian blur video filter") )
+    set_shortname( N_( "Gaussian Blur" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
     add_float( FILTER_PREFIX "sigma", 2., NULL, SIGMA_TEXT, SIGMA_LONGTEXT,
                false );
 
 
     add_float( FILTER_PREFIX "sigma", 2., NULL, SIGMA_TEXT, SIGMA_LONGTEXT,
                false );
 

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index dc203afe2423883e7c81897046609656d9e06d02..b9eaf4338dcff6bd8ae845752020f90d8598d5ed 100644 (file)
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -76,12 +76,12 @@ static const char *const mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Ho
 
 #define FILTER_PREFIX "gradient-"
 
 
 #define FILTER_PREFIX "gradient-"
 

-vlc_module_begin();
-    set_description( N_("Gradient video filter") );
-    set_shortname( N_( "Gradient" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_description( N_("Gradient video filter") )
+    set_shortname( N_( "Gradient" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
     add_string( FILTER_PREFIX "mode", "gradient", NULL,
                 MODE_TEXT, MODE_LONGTEXT, false );
 
     add_string( FILTER_PREFIX "mode", "gradient", NULL,
                 MODE_TEXT, MODE_LONGTEXT, false );


@@ -92,9 +92,9 @@ vlc_module_begin();
     add_bool( FILTER_PREFIX "cartoon", 1, NULL,
                 CARTOON_TEXT, CARTOON_LONGTEXT, false );
 
     add_bool( FILTER_PREFIX "cartoon", 1, NULL,
                 CARTOON_TEXT, CARTOON_LONGTEXT, false );
 

-    add_shortcut( "gradient" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "gradient" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "mode", "type", "cartoon", NULL
 
 static const char *const ppsz_filter_options[] = {
     "mode", "type", "cartoon", NULL

diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c
index e28b210c8803886212603a0d7c7115663c7468e6..28f54eb813ffb07c3c3a5088f0ed5f671e99b48a 100644 (file)
--- a/modules/video_filter/grain.c
+++ b/modules/video_filter/grain.c
@@ -49,15 +49,15 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Grain video filter") );
-    set_shortname( N_( "Grain" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Grain video filter") )
+    set_shortname( N_( "Grain" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 struct filter_sys_t
 {
 
 struct filter_sys_t
 {

diff --git a/modules/video_filter/imgresample.c b/modules/video_filter/imgresample.c
index 767b9f8c5656c886bf6d4f6ac9710eabf881b1c7..978f25073d99b6eca1848885eb67763770da9f11 100644 (file)
--- a/modules/video_filter/imgresample.c
+++ b/modules/video_filter/imgresample.c
@@ -57,11 +57,11 @@ static picture_t *Conversion_Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_capability( "video filter2", 50 );
-    set_callbacks( OpenFilter, CloseFilter );
-    set_description( N_("FFmpeg video filter") );
-vlc_module_end();
+vlc_module_begin ()
+    set_capability( "video filter2", 50 )
+    set_callbacks( OpenFilter, CloseFilter )
+    set_description( N_("FFmpeg video filter") )
+vlc_module_end ()

 
 /*****************************************************************************
  * chroma_sys_t: chroma method descriptor
 
 /*****************************************************************************
  * chroma_sys_t: chroma method descriptor

diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c
index 1700c1d7eb7fab4234a0c8e0722305b228ec4d89..1f1cd71aaed3c61335d2edae82fd85c7605ab436 100644 (file)
--- a/modules/video_filter/invert.c
+++ b/modules/video_filter/invert.c
@@ -47,15 +47,15 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Invert video filter") );
-    set_shortname( N_("Color inversion" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
-    add_shortcut( "invert" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Invert video filter") )
+    set_shortname( N_("Color inversion" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )
+    add_shortcut( "invert" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: Invert video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: Invert video output method descriptor

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 404a0fffaed203a0b03799aaeb99dd618b479a90..ec42a4b590575eb12989e995e4cb604a4eb44d0d 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -100,32 +100,32 @@ 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") };
 
 { 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_capability( "sub filter", 0 );
-    set_callbacks( CreateFilter, DestroyFilter );
-    set_description( N_("Logo sub filter") );
-    set_shortname( N_("Logo overlay") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
-    add_shortcut( "logo" );
-
-    add_file( CFG_PREFIX "file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, false );
-    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true );
-    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true );
+vlc_module_begin ()
+    set_capability( "sub filter", 0 )
+    set_callbacks( CreateFilter, DestroyFilter )
+    set_description( N_("Logo sub filter") )
+    set_shortname( N_("Logo overlay") )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC )
+    add_shortcut( "logo" )
+
+    add_file( CFG_PREFIX "file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, false )
+    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true )
+    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true )

     /* default to 1000 ms per image, continuously cycle through them */
     /* default to 1000 ms per image, continuously cycle through them */

-    add_integer( CFG_PREFIX "delay", 1000, NULL, DELAY_TEXT, DELAY_LONGTEXT, true );
-    add_integer( CFG_PREFIX "repeat", -1, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, true );
+    add_integer( CFG_PREFIX "delay", 1000, NULL, DELAY_TEXT, DELAY_LONGTEXT, true )
+    add_integer( CFG_PREFIX "repeat", -1, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, true )

     add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,
         TRANS_TEXT, TRANS_LONGTEXT, false );
     add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,
         TRANS_TEXT, TRANS_LONGTEXT, false );

-    add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false );
+    add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false )

         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
     /* video output filter submodule */
         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
     /* video output filter submodule */

-    add_submodule();
-    set_capability( "video filter", 0 );
-    set_callbacks( Create, Destroy );
-    set_description( N_("Logo video filter") );
-vlc_module_end();
+    add_submodule ()
+    set_capability( "video filter", 0 )
+    set_callbacks( Create, Destroy )
+    set_description( N_("Logo video filter") )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "file", "x", "y", "delay", "repeat", "transparency", "position", NULL
 
 static const char *const ppsz_filter_options[] = {
     "file", "x", "y", "delay", "repeat", "transparency", "position", NULL

diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c
index 00f59da34f19729d7ce3276c3432047b382226a7..d7ce91afbfbabdc421923458505397b2e611c35b 100644 (file)
--- a/modules/video_filter/magnify.c
+++ b/modules/video_filter/magnify.c
@@ -46,15 +46,15 @@
 static int  Create    ( vlc_object_t * );
 static void Destroy   ( vlc_object_t * );
 
 static int  Create    ( vlc_object_t * );
 static void Destroy   ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Magnify/Zoom interactive video filter") );
-    set_shortname( N_( "Magnify" ));
-    set_capability( "video filter", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Magnify/Zoom interactive video filter") )
+    set_shortname( N_( "Magnify" ))
+    set_capability( "video filter", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index 3accc6312512baf16bf055fa3b93dac8868b7d3f..c7528e443d4668a96317eca3567a4e9489e1a3da 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -141,22 +141,22 @@ static const char *const ppsz_pos_descriptions[] =
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_capability( "sub filter", 0 );
-    set_shortname( N_("Marquee" ));
-    set_callbacks( CreateFilter, DestroyFilter );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
+vlc_module_begin ()
+    set_capability( "sub filter", 0 )
+    set_shortname( N_("Marquee" ))
+    set_callbacks( CreateFilter, DestroyFilter )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC )

     add_string( CFG_PREFIX "marquee", "VLC", NULL, MSG_TEXT, MSG_LONGTEXT,
                 false );
 
     add_string( CFG_PREFIX "marquee", "VLC", NULL, MSG_TEXT, MSG_LONGTEXT,
                 false );
 

-    set_section( N_("Position"), NULL );
-    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true );
-    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true );
-    add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false );
+    set_section( N_("Position"), NULL )
+    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true )
+    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true )
+    add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false )

         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 

-    set_section( N_("Font"), NULL );
+    set_section( N_("Font"), NULL )

     /* 5 sets the default to top [1] left [4] */
     add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, false );
     /* 5 sets the default to top [1] left [4] */
     add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, false );


@@ -166,22 +166,22 @@ vlc_module_begin();
     add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT,
                  false );
 
     add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT,
                  false );
 

-    set_section( N_("Misc"), NULL );
+    set_section( N_("Misc"), NULL )

     add_integer( CFG_PREFIX "timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
                  false );
     add_integer( CFG_PREFIX "refresh", 1000, NULL, REFRESH_TEXT,
                  REFRESH_LONGTEXT, false );
 
     add_integer( CFG_PREFIX "timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
                  false );
     add_integer( CFG_PREFIX "refresh", 1000, NULL, REFRESH_TEXT,
                  REFRESH_LONGTEXT, false );
 

-    set_description( N_("Marquee display") );
-    add_shortcut( "time" );
-    add_obsolete_string( "time-format" );
-    add_obsolete_string( "time-x" );
-    add_obsolete_string( "time-y" );
-    add_obsolete_string( "time-position" );
-    add_obsolete_string( "time-opacity" );
-    add_obsolete_string( "time-color" );
-    add_obsolete_string( "time-size" );
-vlc_module_end();
+    set_description( N_("Marquee display") )
+    add_shortcut( "time" )
+    add_obsolete_string( "time-format" )
+    add_obsolete_string( "time-x" )
+    add_obsolete_string( "time-y" )
+    add_obsolete_string( "time-position" )
+    add_obsolete_string( "time-opacity" )
+    add_obsolete_string( "time-color" )
+    add_obsolete_string( "time-size" )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "marquee", "x", "y", "position", "color", "size", "timeout", "refresh",
 
 static const char *const ppsz_filter_options[] = {
     "marquee", "x", "y", "position", "color", "size", "timeout", "refresh",

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 6bbdb4a0f62f1a9114f0e809a1405d24d4f22889..438125e6918af88cfa96ec81868248f631072a68 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -174,13 +174,13 @@ static const char *const ppsz_align_descriptions[] =
 
 #define CFG_PREFIX "mosaic-"
 
 
 #define CFG_PREFIX "mosaic-"
 

-vlc_module_begin();
-    set_description( N_("Mosaic video sub filter") );
-    set_shortname( N_("Mosaic") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC);
-    set_capability( "sub filter", 0 );
-    set_callbacks( CreateFilter, DestroyFilter );
+vlc_module_begin ()
+    set_description( N_("Mosaic video sub filter") )
+    set_shortname( N_("Mosaic") )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC)
+    set_capability( "sub filter", 0 )
+    set_callbacks( CreateFilter, DestroyFilter )

 
     add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
                             ALPHA_TEXT, ALPHA_LONGTEXT, false );
 
     add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
                             ALPHA_TEXT, ALPHA_LONGTEXT, false );


@@ -201,10 +201,10 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "borderw", 0, NULL,
                  BORDERW_TEXT, BORDERW_LONGTEXT, true );
 
     add_integer( CFG_PREFIX "borderw", 0, NULL,
                  BORDERW_TEXT, BORDERW_LONGTEXT, true );

-        add_deprecated_alias( CFG_PREFIX "vborder" );
+        add_deprecated_alias( CFG_PREFIX "vborder" )

     add_integer( CFG_PREFIX "borderh", 0, NULL,
                  BORDERH_TEXT, BORDERH_LONGTEXT, true );
     add_integer( CFG_PREFIX "borderh", 0, NULL,
                  BORDERH_TEXT, BORDERH_LONGTEXT, true );

-        add_deprecated_alias( CFG_PREFIX "hborder" );
+        add_deprecated_alias( CFG_PREFIX "hborder" )

 
     add_integer( CFG_PREFIX "position", 0, NULL,
                  POS_TEXT, POS_LONGTEXT, false );
 
     add_integer( CFG_PREFIX "position", 0, NULL,
                  POS_TEXT, POS_LONGTEXT, false );


@@ -227,7 +227,7 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,
                  false );
 
     add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,
                  false );

-vlc_module_end();
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "alpha", "height", "width", "align", "xoffset", "yoffset",
 
 static const char *const ppsz_filter_options[] = {
     "alpha", "height", "width", "align", "xoffset", "yoffset",

diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c
index 4b9bafeb7172fa7a6e02b2ef0d13c3b4f60fd57c..6bf0401c6159c8a59bd68f579d65fff59175f308 100644 (file)
--- a/modules/video_filter/motionblur.c
+++ b/modules/video_filter/motionblur.c
@@ -56,20 +56,20 @@ static int MotionBlurCallback( vlc_object_t *, char const *,
 
 #define FILTER_PREFIX "blur-"
 
 
 #define FILTER_PREFIX "blur-"
 

-vlc_module_begin();
-    set_shortname( N_("Motion blur") );
-    set_description( N_("Motion blur filter") );
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_shortname( N_("Motion blur") )
+    set_description( N_("Motion blur filter") )
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
     add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, NULL,
                             FACTOR_TEXT, FACTOR_LONGTEXT, false );
 
 
     add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, NULL,
                             FACTOR_TEXT, FACTOR_LONGTEXT, false );
 

-    add_shortcut( "blur" );
+    add_shortcut( "blur" )

 
 

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "factor", NULL
 
 static const char *const ppsz_filter_options[] = {
     "factor", NULL

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 34b6ed72eaeda69cf9867141a2e4a2fced03f199..5eea3e5d78c0d9b1efbdf40b01a5c49efa683551 100644 (file)
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -45,16 +45,16 @@ static void Destroy   ( vlc_object_t * );
 
 #define FILTER_PREFIX "motiondetect-"
 
 
 #define FILTER_PREFIX "motiondetect-"
 

-vlc_module_begin();
-    set_description( N_("Motion detect video filter") );
-    set_shortname( N_( "Motion Detect" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
-
-    add_shortcut( "motion" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Motion detect video filter") )
+    set_shortname( N_( "Motion Detect" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )
+
+    add_shortcut( "motion" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/video_filter/noise.c b/modules/video_filter/noise.c
index e61391e3e4e2787dbcd52ac29d12b806ed003248..dcd6cdeea9fc0cc4fefda3454c1f635bd4a31910 100644 (file)
--- a/modules/video_filter/noise.c
+++ b/modules/video_filter/noise.c
@@ -49,16 +49,16 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Noise video filter") );
-    set_shortname( N_( "Noise" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    add_shortcut( "noise" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Noise video filter") )
+    set_shortname( N_( "Noise" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    add_shortcut( "noise" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor

diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 76b86659fd69e661a94c9a1e0321859f5f2a2a07..457fad6d037b5ba8c7022004fab60609ce84f257 100644 (file)
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -63,20 +63,20 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("OpenCV face detection example filter") );
-    set_shortname( N_( "OpenCV example" ));
-    set_capability( "opencv example", 1 );
-    add_shortcut( "opencv_example" );
+vlc_module_begin ()
+    set_description( N_("OpenCV face detection example filter") )
+    set_shortname( N_( "OpenCV example" ))
+    set_capability( "opencv example", 1 )
+    add_shortcut( "opencv_example" )

 
 

-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
-    set_callbacks( OpenFilter, CloseFilter );
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER2 )
+    set_callbacks( OpenFilter, CloseFilter )

 
     add_string( "opencv-haarcascade-file", "c:\\haarcascade_frontalface_alt.xml", NULL,
                           N_("Haar cascade filename"),
                           N_("Name of XML file containing Haar cascade description"), false);
 
     add_string( "opencv-haarcascade-file", "c:\\haarcascade_frontalface_alt.xml", NULL,
                           N_("Haar cascade filename"),
                           N_("Name of XML file containing Haar cascade description"), false);

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * OpenFilter: probe the filter and return score
 
 /*****************************************************************************
  * OpenFilter: probe the filter and return score

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index ec572882199ecb4c863faa4d25975a25575bbc4a..d3080f6c11e71908f4972759d06d3b180fe626df 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -78,14 +78,14 @@ static const char *const verbosity_list[] = { "error", "warning", "debug"};
 static const char *const verbosity_list_text[] = { N_("Show only errors"),
   N_("Show errors and warnings"), N_("Show everything including debug messages")};
 
 static const char *const verbosity_list_text[] = { N_("Show only errors"),
   N_("Show errors and warnings"), N_("Show everything including debug messages")};
 

-vlc_module_begin();
-    set_description( N_("OpenCV video filter wrapper") );
-    set_shortname( N_("OpenCV" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter", 0 );
-    add_shortcut( "opencv_wrapper" );
-    set_callbacks( Create, Destroy );
+vlc_module_begin ()
+    set_description( N_("OpenCV video filter wrapper") )
+    set_shortname( N_("OpenCV" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter", 0 )
+    add_shortcut( "opencv_wrapper" )
+    set_callbacks( Create, Destroy )

     add_float_with_range( "opencv-scale", 1.0, 0.1, 2.0, NULL,
                           N_("Scale factor (0.1-2.0)"),
                           N_("Ammount by which to scale the picture before sending it to the internal OpenCV filter"),
     add_float_with_range( "opencv-scale", 1.0, 0.1, 2.0, NULL,
                           N_("Scale factor (0.1-2.0)"),
                           N_("Ammount by which to scale the picture before sending it to the internal OpenCV filter"),


@@ -105,7 +105,7 @@ vlc_module_begin();
     add_string( "opencv-filter-name", "none", NULL,
                           N_("OpenCV internal filter name"),
                           N_("Name of internal OpenCV plugin filter to use"), false);
     add_string( "opencv-filter-name", "none", NULL,
                           N_("OpenCV internal filter name"),
                           N_("Name of internal OpenCV plugin filter to use"), false);

-vlc_module_end();
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index 5cf4d0665e7fadef8a73d8353b42800c65a05a15..76df99fc4a5b4b7d81f8f391007ab61480058722 100644 (file)
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -112,9 +112,9 @@ static int MouseEvent( vlc_object_t *, char const *,
 #define OSD_UPDATE_DEFAULT 300
 #define OSD_UPDATE_MAX     1000
 
 #define OSD_UPDATE_DEFAULT 300
 #define OSD_UPDATE_MAX     1000
 

-vlc_module_begin();
-    add_integer( OSD_CFG "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false );
-    add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false );
+vlc_module_begin ()
+    add_integer( OSD_CFG "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false )
+    add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false )

     add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT,
                  false );
         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT,
                  false );
         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );


@@ -130,16 +130,16 @@ vlc_module_begin();
     add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL,
         OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, true );
 
     add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL,
         OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, true );
 

-    set_capability( "sub filter", 100 );
-    set_description( N_("On Screen Display menu") );
-    set_shortname( N_("OSD menu") );
-    add_shortcut( "osdmenu" );
+    set_capability( "sub filter", 100 )
+    set_description( N_("On Screen Display menu") )
+    set_shortname( N_("OSD menu") )
+    add_shortcut( "osdmenu" )

 
 

-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC )

 
 

-    set_callbacks( CreateFilter, DestroyFilter );
-vlc_module_end();
+    set_callbacks( CreateFilter, DestroyFilter )
+vlc_module_end ()

 
 /*****************************************************************************
  * Sub filter code
 
 /*****************************************************************************
  * Sub filter code

diff --git a/modules/video_filter/panoramix.c b/modules/video_filter/panoramix.c
index b5e9090614d9e220c5a182775e753ed98adeaf6e..c0cb19d4529b55e9904d350f95ffb426cc51694c 100644 (file)
--- a/modules/video_filter/panoramix.c
+++ b/modules/video_filter/panoramix.c
@@ -92,12 +92,12 @@ static int  SendEvents( vlc_object_t *, char const *,
 
 #define CFG_PREFIX "panoramix-"
 
 
 #define CFG_PREFIX "panoramix-"
 

-vlc_module_begin();
-    set_description( N_("Panoramix: wall with overlap video filter") );
-    set_shortname( N_("Panoramix" ));
-    set_capability( "video filter", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_description( N_("Panoramix: wall with overlap video filter") )
+    set_shortname( N_("Panoramix" ))
+    set_capability( "video filter", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
     add_integer( CFG_PREFIX "cols", -1, NULL,
                  COLS_TEXT, COLS_LONGTEXT, true );
 
     add_integer( CFG_PREFIX "cols", -1, NULL,
                  COLS_TEXT, COLS_LONGTEXT, true );


@@ -107,47 +107,47 @@ vlc_module_begin();
 #ifdef OVERLAP
 #define OFFSET_X_TEXT N_("Offset X offset (automatic compensation)")
 #define OFFSET_X_LONGTEXT N_("Select if you want an automatic offset in horizontal (in case of misalignment due to autoratio control)")
 #ifdef OVERLAP
 #define OFFSET_X_TEXT N_("Offset X offset (automatic compensation)")
 #define OFFSET_X_LONGTEXT N_("Select if you want an automatic offset in horizontal (in case of misalignment due to autoratio control)")

-    add_bool( CFG_PREFIX "offset-x", 1, NULL, OFFSET_X_TEXT, OFFSET_X_LONGTEXT, true );
+    add_bool( CFG_PREFIX "offset-x", 1, NULL, OFFSET_X_TEXT, OFFSET_X_LONGTEXT, true )

 
 #define LENGTH_TEXT N_("length of the overlapping area (in %)")
 #define LENGTH_LONGTEXT N_("Select in percent the length of the blended zone")
 
 #define LENGTH_TEXT N_("length of the overlapping area (in %)")
 #define LENGTH_LONGTEXT N_("Select in percent the length of the blended zone")

-    add_integer_with_range( CFG_PREFIX "bz-length", 100, 0, 100, NULL, LENGTH_TEXT, LENGTH_LONGTEXT, true );
+    add_integer_with_range( CFG_PREFIX "bz-length", 100, 0, 100, NULL, LENGTH_TEXT, LENGTH_LONGTEXT, true )

 
 #define HEIGHT_TEXT N_("height of the overlapping area (in %)")
 #define HEIGHT_LONGTEXT N_("Select in percent the height of the blended zone (case of 2x2 wall)")
 
 #define HEIGHT_TEXT N_("height of the overlapping area (in %)")
 #define HEIGHT_LONGTEXT N_("Select in percent the height of the blended zone (case of 2x2 wall)")

-    add_integer_with_range( CFG_PREFIX "bz-height", 100, 0, 100, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true );
+    add_integer_with_range( CFG_PREFIX "bz-height", 100, 0, 100, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true )

 
 #define ATTENUATION_TEXT N_("Attenuation")
 #define ATTENUATION_LONGTEXT N_("Check this option if you want attenuate blended zone by this plug-in (if option is unchecked, attenuate is made by opengl)")
 
 #define ATTENUATION_TEXT N_("Attenuation")
 #define ATTENUATION_LONGTEXT N_("Check this option if you want attenuate blended zone by this plug-in (if option is unchecked, attenuate is made by opengl)")

-    add_bool( CFG_PREFIX "attenuate", 1, NULL, ATTENUATION_TEXT, ATTENUATION_LONGTEXT, false );
+    add_bool( CFG_PREFIX "attenuate", 1, NULL, ATTENUATION_TEXT, ATTENUATION_LONGTEXT, false )

 
 #define BEGIN_TEXT N_("Attenuation, begin (in %)")
 #define BEGIN_LONGTEXT N_("Select in percent the Lagrange coeff of the beginning blended zone")
 
 #define BEGIN_TEXT N_("Attenuation, begin (in %)")
 #define BEGIN_LONGTEXT N_("Select in percent the Lagrange coeff of the beginning blended zone")

-    add_integer_with_range( CFG_PREFIX "bz-begin", 0, 0, 100, NULL, BEGIN_TEXT, BEGIN_LONGTEXT, true );
+    add_integer_with_range( CFG_PREFIX "bz-begin", 0, 0, 100, NULL, BEGIN_TEXT, BEGIN_LONGTEXT, true )

 
 #define MIDDLE_TEXT N_("Attenuation, middle (in %)")
 #define MIDDLE_LONGTEXT N_("Select in percent the Lagrange coeff of the middle of blended zone")
 
 #define MIDDLE_TEXT N_("Attenuation, middle (in %)")
 #define MIDDLE_LONGTEXT N_("Select in percent the Lagrange coeff of the middle of blended zone")

-    add_integer_with_range( CFG_PREFIX "bz-middle", 50, 0, 100, NULL, MIDDLE_TEXT, MIDDLE_LONGTEXT, false );
+    add_integer_with_range( CFG_PREFIX "bz-middle", 50, 0, 100, NULL, MIDDLE_TEXT, MIDDLE_LONGTEXT, false )

 
 #define END_TEXT N_("Attenuation, end (in %)")
 #define END_LONGTEXT N_("Select in percent the Lagrange coeff of the end of blended zone")
 
 #define END_TEXT N_("Attenuation, end (in %)")
 #define END_LONGTEXT N_("Select in percent the Lagrange coeff of the end of blended zone")

-    add_integer_with_range( CFG_PREFIX "bz-end", 100, 0, 100, NULL, END_TEXT, END_LONGTEXT, true );
+    add_integer_with_range( CFG_PREFIX "bz-end", 100, 0, 100, NULL, END_TEXT, END_LONGTEXT, true )

 
 #define MIDDLE_POS_TEXT N_("middle position (in %)")
 #define MIDDLE_POS_LONGTEXT N_("Select in percent (50 is center) the position of the middle point (Lagrange) of blended zone")
 
 #define MIDDLE_POS_TEXT N_("middle position (in %)")
 #define MIDDLE_POS_LONGTEXT N_("Select in percent (50 is center) the position of the middle point (Lagrange) of blended zone")

-    add_integer_with_range( CFG_PREFIX "bz-middle-pos", 50, 1, 99, NULL, MIDDLE_POS_TEXT, MIDDLE_POS_LONGTEXT, false );
+    add_integer_with_range( CFG_PREFIX "bz-middle-pos", 50, 1, 99, NULL, MIDDLE_POS_TEXT, MIDDLE_POS_LONGTEXT, false )

 #ifdef GAMMA
 #define RGAMMA_TEXT N_("Gamma (Red) correction")
 #define RGAMMA_LONGTEXT N_("Select the gamma for the correction of blended zone (Red or Y component)")
 #ifdef GAMMA
 #define RGAMMA_TEXT N_("Gamma (Red) correction")
 #define RGAMMA_LONGTEXT N_("Select the gamma for the correction of blended zone (Red or Y component)")

-    add_float_with_range( CFG_PREFIX "bz-gamma-red", 1, 0, 5, NULL, RGAMMA_TEXT, RGAMMA_LONGTEXT, true );
+    add_float_with_range( CFG_PREFIX "bz-gamma-red", 1, 0, 5, NULL, RGAMMA_TEXT, RGAMMA_LONGTEXT, true )

 
 #define GGAMMA_TEXT N_("Gamma (Green) correction")
 #define GGAMMA_LONGTEXT N_("Select the gamma for the correction of blended zone (Green or U component)")
 
 #define GGAMMA_TEXT N_("Gamma (Green) correction")
 #define GGAMMA_LONGTEXT N_("Select the gamma for the correction of blended zone (Green or U component)")

-    add_float_with_range( CFG_PREFIX "bz-gamma-green", 1, 0, 5, NULL, GGAMMA_TEXT, GGAMMA_LONGTEXT, true );
+    add_float_with_range( CFG_PREFIX "bz-gamma-green", 1, 0, 5, NULL, GGAMMA_TEXT, GGAMMA_LONGTEXT, true )

 
 #define BGAMMA_TEXT N_("Gamma (Blue) correction")
 #define BGAMMA_LONGTEXT N_("Select the gamma for the correction of blended zone (Blue or V component)")
 
 #define BGAMMA_TEXT N_("Gamma (Blue) correction")
 #define BGAMMA_LONGTEXT N_("Select the gamma for the correction of blended zone (Blue or V component)")

-    add_float_with_range( CFG_PREFIX "bz-gamma-blue", 1, 0, 5, NULL, BGAMMA_TEXT, BGAMMA_LONGTEXT, true );
+    add_float_with_range( CFG_PREFIX "bz-gamma-blue", 1, 0, 5, NULL, BGAMMA_TEXT, BGAMMA_LONGTEXT, true )

 #endif
 #define RGAMMA_BC_TEXT N_("Black Crush for Red")
 #define RGAMMA_BC_LONGTEXT N_("Select the Black Crush of blended zone (Red or Y component)")
 #endif
 #define RGAMMA_BC_TEXT N_("Black Crush for Red")
 #define RGAMMA_BC_LONGTEXT N_("Select the Black Crush of blended zone (Red or Y component)")


@@ -176,30 +176,30 @@ vlc_module_begin();
 #define GGAMMA_WL_LONGTEXT N_("Select the White Level of blended zone (Green or U component)")
 #define BGAMMA_WL_TEXT N_("White Level for Blue")
 #define BGAMMA_WL_LONGTEXT N_("Select the White Level of blended zone (Blue or V component)")
 #define GGAMMA_WL_LONGTEXT N_("Select the White Level of blended zone (Green or U component)")
 #define BGAMMA_WL_TEXT N_("White Level for Blue")
 #define BGAMMA_WL_LONGTEXT N_("Select the White Level of blended zone (Blue or V component)")

-    add_integer_with_range( CFG_PREFIX "bz-blackcrush-red", 140, 0, 255, NULL, RGAMMA_BC_TEXT, RGAMMA_BC_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-blackcrush-green", 140, 0, 255, NULL, GGAMMA_BC_TEXT, GGAMMA_BC_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-blackcrush-blue", 140, 0, 255, NULL, BGAMMA_BC_TEXT, BGAMMA_BC_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-whitecrush-red", 200, 0, 255, NULL, RGAMMA_WC_TEXT, RGAMMA_WC_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-whitecrush-green", 200, 0, 255, NULL, GGAMMA_WC_TEXT, GGAMMA_WC_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-whitecrush-blue", 200, 0, 255, NULL, BGAMMA_WC_TEXT, BGAMMA_WC_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-blacklevel-red", 150, 0, 255, NULL, RGAMMA_BL_TEXT, RGAMMA_BL_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-blacklevel-green", 150, 0, 255, NULL, GGAMMA_BL_TEXT, GGAMMA_BL_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-blacklevel-blue", 150, 0, 255, NULL, BGAMMA_BL_TEXT, BGAMMA_BL_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-whitelevel-red", 0, 0, 255, NULL, RGAMMA_WL_TEXT, RGAMMA_WL_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-whitelevel-green", 0, 0, 255, NULL, GGAMMA_WL_TEXT, GGAMMA_WL_LONGTEXT, true );
-    add_integer_with_range( CFG_PREFIX "bz-whitelevel-blue", 0, 0, 255, NULL, BGAMMA_WL_TEXT, BGAMMA_WL_LONGTEXT, true );
+    add_integer_with_range( CFG_PREFIX "bz-blackcrush-red", 140, 0, 255, NULL, RGAMMA_BC_TEXT, RGAMMA_BC_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-blackcrush-green", 140, 0, 255, NULL, GGAMMA_BC_TEXT, GGAMMA_BC_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-blackcrush-blue", 140, 0, 255, NULL, BGAMMA_BC_TEXT, BGAMMA_BC_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-whitecrush-red", 200, 0, 255, NULL, RGAMMA_WC_TEXT, RGAMMA_WC_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-whitecrush-green", 200, 0, 255, NULL, GGAMMA_WC_TEXT, GGAMMA_WC_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-whitecrush-blue", 200, 0, 255, NULL, BGAMMA_WC_TEXT, BGAMMA_WC_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-blacklevel-red", 150, 0, 255, NULL, RGAMMA_BL_TEXT, RGAMMA_BL_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-blacklevel-green", 150, 0, 255, NULL, GGAMMA_BL_TEXT, GGAMMA_BL_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-blacklevel-blue", 150, 0, 255, NULL, BGAMMA_BL_TEXT, BGAMMA_BL_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-whitelevel-red", 0, 0, 255, NULL, RGAMMA_WL_TEXT, RGAMMA_WL_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-whitelevel-green", 0, 0, 255, NULL, GGAMMA_WL_TEXT, GGAMMA_WL_LONGTEXT, true )
+    add_integer_with_range( CFG_PREFIX "bz-whitelevel-blue", 0, 0, 255, NULL, BGAMMA_WL_TEXT, BGAMMA_WL_LONGTEXT, true )

 #ifndef WIN32
 #define XINERAMA_TEXT N_("Xinerama option")
 #define XINERAMA_LONGTEXT N_("Uncheck if you have not used xinerama")
 #ifndef WIN32
 #define XINERAMA_TEXT N_("Xinerama option")
 #define XINERAMA_LONGTEXT N_("Uncheck if you have not used xinerama")

-    add_bool( CFG_PREFIX "xinerama", 1, NULL, XINERAMA_TEXT, XINERAMA_LONGTEXT, true );
+    add_bool( CFG_PREFIX "xinerama", 1, NULL, XINERAMA_TEXT, XINERAMA_LONGTEXT, true )

 #endif
 #endif
 
 #endif
 #endif
 

-    add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, true );
+    add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, true )

 
 

-    add_shortcut( "panoramix" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "panoramix" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "cols", "rows", "offset-x", "bz-length", "bz-height", "attenuate",
 
 static const char *const ppsz_filter_options[] = {
     "cols", "rows", "offset-x", "bz-length", "bz-height", "attenuate",

diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index 2e1237dcec11b0e5da21f42096b4360eb8226692..9b35429089ef2ccb39d79135aa56180c6efbd237 100644 (file)
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -71,24 +71,24 @@ static int PPNameCallback( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Video post processing filter") );
-    add_shortcut( "postprocess" ); /* name is "postproc" */
-    add_shortcut( "pp" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_description( N_("Video post processing filter") )
+    add_shortcut( "postprocess" ) /* name is "postproc" */
+    add_shortcut( "pp" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
 

-    set_capability( "video filter2", 0 );
+    set_capability( "video filter2", 0 )

 
 

-    set_callbacks( OpenPostproc, ClosePostproc );
+    set_callbacks( OpenPostproc, ClosePostproc )

 
     add_integer_with_range( FILTER_PREFIX "q", PP_QUALITY_MAX, 0,
                             PP_QUALITY_MAX, NULL, Q_TEXT, Q_LONGTEXT, false );
 
     add_integer_with_range( FILTER_PREFIX "q", PP_QUALITY_MAX, 0,
                             PP_QUALITY_MAX, NULL, Q_TEXT, Q_LONGTEXT, false );

-        add_deprecated_alias( "ffmpeg-pp-q" );
+        add_deprecated_alias( "ffmpeg-pp-q" )

     add_string( FILTER_PREFIX "name", "default", NULL, NAME_TEXT,
                 NAME_LONGTEXT, true );
     add_string( FILTER_PREFIX "name", "default", NULL, NAME_TEXT,
                 NAME_LONGTEXT, true );

-        add_deprecated_alias( "ffmpeg-pp-name" );
-vlc_module_end();
+        add_deprecated_alias( "ffmpeg-pp-name" )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "q", "name", NULL
 
 static const char *const ppsz_filter_options[] = {
     "q", "name", NULL

diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index 88a2e3515f1d89167bcd34037a87d3f9c5e59788..2e1c53c36acbb924206f16db2b97e675cdcd2ae7 100644 (file)
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -50,16 +50,16 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Psychedelic video filter") );
-    set_shortname( N_( "Psychedelic" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    add_shortcut( "psychedelic" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Psychedelic video filter") )
+    set_shortname( N_( "Psychedelic" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    add_shortcut( "psychedelic" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor

diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
index 863dccf9dc9471e9034ef3a5098e0171fd31c3c3..397c72c03a8cd9913b54f91936944f781f4d0f0c 100644 (file)
--- a/modules/video_filter/puzzle.c
+++ b/modules/video_filter/puzzle.c
@@ -71,12 +71,12 @@ static int PuzzleCallback( vlc_object_t *, char const *,
 
 #define CFG_PREFIX "puzzle-"
 
 
 #define CFG_PREFIX "puzzle-"
 

-vlc_module_begin();
-    set_description( N_("Puzzle interactive game video filter") );
-    set_shortname( N_( "Puzzle" ));
-    set_capability( "video filter", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_description( N_("Puzzle interactive game video filter") )
+    set_shortname( N_( "Puzzle" ))
+    set_capability( "video filter", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
     add_integer_with_range( CFG_PREFIX "rows", 4, 1, 128, NULL,
                             ROWS_TEXT, ROWS_LONGTEXT, false );
 
     add_integer_with_range( CFG_PREFIX "rows", 4, 1, 128, NULL,
                             ROWS_TEXT, ROWS_LONGTEXT, false );


@@ -85,8 +85,8 @@ vlc_module_begin();
     add_bool( CFG_PREFIX "black-slot", 0, NULL,
               BLACKSLOT_TEXT, BLACKSLOT_LONGTEXT, false );
 
     add_bool( CFG_PREFIX "black-slot", 0, NULL,
               BLACKSLOT_TEXT, BLACKSLOT_LONGTEXT, false );
 

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "rows", "cols", "black-slot", NULL
 
 static const char *const ppsz_filter_options[] = {
     "rows", "cols", "black-slot", NULL

diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
index 95e71c2fa7182c6dcb0f2932700b804a9204a102..e13cd64866b97dd41bf2279023e6eadfd9eabcf5 100644 (file)
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -115,14 +115,14 @@
 static int  CreateFilter ( vlc_object_t * );
 static void DestroyFilter( vlc_object_t * );
 
 static int  CreateFilter ( vlc_object_t * );
 static void DestroyFilter( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("Remote-OSD over VNC") );
-    set_capability( "sub filter", 100 );
-    set_shortname( N_("Remote-OSD") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
-    add_shortcut( "rmtosd" );
-    set_callbacks( CreateFilter, DestroyFilter );
+vlc_module_begin ()
+    set_description( N_("Remote-OSD over VNC") )
+    set_capability( "sub filter", 100 )
+    set_shortname( N_("Remote-OSD") )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC )
+    add_shortcut( "rmtosd" )
+    set_callbacks( CreateFilter, DestroyFilter )

 
     add_string( RMTOSD_CFG "host", "myvdr", NULL, RMTOSD_HOST_TEXT,
         RMTOSD_HOST_LONGTEXT, false );
 
     add_string( RMTOSD_CFG "host", "myvdr", NULL, RMTOSD_HOST_TEXT,
         RMTOSD_HOST_LONGTEXT, false );


@@ -142,7 +142,7 @@ vlc_module_begin();
     add_integer_with_range( RMTOSD_CFG "alpha", 255, 0, 255, NULL,
         RMTOSD_ALPHA_TEXT, RMTOSD_ALPHA_LONGTEXT, true );
 
     add_integer_with_range( RMTOSD_CFG "alpha", 255, 0, 255, NULL,
         RMTOSD_ALPHA_TEXT, RMTOSD_ALPHA_LONGTEXT, true );
 

-vlc_module_end();
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index 6d9776fe1849ac15ee8472f16b0ecdf3c8bf7c07..6eab4f1c17fbf0a28c01b8f608edf507dcb0f181 100644 (file)
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -49,16 +49,16 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Ripple video filter") );
-    set_shortname( N_( "Ripple" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    add_shortcut( "ripple" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Ripple video filter") )
+    set_shortname( N_( "Ripple" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    add_shortcut( "ripple" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor

diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index 55b7c9fbb88f805cd1d85427e0996dfa742f2b07..a320df3b0a6934b64b4be3bcc3cdd6dc7952d8f0 100644 (file)
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -63,19 +63,19 @@ static int PreciseRotateCallback( vlc_object_t *p_this, char const *psz_var,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Rotate video filter") );
-    set_shortname( N_( "Rotate" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_description( N_("Rotate video filter") )
+    set_shortname( N_( "Rotate" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
     add_integer_with_range( FILTER_PREFIX "angle", 30, 0, 359, NULL,
         ANGLE_TEXT, ANGLE_LONGTEXT, false );
 
 
     add_integer_with_range( FILTER_PREFIX "angle", 30, 0, 359, NULL,
         ANGLE_TEXT, ANGLE_LONGTEXT, false );
 

-    add_shortcut( "rotate" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "rotate" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "angle", NULL
 
 static const char *const ppsz_filter_options[] = {
     "angle", NULL

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 9639e6e0e72c69192cb0488dc275ea5f5a77116c..516a28ed28e514ae4b5e2552678cbee3aa316e75 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -186,43 +186,43 @@ static const char *const ppsz_title_modes[] =
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_capability( "sub filter", 1 );
-    set_shortname( "RSS / Atom" );
-    set_callbacks( CreateFilter, DestroyFilter );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
-    add_string( CFG_PREFIX "urls", "rss", NULL, MSG_TEXT, MSG_LONGTEXT, false );
-
-    set_section( N_("Position"), NULL );
-    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true );
-    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true );
-    add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false );
+vlc_module_begin ()
+    set_capability( "sub filter", 1 )
+    set_shortname( "RSS / Atom" )
+    set_callbacks( CreateFilter, DestroyFilter )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC )
+    add_string( CFG_PREFIX "urls", "rss", NULL, MSG_TEXT, MSG_LONGTEXT, false )
+
+    set_section( N_("Position"), NULL )
+    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true )
+    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true )
+    add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false )

         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 
         change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
 

-    set_section( N_("Font"), NULL );
+    set_section( N_("Font"), NULL )

     /* 5 sets the default to top [1] left [4] */
     add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, false );
     add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
                   false );
         change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
     /* 5 sets the default to top [1] left [4] */
     add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, false );
     add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
                   false );
         change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );

-    add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, false );
+    add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, false )

 
 

-    set_section( N_("Misc"), NULL );
+    set_section( N_("Misc"), NULL )

     add_integer( CFG_PREFIX "speed", 100000, NULL, SPEED_TEXT, SPEED_LONGTEXT,
                  false );
     add_integer( CFG_PREFIX "length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT,
                  false );
     add_integer( CFG_PREFIX "speed", 100000, NULL, SPEED_TEXT, SPEED_LONGTEXT,
                  false );
     add_integer( CFG_PREFIX "length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT,
                  false );

-    add_integer( CFG_PREFIX "ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, false );
-    add_bool( CFG_PREFIX "images", 1, NULL, IMAGE_TEXT, IMAGE_LONGTEXT, false );
-    add_integer( CFG_PREFIX "title", default_title, NULL, TITLE_TEXT, TITLE_LONGTEXT, false );
+    add_integer( CFG_PREFIX "ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, false )
+    add_bool( CFG_PREFIX "images", 1, NULL, IMAGE_TEXT, IMAGE_LONGTEXT, false )
+    add_integer( CFG_PREFIX "title", default_title, NULL, TITLE_TEXT, TITLE_LONGTEXT, false )

         change_integer_list( pi_title_modes, ppsz_title_modes, NULL );
 
         change_integer_list( pi_title_modes, ppsz_title_modes, NULL );
 

-    set_description( N_("RSS and Atom feed display") );
-    add_shortcut( "rss" );
-    add_shortcut( "atom" );
-vlc_module_end();
+    set_description( N_("RSS and Atom feed display") )
+    add_shortcut( "rss" )
+    add_shortcut( "atom" )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "urls", "x", "y", "position", "color", "size", "speed", "length",
 
 static const char *const ppsz_filter_options[] = {
     "urls", "x", "y", "position", "color", "size", "speed", "length",

diff --git a/modules/video_filter/rv32.c b/modules/video_filter/rv32.c
index 313fd4eeafbb4f5316b7732f7f559af76e16d690..68ef70f3469d67506a9aa072c80ac18991656e7a 100644 (file)
--- a/modules/video_filter/rv32.c
+++ b/modules/video_filter/rv32.c
@@ -53,11 +53,11 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("RV32 conversion filter") );
-    set_capability( "video filter2", 1 );
-    set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("RV32 conversion filter") )
+    set_capability( "video filter2", 1 )
+    set_callbacks( OpenFilter, CloseFilter )
+vlc_module_end ()

 
 /*****************************************************************************
  * OpenFilter: probe the filter and return score
 
 /*****************************************************************************
  * OpenFilter: probe the filter and return score

diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c
index 7aa4e98e2e23da36ed6a1ad3af3a37cea16cff04..159bd180fca315d1f9889bf6db0b74c9fcd80b1a 100644 (file)
--- a/modules/video_filter/scale.c
+++ b/modules/video_filter/scale.c
@@ -55,11 +55,11 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Video scaling filter") );
-    set_capability( "video filter2", 10 );
-    set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Video scaling filter") )
+    set_capability( "video filter2", 10 )
+    set_callbacks( OpenFilter, CloseFilter )
+vlc_module_end ()

 
 /*****************************************************************************
  * OpenFilter: probe the filter and return score
 
 /*****************************************************************************
  * OpenFilter: probe the filter and return score

diff --git a/modules/video_filter/scene.c b/modules/video_filter/scene.c
index a2a07023f4571d22b6cb6428da63cd4db104bb22..03656b5719f8cef7876c5a806fb9fc796ec9e249 100644 (file)
--- a/modules/video_filter/scene.c
+++ b/modules/video_filter/scene.c
@@ -91,12 +91,12 @@ static const char *const psz_format_list_text[] = { "PNG", "JPEG" };
 
 #define CFG_PREFIX "scene-"
 
 
 #define CFG_PREFIX "scene-"
 

-vlc_module_begin( );
-    set_shortname( N_( "Scene filter" ) );
-    set_description( N_( "Scene video filter" ) );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_capability( "video filter2", 0 );
+vlc_module_begin ()
+    set_shortname( N_( "Scene filter" ) )
+    set_description( N_( "Scene video filter" ) )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_capability( "video filter2", 0 )

 
     /* General options */
     add_string(  CFG_PREFIX "format", "png", NULL,
 
     /* General options */
     add_string(  CFG_PREFIX "format", "png", NULL,


@@ -117,8 +117,8 @@ vlc_module_begin( );
     add_integer( CFG_PREFIX "ratio", 50, NULL,
                  RATIO_TEXT, RATIO_LONGTEXT, false );
 
     add_integer( CFG_PREFIX "ratio", 50, NULL,
                  RATIO_TEXT, RATIO_LONGTEXT, false );
 

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_vfilter_options[] = {
     "format", "width", "height", "ratio", "prefix", "path", "replace", NULL
 
 static const char *const ppsz_vfilter_options[] = {
     "format", "width", "height", "ratio", "prefix", "path", "replace", NULL

diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index c95e69b83567cb29d3d216ffb002711aafbd813a..c73adddfd2ab170ccdab3e0beea9ad9011b33ced 100644 (file)
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -62,17 +62,17 @@ static int SharpenCallback( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Augment contrast between contours.") );
-    set_shortname( N_("Sharpen video filter") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
+vlc_module_begin ()
+    set_description( N_("Augment contrast between contours.") )
+    set_shortname( N_("Sharpen video filter") )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )

     add_float_with_range( "sharpen-sigma", 0.05, 0.0, 2.0, NULL,
         SIG_TEXT, SIG_LONGTEXT, false );
     add_float_with_range( "sharpen-sigma", 0.05, 0.0, 2.0, NULL,
         SIG_TEXT, SIG_LONGTEXT, false );

-    add_shortcut( "sharpen" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "sharpen" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "sigma", NULL
 
 static const char *const ppsz_filter_options[] = {
     "sigma", NULL

diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index 2b3dedabb92c7d47bd8f3b23e89e1c8f4279b608..98c176eb1c544ac846ff16626c2e979ff4a30406 100644 (file)
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -64,15 +64,15 @@ const char *const ppsz_mode_descriptions[] =
   N_("Area"), N_("Luma bicubic / chroma bilinear"), N_("Gauss"),
   N_("SincR"), N_("Lanczos"), N_("Bicubic spline") };
 
   N_("Area"), N_("Luma bicubic / chroma bilinear"), N_("Gauss"),
   N_("SincR"), N_("Lanczos"), N_("Bicubic spline") };
 

-vlc_module_begin();
-    set_description( N_("Video scaling filter") );
-    set_capability( "video filter2", 150 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_callbacks( OpenScaler, CloseScaler );
-    add_integer( "swscale-mode", 2, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true );
+vlc_module_begin ()
+    set_description( N_("Video scaling filter") )
+    set_capability( "video filter2", 150 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_callbacks( OpenScaler, CloseScaler )
+    add_integer( "swscale-mode", 2, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true )

         change_integer_list( pi_mode_values, ppsz_mode_descriptions, NULL );
         change_integer_list( pi_mode_values, ppsz_mode_descriptions, NULL );

-vlc_module_end();
+vlc_module_end ()

 
 /* Version checking */
 #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
 
 /* Version checking */
 #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)

diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c
index 541f08b142946aa10125c1dc2f99d91ea2ac1e6c..7f84edc7f3fdf8d178c5a62d77105f6a6eb82026 100644 (file)
--- a/modules/video_filter/transform.c
+++ b/modules/video_filter/transform.c
@@ -72,20 +72,20 @@ static const char *const type_list_text[] = { N_("Rotate by 90 degrees"),
 
 #define CFG_PREFIX "transform-"
 
 
 #define CFG_PREFIX "transform-"
 

-vlc_module_begin();
-    set_description( N_("Video transformation filter") );
-    set_shortname( N_("Transformation"));
-    set_capability( "video filter", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+    set_description( N_("Video transformation filter") )
+    set_shortname( N_("Transformation"))
+    set_capability( "video filter", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

 
     add_string( CFG_PREFIX "type", "90", NULL,
                           TYPE_TEXT, TYPE_LONGTEXT, false);
         change_string_list( type_list, type_list_text, 0);
 
 
     add_string( CFG_PREFIX "type", "90", NULL,
                           TYPE_TEXT, TYPE_LONGTEXT, false);
         change_string_list( type_list, type_list_text, 0);
 

-    add_shortcut( "transform" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "transform" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "type", NULL
 
 static const char *const ppsz_filter_options[] = {
     "type", NULL

diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c
index b5bd62665c26046bfaeaf61a1a7e561c0e02f052..c41f9d18919c220c25d20065c64ee0d158d61d93 100644 (file)
--- a/modules/video_filter/wall.c
+++ b/modules/video_filter/wall.c
@@ -71,22 +71,22 @@ static int  SendEvents( vlc_object_t *, char const *,
 
 #define CFG_PREFIX "wall-"
 
 
 #define CFG_PREFIX "wall-"
 

-vlc_module_begin();
-    set_description( N_("Wall video filter") );
-    set_shortname( N_("Image wall" ));
-    set_capability( "video filter", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    add_integer( CFG_PREFIX "cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, false );
-    add_integer( CFG_PREFIX "rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, false );
+vlc_module_begin ()
+    set_description( N_("Wall video filter") )
+    set_shortname( N_("Image wall" ))
+    set_capability( "video filter", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    add_integer( CFG_PREFIX "cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, false )
+    add_integer( CFG_PREFIX "rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, false )

     add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT,
                  true );
     add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT,
                  true );

-    add_string( CFG_PREFIX "element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, false );
+    add_string( CFG_PREFIX "element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, false )

 
 

-    add_shortcut( "wall" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    add_shortcut( "wall" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_filter_options[] = {
     "cols", "rows", "active", "element-aspect", NULL
 
 static const char *const ppsz_filter_options[] = {
     "cols", "rows", "active", "element-aspect", NULL

diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index 03fb7c25879b159f8139851d9a4952692d218986..e51dfe580900333482adc97675a69b80a646518a 100644 (file)
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -50,16 +50,16 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Wave video filter") );
-    set_shortname( N_( "Wave" ));
-    set_capability( "video filter2", 0 );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-
-    add_shortcut( "wave" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Wave video filter") )
+    set_shortname( N_( "Wave" ))
+    set_capability( "video filter2", 0 )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+    add_shortcut( "wave" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor

diff --git a/modules/video_filter/yuvp.c b/modules/video_filter/yuvp.c
index 97031855866b82e79bab063a166b005f25203ce3..5023b422506373d9e9eae8d53bc84060ac9f820b 100644 (file)
--- a/modules/video_filter/yuvp.c
+++ b/modules/video_filter/yuvp.c
@@ -43,11 +43,11 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("YUVP converter") );
-    set_capability( "video filter2", 10 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("YUVP converter") )
+    set_capability( "video filter2", 10 )
+    set_callbacks( Open, Close )
+vlc_module_end ()

 
 /****************************************************************************
  * Local prototypes
 
 /****************************************************************************
  * Local prototypes

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 9710b593d3a3d198185b28f251c1182517ad2c2e..9123a5153f748543cc947e99919eebad2baf6181 100644 (file)
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -54,15 +54,15 @@ static void SetPalette     ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t *
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_shortname( N_("ASCII Art"));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("ASCII-art video output") );
-    set_capability( "video output", 10 );
-    add_shortcut( "aalib" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( N_("ASCII Art"))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("ASCII-art video output") )
+    set_capability( "video output", 10 )
+    add_shortcut( "aalib" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: aa video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: aa video output method descriptor

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 75cd02d97b00e4b7e0480d2d9b5e00fd8658d2fa..79f079dc5fb3ffc94814c7f9b3aa47334eef2945 100644 (file)
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -76,14 +76,14 @@ static void Display   ( vout_thread_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_shortname( "Caca" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("Color ASCII art video output") );
-    set_capability( "video output", 12 );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "Caca" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("Color ASCII art video output") )
+    set_capability( "video output", 12 )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: libcaca video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: libcaca video output method descriptor

diff --git a/modules/video_output/directfb.c b/modules/video_output/directfb.c
index 17876afe5fb9ff5a01742094e8cae83eabaf8bb0..5d31d80a379beb5e3181d7b5c8ccb615df1a29c0 100644 (file)
--- a/modules/video_output/directfb.c
+++ b/modules/video_output/directfb.c
@@ -65,15 +65,15 @@ struct vout_sys_t
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_shortname( "DirectFB" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("DirectFB video output http://www.directfb.org/") );
-    set_capability( "video output", 60 );
-    add_shortcut( "directfb" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "DirectFB" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("DirectFB video output http://www.directfb.org/") )
+    set_capability( "video output", 60 )
+    add_shortcut( "directfb" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 
 static int Create( vlc_object_t *p_this )
 
 
 static int Create( vlc_object_t *p_this )

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 2512548511dd579c99aa5374231f65595328b502..d0eb84aafadc104248971124b62435dcdacb7a95 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -103,13 +103,13 @@ static void GfxMode        ( int i_tty );
     "in hardware then you must disable this option. It then does double buffering " \
     "in software." )
 
     "in hardware then you must disable this option. It then does double buffering " \
     "in software." )
 

-vlc_module_begin();
-    set_shortname( "Framebuffer" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
+vlc_module_begin ()
+    set_shortname( "Framebuffer" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )

     add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
               false );
     add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
               false );

-    add_bool( "fb-tty", 1, NULL, TTY_TEXT, TTY_LONGTEXT, true );
+    add_bool( "fb-tty", 1, NULL, TTY_TEXT, TTY_LONGTEXT, true )

     add_string( "fb-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
                 true );
     add_string( "fb-aspect-ratio", NULL, NULL, ASPECT_RATIO_TEXT,
     add_string( "fb-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
                 true );
     add_string( "fb-aspect-ratio", NULL, NULL, ASPECT_RATIO_TEXT,


@@ -118,10 +118,10 @@ vlc_module_begin();
                  true );
     add_bool( "fb-hw-accel", true, NULL, HW_ACCEL_TEXT, HW_ACCEL_LONGTEXT,
               true );
                  true );
     add_bool( "fb-hw-accel", true, NULL, HW_ACCEL_TEXT, HW_ACCEL_LONGTEXT,
               true );

-    set_description( N_("GNU/Linux console framebuffer video output") );
-    set_capability( "video output", 30 );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_description( N_("GNU/Linux console framebuffer video output") )
+    set_capability( "video output", 30 )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: video output framebuffer method descriptor
 
 /*****************************************************************************
  * vout_sys_t: video output framebuffer method descriptor

diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c
index b3ae57485402f227ed67e8304c615bc1559de1db..7ee119f54ed8d1c799a3942fe67ac19f13a898f7 100644 (file)
--- a/modules/video_output/ggi.c
+++ b/modules/video_output/ggi.c
@@ -62,12 +62,12 @@ static void SetPalette     ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t *
             "By default, VLC will use the value of the DISPLAY " \
             "environment variable.")
 
             "By default, VLC will use the value of the DISPLAY " \
             "environment variable.")
 

-vlc_module_begin();
-    add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true );
-    set_description( "General Graphics Interface video output" );
-    set_capability( "video output", 30 );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
+    set_description( "General Graphics Interface video output" )
+    set_capability( "video output", 30 )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: video output GGI method descriptor
 
 /*****************************************************************************
  * vout_sys_t: video output GGI method descriptor

diff --git a/modules/video_output/hd1000v.cpp b/modules/video_output/hd1000v.cpp
index e5cbf29df0671c8dba2650435e6449c1f3831705..fa6b2058a9d24b6d8a0263f55992af3e380dbcab 100644 (file)
--- a/modules/video_output/hd1000v.cpp
+++ b/modules/video_output/hd1000v.cpp
@@ -56,12 +56,12 @@ static void FreePicture( vout_thread_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("HD1000 video output") );
-    set_capability( "video output", 100 );
-    add_shortcut( "hd1000v" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("HD1000 video output") )
+    set_capability( "video output", 100 )
+    add_shortcut( "hd1000v" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: video output method descriptor

diff --git a/modules/video_output/mga.c b/modules/video_output/mga.c
index 9cfbad461d08bd5f4e447cb1c2953ebd391e8b1a..7ebcefcd8bdf140e3722074e005ce730ac597154 100644 (file)
--- a/modules/video_output/mga.c
+++ b/modules/video_output/mga.c
@@ -58,11 +58,11 @@ static int  NewPicture     ( vout_thread_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_description( N_("Matrox Graphic Array video output") );
-    set_capability( "video output", 10 );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Matrox Graphic Array video output") )
+    set_capability( "video output", 10 )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: video output MGA method descriptor
 
 /*****************************************************************************
  * vout_sys_t: video output MGA method descriptor

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 8e1c07f3f66da878aa679562e561a6d171a2a12c..d27e2b2bae13de0f403e213ab44c8fdadde5cffc 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -105,18 +105,18 @@ static int get_capability_for_osversion(void)
     return 50;
 }
 
     return 50;
 }
 

-vlc_module_begin();
-    set_shortname( "Direct3D" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("DirectX 3D video output") );
-    set_capability( "video output", get_capability_for_osversion() );
-    add_shortcut( "direct3d" );
-    set_callbacks( OpenVideo, CloseVideo );
+vlc_module_begin ()
+    set_shortname( "Direct3D" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("DirectX 3D video output") )
+    set_capability( "video output", get_capability_for_osversion() )
+    add_shortcut( "direct3d" )
+    set_callbacks( OpenVideo, CloseVideo )

 
     /* FIXME: Hack to avoid unregistering our window class */
 
     /* FIXME: Hack to avoid unregistering our window class */

-    linked_with_a_crap_library_which_uses_atexit( );
-vlc_module_end();
+    linked_with_a_crap_library_which_uses_atexit ()
+vlc_module_end ()

 
 #if 0 /* FIXME */
     /* check if we registered a window class because we need to
 
 #if 0 /* FIXME */
     /* check if we registered a window class because we need to

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index 4720f98b326b5638a6737dbc0bf8a56cff05ebca..654d8425cb67f45c7cda67a7c3656d9dfe00946b 100644 (file)
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -160,10 +160,10 @@ static int WallpaperCallback( vlc_object_t *, char const *,
 static const char *const ppsz_dev[] = { "" };
 static const char *const ppsz_dev_text[] = { N_("Default") };
 
 static const char *const ppsz_dev[] = { "" };
 static const char *const ppsz_dev_text[] = { N_("Default") };
 

-vlc_module_begin();
-    set_shortname( "DirectX" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
+vlc_module_begin ()
+    set_shortname( "DirectX" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )

     add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT,
               true );
     add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT,
     add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT,
               true );
     add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT,


@@ -174,19 +174,19 @@ vlc_module_begin();
     add_string( "directx-device", "", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
                 true );
         change_string_list( ppsz_dev, ppsz_dev_text, FindDevicesCallback );
     add_string( "directx-device", "", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
                 true );
         change_string_list( ppsz_dev, ppsz_dev_text, FindDevicesCallback );

-        change_action_add( FindDevicesCallback, N_("Refresh list") );
+        change_action_add( FindDevicesCallback, N_("Refresh list") )

 
     add_bool( "directx-wallpaper", 0, NULL, WALLPAPER_TEXT, WALLPAPER_LONGTEXT,
               true );
 
 
     add_bool( "directx-wallpaper", 0, NULL, WALLPAPER_TEXT, WALLPAPER_LONGTEXT,
               true );
 

-    set_description( N_("DirectX video output") );
-    set_capability( "video output", 100 );
-    add_shortcut( "directx" );
-    set_callbacks( OpenVideo, CloseVideo );
+    set_description( N_("DirectX video output") )
+    set_capability( "video output", 100 )
+    add_shortcut( "directx" )
+    set_callbacks( OpenVideo, CloseVideo )

 
     /* FIXME: Hack to avoid unregistering our window class */
 
     /* FIXME: Hack to avoid unregistering our window class */

-    linked_with_a_crap_library_which_uses_atexit( );
-vlc_module_end();
+    linked_with_a_crap_library_which_uses_atexit ()
+vlc_module_end ()

 
 #if 0 /* FIXME */
     /* check if we registered a window class because we need to
 
 #if 0 /* FIXME */
     /* check if we registered a window class because we need to

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index c0fd6c080be26cef9d3ab9fe468095ea0b63e612..a7d5a09d47b4113daeeaa657ddc9d466d88bbb42 100644 (file)
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -62,18 +62,18 @@ static void FirstSwap( vout_thread_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_shortname( "OpenGL" );
-    set_description( N_("OpenGL video output") );
-    set_capability( "opengl provider", 100 );
-    add_shortcut( "glwin32" );
-    set_callbacks( OpenVideo, CloseVideo );
+vlc_module_begin ()
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_shortname( "OpenGL" )
+    set_description( N_("OpenGL video output") )
+    set_capability( "opengl provider", 100 )
+    add_shortcut( "glwin32" )
+    set_callbacks( OpenVideo, CloseVideo )

 
     /* FIXME: Hack to avoid unregistering our window class */
 
     /* FIXME: Hack to avoid unregistering our window class */

-    linked_with_a_crap_library_which_uses_atexit( );
-vlc_module_end();
+    linked_with_a_crap_library_which_uses_atexit ()
+vlc_module_end ()

 
 #if 0 /* FIXME */
     /* check if we registered a window class because we need to
 
 #if 0 /* FIXME */
     /* check if we registered a window class because we need to

diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index 251e55f1c321bf8284d597598cf502bfb19451d3..a1448deea9def90ef06bd258f8fd36f6864c0a94 100644 (file)
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -132,20 +132,20 @@ static void InitBuffers        ( vout_thread_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
+vlc_module_begin ()
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )

 #ifdef MODULE_NAME_IS_wingapi
 #ifdef MODULE_NAME_IS_wingapi

-    set_shortname( "Windows GAPI" );
-    set_description( N_("Windows GAPI video output") );
-    set_capability( "video output", 20 );
+    set_shortname( "Windows GAPI" )
+    set_description( N_("Windows GAPI video output") )
+    set_capability( "video output", 20 )

 #else
 #else

-    set_shortname( "Windows GDI" );
-    set_description( N_("Windows GDI video output") );
-    set_capability( "video output", 10 );
+    set_shortname( "Windows GDI" )
+    set_description( N_("Windows GDI video output") )
+    set_capability( "video output", 10 )

 #endif
 #endif

-    set_callbacks( OpenVideo, CloseVideo );
-vlc_module_end();
+    set_callbacks( OpenVideo, CloseVideo )
+vlc_module_end ()

 
 /*****************************************************************************
  * OpenVideo: activate GDI video thread output method
 
 /*****************************************************************************
  * OpenVideo: activate GDI video thread output method

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index ceae3bb86670e0177fce2e823292fba4777aec17..a36315057d5b5af4720fd83d3fb894b324d69d95 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -182,17 +182,17 @@ static const char *const ppsz_effects_text[] = {
         N_("None"), N_("Cube"), N_("Transparent Cube") };
 #endif
 
         N_("None"), N_("Cube"), N_("Transparent Cube") };
 #endif
 

-vlc_module_begin();
-    set_shortname( "OpenGL" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("OpenGL video output") );
+vlc_module_begin ()
+    set_shortname( "OpenGL" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("OpenGL video output") )

 #ifdef __APPLE__
 #ifdef __APPLE__

-    set_capability( "video output", 200 );
+    set_capability( "video output", 200 )

 #else
 #else

-    set_capability( "video output", 20 );
+    set_capability( "video output", 20 )

 #endif
 #endif

-    add_shortcut( "opengl" );
+    add_shortcut( "opengl" )

     add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT,
                     SPEED_LONGTEXT, true );
 #ifdef OPENGL_MORE_EFFECT
     add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT,
                     SPEED_LONGTEXT, true );
 #ifdef OPENGL_MORE_EFFECT


@@ -211,11 +211,11 @@ vlc_module_begin();
     /* Allow opengl provider plugin selection */
     add_string( "opengl-provider", "default", NULL, PROVIDER_TEXT, 
                     PROVIDER_LONGTEXT, true );
     /* Allow opengl provider plugin selection */
     add_string( "opengl-provider", "default", NULL, PROVIDER_TEXT, 
                     PROVIDER_LONGTEXT, true );

-    set_callbacks( CreateVout, DestroyVout );
+    set_callbacks( CreateVout, DestroyVout )

     add_string( "opengl-effect", "none", NULL, EFFECT_TEXT,
                  EFFECT_LONGTEXT, false );
         change_string_list( ppsz_effects, ppsz_effects_text, 0 );
     add_string( "opengl-effect", "none", NULL, EFFECT_TEXT,
                  EFFECT_LONGTEXT, false );
         change_string_list( ppsz_effects, ppsz_effects_text, 0 );

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: video output method descriptor
 
 /*****************************************************************************
  * vout_sys_t: video output method descriptor

diff --git a/modules/video_output/opengllayer.m b/modules/video_output/opengllayer.m
index e15c745723cbd3a227a011a84141bdce0fb96571..b59f6bb4967e357d3387848319b5f6614d6d6d6f 100644 (file)
--- a/modules/video_output/opengllayer.m
+++ b/modules/video_output/opengllayer.m
@@ -89,15 +89,15 @@ static int  Control      ( vout_thread_t *, int, va_list );
 
 static int InitTextures  ( vout_thread_t * );
 
 
 static int InitTextures  ( vout_thread_t * );
 

-vlc_module_begin();
-    set_shortname( "OpenGLLayer" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("Core Animation OpenGL Layer (Mac OS X)") );
-    set_capability( "video output", 20 );
-    add_shortcut( "opengllayer" );
-    set_callbacks( CreateVout, DestroyVout );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "OpenGLLayer" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("Core Animation OpenGL Layer (Mac OS X)") )
+    set_capability( "video output", 20 )
+    add_shortcut( "opengllayer" )
+    set_callbacks( CreateVout, DestroyVout )
+vlc_module_end ()

 
 @interface VLCVoutLayer : CAOpenGLLayer {
     vout_thread_t * p_vout;
 
 @interface VLCVoutLayer : CAOpenGLLayer {
     vout_thread_t * p_vout;

diff --git a/modules/video_output/qte/qte.cpp b/modules/video_output/qte/qte.cpp
index 5bf810989f690d643ca3c021a193564847a9ff60..1c310bc5a494d4e9dda8f25928c0d955bc8680a0 100644 (file)
--- a/modules/video_output/qte/qte.cpp
+++ b/modules/video_output/qte/qte.cpp
@@ -112,16 +112,16 @@ static void* RunQtThread( vlc_object_t *p_this );
 extern "C"
 {
 
 extern "C"
 {
 

-vlc_module_begin();
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-//    add_category_hint( N_("QT Embedded"), NULL );
-//    add_string( "qte-display", "landscape", NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT);
-    set_description( N_("QT Embedded video output") );
-    set_capability( "video output", 70 );
-    add_shortcut( "qte" );
-    set_callbacks( Open, Close);
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+//    add_category_hint( N_("QT Embedded"), NULL )
+//    add_string( "qte-display", "landscape", NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT)
+    set_description( N_("QT Embedded video output") )
+    set_capability( "video output", 70 )
+    add_shortcut( "qte" )
+    set_callbacks( Open, Close)
+vlc_module_end ()

 
 } /* extern "C" */
 
 
 } /* extern "C" */
 

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 0e1acfe48f0fb906af61b7095f5dff0f33b4c5ef..3dbcfef7b4246258a25b4aeb456d899ed8c4335d 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -120,20 +120,20 @@ static int ConvertKey( SDLKey );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_shortname( "SDL" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("Simple DirectMedia Layer video output") );
-    set_capability( "video output", 60 );
-    add_shortcut( "sdl" );
-    add_string( "sdl-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true );
-    set_callbacks( Open, Close );
+vlc_module_begin ()
+    set_shortname( "SDL" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("Simple DirectMedia Layer video output") )
+    set_capability( "video output", 60 )
+    add_shortcut( "sdl" )
+    add_string( "sdl-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
+    set_callbacks( Open, Close )

 #if defined( __i386__ ) || defined( __x86_64__ )
     /* On i386, SDL is linked against svgalib */
 #if defined( __i386__ ) || defined( __x86_64__ )
     /* On i386, SDL is linked against svgalib */

-    linked_with_a_crap_library_which_uses_atexit();
+    linked_with_a_crap_library_which_uses_atexit ()

 #endif
 #endif

-vlc_module_end();
+vlc_module_end ()

 
 static vlc_mutex_t sdl_lock = VLC_STATIC_MUTEX;
 
 
 static vlc_mutex_t sdl_lock = VLC_STATIC_MUTEX;
 

diff --git a/modules/video_output/snapshot.c b/modules/video_output/snapshot.c
index a37ac2d0836a41d381c8fe94c77a81a079216a3f..08d43814119c803080ecfb71edcb81065ec2d63d 100644 (file)
--- a/modules/video_output/snapshot.c
+++ b/modules/video_output/snapshot.c
@@ -76,21 +76,21 @@ static void Display   ( vout_thread_t *, picture_t * );
 #define CACHE_LONGTEXT N_( "Snapshot cache size (number of images to keep)." )
 
 
 #define CACHE_LONGTEXT N_( "Snapshot cache size (number of images to keep)." )
 
 

-vlc_module_begin( );
-    set_description( N_( "Snapshot module" ) );
-    set_shortname( N_("Snapshot") );
+vlc_module_begin ()
+    set_description( N_( "Snapshot module" ) )
+    set_shortname( N_("Snapshot") )

 
 

-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_capability( "video output", 1 );
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_capability( "video output", 1 )

 
 

-    add_integer( "snapshot-width", 320, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, false );
-    add_integer( "snapshot-height", 200, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, false );
-    add_string( "snapshot-chroma", "RV32", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true );
-    add_integer( "snapshot-cache-size", 50, NULL, CACHE_TEXT, CACHE_LONGTEXT, true );
+    add_integer( "snapshot-width", 320, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, false )
+    add_integer( "snapshot-height", 200, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, false )
+    add_string( "snapshot-chroma", "RV32", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
+    add_integer( "snapshot-cache-size", 50, NULL, CACHE_TEXT, CACHE_LONGTEXT, true )

 
 

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: video output descriptor
 
 /*****************************************************************************
  * vout_sys_t: video output descriptor

diff --git a/modules/video_output/svgalib.c b/modules/video_output/svgalib.c
index 0563758344657347ef2041ab5ecdf1878acc0746..a947600e789a3d79b151c83d51796d52a8e3e6d5 100644 (file)
--- a/modules/video_output/svgalib.c
+++ b/modules/video_output/svgalib.c
@@ -53,15 +53,15 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

-vlc_module_begin();
-    set_shortname( "SVGAlib" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("SVGAlib video output") );
-    set_capability( "video output", 0 );
-    set_callbacks( Create, Destroy );
-    linked_with_a_crap_library_which_uses_atexit();
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "SVGAlib" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("SVGAlib video output") )
+    set_capability( "video output", 0 )
+    set_callbacks( Create, Destroy )
+    linked_with_a_crap_library_which_uses_atexit ()
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: video output descriptor
 
 /*****************************************************************************
  * vout_sys_t: video output descriptor

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 76f7fd0500ab4e16efbbb3fd0bb17c2498a0168a..dd6985cd0d15aaeebf954fa448a03abbab79153e 100644 (file)
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -71,24 +71,24 @@ static int  UnlockPicture ( vout_thread_t *, picture_t * );
 #define T_DATA N_( "Callback data" )
 #define LT_DATA N_( "Data for the locking and unlocking functions" )
 
 #define T_DATA N_( "Callback data" )
 #define LT_DATA N_( "Data for the locking and unlocking functions" )
 

-vlc_module_begin( );
-    set_description( N_( "Video memory module" ) );
-    set_shortname( N_("Video memory") );
-
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_capability( "video output", 0 );
-
-    add_integer( "vmem-width", 320, NULL, T_WIDTH, LT_WIDTH, false );
-    add_integer( "vmem-height", 200, NULL, T_HEIGHT, LT_HEIGHT, false );
-    add_integer( "vmem-pitch", 640, NULL, T_PITCH, LT_PITCH, false );
-    add_string( "vmem-chroma", "RV16", NULL, T_CHROMA, LT_CHROMA, true );
-    add_string( "vmem-lock", "0", NULL, T_LOCK, LT_LOCK, true );
-    add_string( "vmem-unlock", "0", NULL, T_UNLOCK, LT_UNLOCK, true );
-    add_string( "vmem-data", "0", NULL, T_DATA, LT_DATA, true );
-
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_( "Video memory module" ) )
+    set_shortname( N_("Video memory") )
+
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_capability( "video output", 0 )
+
+    add_integer( "vmem-width", 320, NULL, T_WIDTH, LT_WIDTH, false )
+    add_integer( "vmem-height", 200, NULL, T_HEIGHT, LT_HEIGHT, false )
+    add_integer( "vmem-pitch", 640, NULL, T_PITCH, LT_PITCH, false )
+    add_string( "vmem-chroma", "RV16", NULL, T_CHROMA, LT_CHROMA, true )
+    add_string( "vmem-lock", "0", NULL, T_LOCK, LT_LOCK, true )
+    add_string( "vmem-unlock", "0", NULL, T_UNLOCK, LT_UNLOCK, true )
+    add_string( "vmem-data", "0", NULL, T_DATA, LT_DATA, true )
+
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 /*****************************************************************************
  * vout_sys_t: video output descriptor
 
 /*****************************************************************************
  * vout_sys_t: video output descriptor

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 8e56c5473f97fc219cac893d52de1cc3f6bcc585..bdc68b018f7bd8ff9dfbcb50f6841e6e7444cda6 100644 (file)
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -115,24 +115,24 @@ static void SwitchContext( vout_thread_t * );
     "Screen to use in fullscreen mode. For instance " \
     "set it to 0 for first screen, 1 for the second.")
 
     "Screen to use in fullscreen mode. For instance " \
     "set it to 0 for first screen, 1 for the second.")
 

-vlc_module_begin();
-    set_shortname( "OpenGL(GLX)" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( N_("OpenGL(GLX) provider") );
-    set_capability( "opengl provider", 50 );
-    set_callbacks( CreateOpenGL, DestroyOpenGL );
-
-    add_string( "glx-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true );
-    add_integer( "glx-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true );
-    add_bool( "glx-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true );
+vlc_module_begin ()
+    set_shortname( "OpenGL(GLX)" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("OpenGL(GLX) provider") )
+    set_capability( "opengl provider", 50 )
+    set_callbacks( CreateOpenGL, DestroyOpenGL )
+
+    add_string( "glx-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
+    add_integer( "glx-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true )
+    add_bool( "glx-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )

 #ifdef HAVE_SYS_SHM_H
 #ifdef HAVE_SYS_SHM_H

-    add_bool( "glx-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true );
+    add_bool( "glx-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )

 #endif
 #ifdef HAVE_XINERAMA
 #endif
 #ifdef HAVE_XINERAMA

-    add_integer ( "glx-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
+    add_integer ( "glx-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )

 #endif
 #endif

-vlc_module_end();
+vlc_module_end ()

 
 /*****************************************************************************
  * Exported prototypes
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index a67a26441e858e5026ed895a0517f11891e731ba..179e3d5a84b49a6ec62858d91b05a38d750bacc9 100644 (file)
--- a/modules/video_output/x11/x11.c
+++ b/modules/video_output/x11/x11.c
@@ -66,20 +66,20 @@ extern void Deactivate ( vlc_object_t * );
     "Screen to use in fullscreen mode. For instance " \
     "set it to 0 for first screen, 1 for the second.")
 
     "Screen to use in fullscreen mode. For instance " \
     "set it to 0 for first screen, 1 for the second.")
 

-vlc_module_begin();
-    set_shortname( "X11" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true );
-    add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true );
+vlc_module_begin ()
+    set_shortname( "X11" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
+    add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )

 #ifdef HAVE_SYS_SHM_H
 #ifdef HAVE_SYS_SHM_H

-    add_bool( "x11-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true );
+    add_bool( "x11-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )

 #endif
 #ifdef HAVE_XINERAMA
 #endif
 #ifdef HAVE_XINERAMA

-    add_integer ( "x11-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
+    add_integer ( "x11-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )

 #endif
 #endif

-    set_description( N_("X11 video output") );
-    set_capability( "video output", 70 );
-    set_callbacks( Activate, Deactivate );
-vlc_module_end();
+    set_description( N_("X11 video output") )
+    set_capability( "video output", 70 )
+    set_callbacks( Activate, Deactivate )
+vlc_module_end ()

 
 

diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index 2b05b97dfb3e6ec0c1d2be059a503fec885d0232..6ac68df58a3e92da574d97526a66003e2444f0a5 100644 (file)
--- a/modules/video_output/x11/xvideo.c
+++ b/modules/video_output/x11/xvideo.c
@@ -77,25 +77,25 @@ extern void Deactivate ( vlc_object_t * );
     "Screen to use in fullscreen mode. For instance " \
     "set it to 0 for first screen, 1 for the second.")
 
     "Screen to use in fullscreen mode. For instance " \
     "set it to 0 for first screen, 1 for the second.")
 

-vlc_module_begin();
-    set_shortname( "XVideo" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true );
-    add_integer( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true );
-    add_bool( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true );
-    add_string( "xvideo-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true );
+vlc_module_begin ()
+    set_shortname( "XVideo" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
+    add_integer( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true )
+    add_bool( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )
+    add_string( "xvideo-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )

 #ifdef HAVE_SYS_SHM_H
 #ifdef HAVE_SYS_SHM_H

-    add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true );
+    add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )

 #endif
 #ifdef HAVE_XINERAMA
 #endif
 #ifdef HAVE_XINERAMA

-    add_integer ( "xvideo-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
+    add_integer ( "xvideo-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )

 #endif
 
 #endif
 

-    set_description( N_("XVideo extension video output") );
-    set_capability( "video output", 150 );
-    set_callbacks( Activate, Deactivate );
-vlc_module_end();
+    set_description( N_("XVideo extension video output") )
+    set_capability( "video output", 150 )
+    set_callbacks( Activate, Deactivate )
+vlc_module_end ()

 
 /* following functions are local */
 
 
 /* following functions are local */
 

diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c
index 166ef6e4011b6bce9f6f756f94ce701db5029e17..4c7650f0533ff30a0a120cbb962a85932c17b9c4 100644 (file)
--- a/modules/video_output/x11/xvmc.c
+++ b/modules/video_output/x11/xvmc.c
@@ -133,25 +133,25 @@ extern void Deactivate ( vlc_object_t * );
 #define CROP_TEXT N_("Crop")
 #define CROP_LONGTEXT N_("You can choose the crop style to apply.")
 
 #define CROP_TEXT N_("Crop")
 #define CROP_LONGTEXT N_("You can choose the crop style to apply.")
 

-vlc_module_begin();
-    set_shortname( "XVMC" );
-    add_string( "xvmc-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true );
-    add_integer( "xvmc-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true );
-    add_bool( "xvmc-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true );
-    add_string( "xvmc-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true );
+vlc_module_begin ()
+    set_shortname( "XVMC" )
+    add_string( "xvmc-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
+    add_integer( "xvmc-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true )
+    add_bool( "xvmc-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )
+    add_string( "xvmc-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )

 #ifdef HAVE_SYS_SHM_H
 #ifdef HAVE_SYS_SHM_H

-    add_bool( "xvmc-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true );
+    add_bool( "xvmc-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )

 #endif
 #ifdef HAVE_XINERAMA
 #endif
 #ifdef HAVE_XINERAMA

-    add_integer ( "xvmc-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true );
+    add_integer ( "xvmc-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )

 #endif
 #endif

-    add_string( "xvmc-deinterlace-mode", "bob", NULL, MODE_TEXT, MODE_LONGTEXT, false );
-    add_string( "xvmc-crop-style", "eq", NULL, CROP_TEXT, CROP_LONGTEXT, false );
+    add_string( "xvmc-deinterlace-mode", "bob", NULL, MODE_TEXT, MODE_LONGTEXT, false )
+    add_string( "xvmc-crop-style", "eq", NULL, CROP_TEXT, CROP_LONGTEXT, false )

 
 

-    set_description( N_("XVMC extension video output") );
-    set_capability( "video output", 10 );
-    set_callbacks( Activate, Deactivate );
-vlc_module_end();
+    set_description( N_("XVMC extension video output") )
+    set_capability( "video output", 10 )
+    set_callbacks( Activate, Deactivate )
+vlc_module_end ()

 
 /* following functions are local */
 
 
 /* following functions are local */
 

diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c
index f49d6f565261947d9ac33ad304cb450ddfadd733..33e9f9727f2ffc77c442ebb126ef65e5cde54bfc 100644 (file)
--- a/modules/video_output/yuv.c
+++ b/modules/video_output/yuv.c
@@ -62,12 +62,12 @@ static void Display   ( vout_thread_t *, picture_t * );
 
 #define CFG_PREFIX "yuv-"
 
 
 #define CFG_PREFIX "yuv-"
 

-vlc_module_begin( );
-    set_shortname( N_( "YUV output" ) );
-    set_description( N_( "YUV video output" ) );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_capability( "video output", 0 );
+vlc_module_begin ()
+    set_shortname( N_( "YUV output" ) )
+    set_description( N_( "YUV video output" ) )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_capability( "video output", 0 )

 
     add_string( CFG_PREFIX "file", "stream.yuv", NULL,
                 YUV_FILE_TEXT, YUV_FILE_LONGTEXT, false );
 
     add_string( CFG_PREFIX "file", "stream.yuv", NULL,
                 YUV_FILE_TEXT, YUV_FILE_LONGTEXT, false );


@@ -76,8 +76,8 @@ vlc_module_begin( );
     add_bool  ( CFG_PREFIX "yuv4mpeg2", false, NULL,
                 YUV4MPEG2_TEXT, YUV4MPEG2_LONGTEXT, true );
 
     add_bool  ( CFG_PREFIX "yuv4mpeg2", false, NULL,
                 YUV4MPEG2_TEXT, YUV4MPEG2_LONGTEXT, true );
 

-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()

 
 static const char *const ppsz_vout_options[] = {
     "file", "chroma", "yuv4mpeg2", NULL
 
 static const char *const ppsz_vout_options[] = {
     "file", "chroma", "yuv4mpeg2", NULL

diff --git a/modules/visualization/galaktos/plugin.c b/modules/visualization/galaktos/plugin.c
index 69d958d859c45b20698496f3e9b8d138be156ab1..130ecd341b8a44a1cf8628e7298cd210486f1f7f 100644 (file)
--- a/modules/visualization/galaktos/plugin.c
+++ b/modules/visualization/galaktos/plugin.c
@@ -44,12 +44,12 @@
 static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
 
 static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
 

-vlc_module_begin();
-    set_description( N_("GaLaktos visualization plugin") );
-    set_capability( "visualization", 0 );
-    set_callbacks( Open, Close );
-    add_shortcut( "galaktos" );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("GaLaktos visualization plugin") )
+    set_capability( "visualization", 0 )
+    set_callbacks( Open, Close )
+    add_shortcut( "galaktos" )
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 9cdd19b6b1c1b43b37b60f50fd2881bcf3451a41..2a50cd1adb6cd94fbe12ae3dcb5282243bbcb122 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -69,21 +69,21 @@ static void Close        ( vlc_object_t * );
 
 #define MAX_SPEED 10
 
 
 #define MAX_SPEED 10
 

-vlc_module_begin();
-    set_shortname( N_("Goom"));
-    set_description( N_("Goom effect") );
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_VISUAL );
-    set_capability( "visualization", 0 );
+vlc_module_begin ()
+    set_shortname( N_("Goom"))
+    set_description( N_("Goom effect") )
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_VISUAL )
+    set_capability( "visualization", 0 )

     add_integer( "goom-width", 320, NULL,
                  WIDTH_TEXT, RES_LONGTEXT, false );
     add_integer( "goom-height", 240, NULL,
                  HEIGHT_TEXT, RES_LONGTEXT, false );
     add_integer( "goom-speed", 6, NULL,
                  SPEED_TEXT, SPEED_LONGTEXT, false );
     add_integer( "goom-width", 320, NULL,
                  WIDTH_TEXT, RES_LONGTEXT, false );
     add_integer( "goom-height", 240, NULL,
                  HEIGHT_TEXT, RES_LONGTEXT, false );
     add_integer( "goom-speed", 6, NULL,
                  SPEED_TEXT, SPEED_LONGTEXT, false );

-    set_callbacks( Open, Close );
-    add_shortcut( "goom" );
-vlc_module_end();
+    set_callbacks( Open, Close )
+    add_shortcut( "goom" )
+vlc_module_end ()

 
 /*****************************************************************************
  * Local prototypes
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
index 70c9d63a97322f430f641da2d414009a5d5132f6..548c6b079e769ae64e7300001dc22c3c906e7fed 100644 (file)
--- a/modules/visualization/visual/visual.c
+++ b/modules/visualization/visual/visual.c
@@ -108,19 +108,19 @@
 static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
 
 static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
 

-vlc_module_begin();
-    set_shortname( N_("Visualizer"));
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_VISUAL );
-    set_description( N_("Visualizer filter") );
-    set_section( N_( "General") , NULL );
+vlc_module_begin ()
+    set_shortname( N_("Visualizer"))
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_VISUAL )
+    set_description( N_("Visualizer filter") )
+    set_section( N_( "General") , NULL )

     add_string("effect-list", "spectrum", NULL,
             ELIST_TEXT, ELIST_LONGTEXT, true );
     add_integer("effect-width",VOUT_WIDTH,NULL,
              WIDTH_TEXT, WIDTH_LONGTEXT, false );
     add_integer("effect-height" , VOUT_HEIGHT , NULL,
              HEIGHT_TEXT, HEIGHT_LONGTEXT, false );
     add_string("effect-list", "spectrum", NULL,
             ELIST_TEXT, ELIST_LONGTEXT, true );
     add_integer("effect-width",VOUT_WIDTH,NULL,
              WIDTH_TEXT, WIDTH_LONGTEXT, false );
     add_integer("effect-height" , VOUT_HEIGHT , NULL,
              HEIGHT_TEXT, HEIGHT_LONGTEXT, false );

-    set_section( N_("Spectrum analyser") , NULL );
+    set_section( N_("Spectrum analyser") , NULL )

     add_integer("visual-nbbands", 80, NULL,
              NBBANDS_TEXT, NBBANDS_LONGTEXT, true );
     add_integer("visual-separ", 1, NULL,
     add_integer("visual-nbbands", 80, NULL,
              NBBANDS_TEXT, NBBANDS_LONGTEXT, true );
     add_integer("visual-separ", 1, NULL,


@@ -129,7 +129,7 @@ vlc_module_begin();
              AMP_TEXT, AMP_LONGTEXT, true );
     add_bool("visual-peaks", true, NULL,
              PEAKS_TEXT, PEAKS_LONGTEXT, true );
              AMP_TEXT, AMP_LONGTEXT, true );
     add_bool("visual-peaks", true, NULL,
              PEAKS_TEXT, PEAKS_LONGTEXT, true );

-    set_section( N_("Spectrometer") , NULL );
+    set_section( N_("Spectrometer") , NULL )

     add_bool("spect-show-original", false, NULL,
              ORIG_TEXT, ORIG_LONGTEXT, true );
     add_bool("spect-show-base", true, NULL,
     add_bool("spect-show-original", false, NULL,
              ORIG_TEXT, ORIG_LONGTEXT, true );
     add_bool("spect-show-base", true, NULL,


@@ -154,10 +154,10 @@ vlc_module_begin();
              PEAK_WIDTH_TEXT, PEAK_WIDTH_LONGTEXT, true );
     add_integer("spect-peak-height", 1, NULL,
              PEAK_HEIGHT_TEXT, PEAK_HEIGHT_LONGTEXT, true );
              PEAK_WIDTH_TEXT, PEAK_WIDTH_LONGTEXT, true );
     add_integer("spect-peak-height", 1, NULL,
              PEAK_HEIGHT_TEXT, PEAK_HEIGHT_LONGTEXT, true );

-    set_capability( "visualization", 0 );
-    set_callbacks( Open, Close );
-    add_shortcut( "visualizer");
-vlc_module_end();
+    set_capability( "visualization", 0 )
+    set_callbacks( Open, Close )
+    add_shortcut( "visualizer")
+vlc_module_end ()

 
 
 /*****************************************************************************
 
 
 /*****************************************************************************

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 56a2a8c83bce24e85bb9512a005599c492bc1789..eb9b7b1f60a3e7d88636ab94f1446c9c7a4e9c46 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1430,12 +1430,12 @@ const char vlc_usage[] = N_(
 /*
  * Quick usage guide for the configuration options:
  *
 /*
  * Quick usage guide for the configuration options:
  *

- * add_category_hint( N_(text), N_(longtext), b_advanced_option );
- * add_subcategory_hint( N_(text), N_(longtext), b_advanced_option );
- * add_usage_hint( N_(text), b_advanced_option );
+ * add_category_hint( N_(text), N_(longtext), b_advanced_option )
+ * add_subcategory_hint( N_(text), N_(longtext), b_advanced_option )
+ * add_usage_hint( N_(text), b_advanced_option )

  * add_string( option_name, value, p_callback, N_(text), N_(longtext),
                b_advanced_option );
  * add_string( option_name, value, p_callback, N_(text), N_(longtext),
                b_advanced_option );

- * add_file( option_name, psz_value, p_callback, N_(text), N_(longtext) );
+ * add_file( option_name, psz_value, p_callback, N_(text), N_(longtext) )

  * add_module( option_name, psz_value, i_capability, p_callback,
  *             N_(text), N_(longtext) );
  * add_integer( option_name, i_value, p_callback, N_(text), N_(longtext),
  * add_module( option_name, psz_value, i_capability, p_callback,
  *             N_(text), N_(longtext) );
  * add_integer( option_name, i_value, p_callback, N_(text), N_(longtext),


@@ -1444,14 +1444,14 @@ const char vlc_usage[] = N_(
              b_advanced_option );
  */
 
              b_advanced_option );
  */
 

-vlc_module_begin();
+vlc_module_begin ()

 /* Audio options */
 /* Audio options */

-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_GENERAL );
-    add_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , false );
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_GENERAL )
+    add_category_hint( N_("Audio"), AOUT_CAT_LONGTEXT , false )

 
 

-    add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, false );
-        change_safe();
+    add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, false )
+        change_safe ()

     add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN,
                             AOUT_VOLUME_MAX, NULL, VOLUME_TEXT,
                             VOLUME_LONGTEXT, false );
     add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN,
                             AOUT_VOLUME_MAX, NULL, VOLUME_TEXT,
                             VOLUME_LONGTEXT, false );


@@ -1464,13 +1464,13 @@ vlc_module_begin();
     add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT,
               AOUT_RESAMP_LONGTEXT, true );
 #endif
     add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT,
               AOUT_RESAMP_LONGTEXT, true );
 #endif

-    add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, false );
+    add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, false )

     add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
                  FORCE_DOLBY_LONGTEXT, false );
         change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, NULL );
     add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
                  DESYNC_LONGTEXT, true );
     add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
                  FORCE_DOLBY_LONGTEXT, false );
         change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, NULL );
     add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
                  DESYNC_LONGTEXT, true );

-        change_safe();
+        change_safe ()

 
     /* FIXME TODO create a subcat replay gain ? */
     add_string( "audio-replay-gain-mode", ppsz_replay_gain_mode[0], NULL, AUDIO_REPLAY_GAIN_MODE_TEXT,
 
     /* FIXME TODO create a subcat replay gain ? */
     add_string( "audio-replay-gain-mode", ppsz_replay_gain_mode[0], NULL, AUDIO_REPLAY_GAIN_MODE_TEXT,


@@ -1486,35 +1486,35 @@ vlc_module_begin();
     add_bool( "audio-time-stretch", true, NULL,
               AUDIO_TIME_STRETCH_TEXT, AUDIO_TIME_STRETCH_LONGTEXT, false );
 
     add_bool( "audio-time-stretch", true, NULL,
               AUDIO_TIME_STRETCH_TEXT, AUDIO_TIME_STRETCH_LONGTEXT, false );
 

-    set_subcategory( SUBCAT_AUDIO_AOUT );
+    set_subcategory( SUBCAT_AUDIO_AOUT )

     add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT,
                 true );
     add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT,
                 true );

-        change_short('A');
-    set_subcategory( SUBCAT_AUDIO_AFILTER );
+        change_short('A')
+    set_subcategory( SUBCAT_AUDIO_AFILTER )

     add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0,
                          NULL, AUDIO_FILTER_TEXT,
                          AUDIO_FILTER_LONGTEXT, false );
     add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0,
                          NULL, AUDIO_FILTER_TEXT,
                          AUDIO_FILTER_LONGTEXT, false );

-    set_subcategory( SUBCAT_AUDIO_VISUAL );
+    set_subcategory( SUBCAT_AUDIO_VISUAL )

     add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT,
                 AUDIO_VISUAL_LONGTEXT, false );
 
 /* Video options */
     add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT,
                 AUDIO_VISUAL_LONGTEXT, false );
 
 /* Video options */

-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_GENERAL );
-    add_category_hint( N_("Video"), VOUT_CAT_LONGTEXT , false );
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_GENERAL )
+    add_category_hint( N_("Video"), VOUT_CAT_LONGTEXT , false )

 
 

-    add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, true );
-        change_safe();
+    add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, true )
+        change_safe ()

     add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT,
               GRAYSCALE_LONGTEXT, true );
     add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT,
               FULLSCREEN_LONGTEXT, false );
     add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT,
               GRAYSCALE_LONGTEXT, true );
     add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT,
               FULLSCREEN_LONGTEXT, false );

-        change_short('f');
-        change_safe();
+        change_short('f')
+        change_safe ()

     add_bool( "embedded-video", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
               true );
 #ifdef __APPLE__
     add_bool( "embedded-video", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
               true );
 #ifdef __APPLE__

-       add_deprecated_alias( "macosx-embedded" ); /*deprecated since 0.9.0 */
+       add_deprecated_alias( "macosx-embedded" ) /*deprecated since 0.9.0 */

 #endif
     add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
               DROP_LATE_FRAMES_LONGTEXT, true );
 #endif
     add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
               DROP_LATE_FRAMES_LONGTEXT, true );


@@ -1524,7 +1524,7 @@ vlc_module_begin();
     add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
               QUIET_SYNCHRO_LONGTEXT, true );
 #ifndef __APPLE__
     add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
               QUIET_SYNCHRO_LONGTEXT, true );
 #ifndef __APPLE__

-    add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, false );
+    add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, false )

 #endif
     add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT,
               VIDEO_ON_TOP_LONGTEXT, false );
 #endif
     add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT,
               VIDEO_ON_TOP_LONGTEXT, false );


@@ -1541,7 +1541,7 @@ vlc_module_begin();
     // autohide after 1.5s
     add_integer( "mouse-hide-timeout", 1500, NULL, MOUSE_HIDE_TIMEOUT_TEXT,
                  MOUSE_HIDE_TIMEOUT_LONGTEXT, false );
     // autohide after 1.5s
     add_integer( "mouse-hide-timeout", 1500, NULL, MOUSE_HIDE_TIMEOUT_TEXT,
                  MOUSE_HIDE_TIMEOUT_LONGTEXT, false );

-    set_section( N_("Snapshot") , NULL );
+    set_section( N_("Snapshot") , NULL )

     add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT,
                    SNAP_PATH_LONGTEXT, false );
     add_string( "snapshot-prefix", "vlcsnap-", NULL, SNAP_PREFIX_TEXT,
     add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT,
                    SNAP_PATH_LONGTEXT, false );
     add_string( "snapshot-prefix", "vlcsnap-", NULL, SNAP_PREFIX_TEXT,


@@ -1558,63 +1558,63 @@ vlc_module_begin();
     add_integer( "snapshot-height", -1, NULL, SNAP_HEIGHT_TEXT,
                  SNAP_HEIGHT_LONGTEXT, true );
 
     add_integer( "snapshot-height", -1, NULL, SNAP_HEIGHT_TEXT,
                  SNAP_HEIGHT_LONGTEXT, true );
 

-    set_section( N_("Window properties" ), NULL );
-    add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true );
-        change_safe();
-    add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true );
-        change_safe();
-    add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, true );
-        change_safe();
-    add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, true );
-        change_safe();
-    add_string( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, false );
-        change_safe();
+    set_section( N_("Window properties" ), NULL )
+    add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true )
+        change_safe ()
+    add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true )
+        change_safe ()
+    add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, true )
+        change_safe ()
+    add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, true )
+        change_safe ()
+    add_string( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, false )
+        change_safe ()

     add_string( "custom-crop-ratios", NULL, NULL, CUSTOM_CROP_RATIOS_TEXT,
                 CUSTOM_CROP_RATIOS_LONGTEXT, false );
     add_string( "aspect-ratio", NULL, NULL,
                 ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, false );
     add_string( "custom-crop-ratios", NULL, NULL, CUSTOM_CROP_RATIOS_TEXT,
                 CUSTOM_CROP_RATIOS_LONGTEXT, false );
     add_string( "aspect-ratio", NULL, NULL,
                 ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, false );

-        change_safe();
+        change_safe ()

     add_string( "monitor-par", NULL, NULL,
                 MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, true );
     add_string( "custom-aspect-ratios", NULL, NULL, CUSTOM_ASPECT_RATIOS_TEXT,
                 CUSTOM_ASPECT_RATIOS_LONGTEXT, false );
     add_string( "monitor-par", NULL, NULL,
                 MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, true );
     add_string( "custom-aspect-ratios", NULL, NULL, CUSTOM_ASPECT_RATIOS_TEXT,
                 CUSTOM_ASPECT_RATIOS_LONGTEXT, false );

-    add_bool( "hdtv-fix", 1, NULL, HDTV_FIX_TEXT, HDTV_FIX_LONGTEXT, true );
+    add_bool( "hdtv-fix", 1, NULL, HDTV_FIX_TEXT, HDTV_FIX_LONGTEXT, true )

     add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT,
               VIDEO_DECO_LONGTEXT, true );
     add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT,
                  VIDEO_TITLE_LONGTEXT, true );
     add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT,
               VIDEO_DECO_LONGTEXT, true );
     add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT,
                  VIDEO_TITLE_LONGTEXT, true );

-    add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, true );
+    add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, true )

         change_integer_list( pi_align_values, ppsz_align_descriptions, NULL );
         change_integer_list( pi_align_values, ppsz_align_descriptions, NULL );

-    add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, true );
+    add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, true )

 
 
 
 

-    set_subcategory( SUBCAT_VIDEO_VOUT );
+    set_subcategory( SUBCAT_VIDEO_VOUT )

     add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT,
                 true );
     add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT,
                 true );

-        change_short('V');
+        change_short('V')

 
 

-    set_subcategory( SUBCAT_VIDEO_VFILTER );
+    set_subcategory( SUBCAT_VIDEO_VFILTER )

     add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
                 VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false );
     add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
                 VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false );

-       add_deprecated_alias( "filter" ); /*deprecated since 0.8.2 */
+       add_deprecated_alias( "filter" ) /*deprecated since 0.8.2 */

     add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
                         VOUT_FILTER_TEXT, VOUT_FILTER_LONGTEXT, false );
 #if 0
     add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
                         VOUT_FILTER_TEXT, VOUT_FILTER_LONGTEXT, false );
 #if 0

-    add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT );
+    add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT )

 #endif
 
 /* Subpictures options */
 #endif
 
 /* Subpictures options */

-    set_subcategory( SUBCAT_VIDEO_SUBPIC );
-    set_section( N_("On Screen Display") , NULL );
-    add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , false );
+    set_subcategory( SUBCAT_VIDEO_SUBPIC )
+    set_section( N_("On Screen Display") , NULL )
+    add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , false )

 
 

-    add_bool( "spu", 1, NULL, SPU_TEXT, SPU_LONGTEXT, true );
-        change_safe();
-    add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, false );
+    add_bool( "spu", 1, NULL, SPU_TEXT, SPU_LONGTEXT, true )
+        change_safe ()
+    add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, false )

     add_module( "text-renderer", "text renderer", NULL, NULL, TEXTRENDERER_TEXT,
                 TEXTRENDERER_LONGTEXT, true );
 
     add_module( "text-renderer", "text renderer", NULL, NULL, TEXTRENDERER_TEXT,
                 TEXTRENDERER_LONGTEXT, true );
 

-    set_section( N_("Subtitles") , NULL );
+    set_section( N_("Subtitles") , NULL )

     add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
               SUB_FILE_LONGTEXT, false );
     add_bool( "sub-autodetect-file", true, NULL,
     add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
               SUB_FILE_LONGTEXT, false );
     add_bool( "sub-autodetect-file", true, NULL,


@@ -1630,58 +1630,58 @@ vlc_module_begin();
                  SUB_PATH_TEXT, SUB_PATH_LONGTEXT, true );
     add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT,
                  SUB_MARGIN_LONGTEXT, true );
                  SUB_PATH_TEXT, SUB_PATH_LONGTEXT, true );
     add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT,
                  SUB_MARGIN_LONGTEXT, true );

-        add_deprecated_alias( "spu-margin" ); /*Deprecated since 0.8.2 */
-    set_section( N_( "Overlays" ) , NULL );
+        add_deprecated_alias( "spu-margin" ) /*Deprecated since 0.8.2 */
+    set_section( N_( "Overlays" ) , NULL )

     add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
                 SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, false );
 
 /* Input options */
     add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL,
                 SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, false );
 
 /* Input options */

-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_GENERAL );
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_GENERAL )

 
 

-    set_section( N_( "Track settings" ), NULL );
+    set_section( N_( "Track settings" ), NULL )

     add_integer( "program", 0, NULL,
                  INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, true );
     add_integer( "program", 0, NULL,
                  INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, true );

-        change_safe();
+        change_safe ()

     add_string( "programs", "", NULL,
                 INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, true );
     add_string( "programs", "", NULL,
                 INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, true );

-        change_safe();
+        change_safe ()

     add_integer( "audio-track", -1, NULL,
                  INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, true );
     add_integer( "audio-track", -1, NULL,
                  INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, true );

-        change_safe();
-        add_deprecated_alias( "audio-channel" ); /*deprecated since 0.8.2 */
+        change_safe ()
+        add_deprecated_alias( "audio-channel" ) /*deprecated since 0.8.2 */

     add_integer( "sub-track", -1, NULL,
                  INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, true );
     add_integer( "sub-track", -1, NULL,
                  INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, true );

-        change_safe();
-        add_deprecated_alias("spu-channel" ); /*deprecated since 0.8.2*/
+        change_safe ()
+        add_deprecated_alias("spu-channel" ) /*deprecated since 0.8.2*/

     add_string( "audio-language", "", NULL,
                  INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT,
                   false );
     add_string( "audio-language", "", NULL,
                  INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT,
                   false );

-        change_safe();
+        change_safe ()

     add_string( "sub-language", "", NULL,
                  INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT,
                   false );
     add_string( "sub-language", "", NULL,
                  INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT,
                   false );

-        change_safe();
+        change_safe ()

     add_integer( "audio-track-id", -1, NULL, INPUT_AUDIOTRACK_ID_TEXT,
                  INPUT_AUDIOTRACK_ID_LONGTEXT, true );
     add_integer( "audio-track-id", -1, NULL, INPUT_AUDIOTRACK_ID_TEXT,
                  INPUT_AUDIOTRACK_ID_LONGTEXT, true );

-        change_safe();
+        change_safe ()

     add_integer( "sub-track-id", -1, NULL,
                  INPUT_SUBTRACK_ID_TEXT, INPUT_SUBTRACK_ID_LONGTEXT, true );
     add_integer( "sub-track-id", -1, NULL,
                  INPUT_SUBTRACK_ID_TEXT, INPUT_SUBTRACK_ID_LONGTEXT, true );

-        change_safe();
+        change_safe ()

 
 

-    set_section( N_( "Playback control" ) , NULL);
+    set_section( N_( "Playback control" ) , NULL)

     add_integer( "input-repeat", 0, NULL,
                  INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, false );
     add_integer( "input-repeat", 0, NULL,
                  INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, false );

-        change_safe();
+        change_safe ()

     add_integer( "start-time", 0, NULL,
                  START_TIME_TEXT, START_TIME_LONGTEXT, true );
     add_integer( "start-time", 0, NULL,
                  START_TIME_TEXT, START_TIME_LONGTEXT, true );

-        change_safe();
+        change_safe ()

     add_integer( "stop-time", 0, NULL,
                  STOP_TIME_TEXT, STOP_TIME_LONGTEXT, true );
     add_integer( "stop-time", 0, NULL,
                  STOP_TIME_TEXT, STOP_TIME_LONGTEXT, true );

-        change_safe();
+        change_safe ()

     add_integer( "run-time", 0, NULL,
                  RUN_TIME_TEXT, RUN_TIME_LONGTEXT, true );
     add_integer( "run-time", 0, NULL,
                  RUN_TIME_TEXT, RUN_TIME_LONGTEXT, true );

-        change_safe();
+        change_safe ()

     add_string( "input-list", NULL, NULL,
                  INPUT_LIST_TEXT, INPUT_LIST_LONGTEXT, true );
     add_string( "input-slave", NULL, NULL,
     add_string( "input-list", NULL, NULL,
                  INPUT_LIST_TEXT, INPUT_LIST_LONGTEXT, true );
     add_string( "input-slave", NULL, NULL,


@@ -1690,7 +1690,7 @@ vlc_module_begin();
     add_string( "bookmarks", NULL, NULL,
                  BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, true );
 
     add_string( "bookmarks", NULL, NULL,
                  BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, true );
 

-    set_section( N_( "Default devices") , NULL );
+    set_section( N_( "Default devices") , NULL )

 
     add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
               false );
 
     add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
               false );


@@ -1699,19 +1699,19 @@ vlc_module_begin();
     add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT,
               CDAUDIO_DEV_LONGTEXT, false );
 
     add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT,
               CDAUDIO_DEV_LONGTEXT, false );
 

-    set_section( N_( "Network settings" ), NULL );
+    set_section( N_( "Network settings" ), NULL )

 
     add_integer( "server-port", 1234, NULL,
                  SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, false );
 
     add_integer( "server-port", 1234, NULL,
                  SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, false );

-    add_integer( "mtu", MTU_DEFAULT, NULL, MTU_TEXT, MTU_LONGTEXT, true );
-    add_bool( "ipv6", 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, false );
-        change_short('6');
-    add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, false );
-        change_short('4');
+    add_integer( "mtu", MTU_DEFAULT, NULL, MTU_TEXT, MTU_LONGTEXT, true )
+    add_bool( "ipv6", 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, false )
+        change_short('6')
+    add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, false )
+        change_short('4')

     add_integer( "ipv4-timeout", 5 * 1000, NULL, TIMEOUT_TEXT,
                  TIMEOUT_LONGTEXT, true );
 
     add_integer( "ipv4-timeout", 5 * 1000, NULL, TIMEOUT_TEXT,
                  TIMEOUT_LONGTEXT, true );
 

-    set_section( N_( "Socks proxy") , NULL );
+    set_section( N_( "Socks proxy") , NULL )

     add_string( "socks", NULL, NULL,
                  SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT, true );
     add_string( "socks-user", NULL, NULL,
     add_string( "socks", NULL, NULL,
                  SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT, true );
     add_string( "socks-user", NULL, NULL,


@@ -1720,7 +1720,7 @@ vlc_module_begin();
                  SOCKS_PASS_TEXT, SOCKS_PASS_LONGTEXT, true );
 
 
                  SOCKS_PASS_TEXT, SOCKS_PASS_LONGTEXT, true );
 
 

-    set_section( N_("Metadata" ) , NULL );
+    set_section( N_("Metadata" ) , NULL )

     add_string( "meta-title", NULL, NULL, META_TITLE_TEXT,
                 META_TITLE_LONGTEXT, true );
     add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT,
     add_string( "meta-title", NULL, NULL, META_TITLE_TEXT,
                 META_TITLE_LONGTEXT, true );
     add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT,


@@ -1738,7 +1738,7 @@ vlc_module_begin();
     add_string( "meta-url", NULL, NULL, META_URL_TEXT,
                 META_URL_LONGTEXT, true );
 
     add_string( "meta-url", NULL, NULL, META_URL_TEXT,
                 META_URL_LONGTEXT, true );
 

-    set_section( N_( "Advanced" ), NULL );
+    set_section( N_( "Advanced" ), NULL )

 
     add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
                  CR_AVERAGE_LONGTEXT, true );
 
     add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
                  CR_AVERAGE_LONGTEXT, true );


@@ -1755,38 +1755,38 @@ vlc_module_begin();
               INPUT_RECORD_NATIVE_LONGTEXT, true );
 
 /* Decoder options */
               INPUT_RECORD_NATIVE_LONGTEXT, true );
 
 /* Decoder options */

-    add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , true );
+    add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , true )

     add_string( "codec", NULL, NULL, CODEC_TEXT,
                 CODEC_LONGTEXT, true );
     add_string( "encoder",  NULL, NULL, ENCODER_TEXT,
                 ENCODER_LONGTEXT, true );
 
     add_string( "codec", NULL, NULL, CODEC_TEXT,
                 CODEC_LONGTEXT, true );
     add_string( "encoder",  NULL, NULL, ENCODER_TEXT,
                 ENCODER_LONGTEXT, true );
 

-    set_subcategory( SUBCAT_INPUT_ACCESS );
-    add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , false );
+    set_subcategory( SUBCAT_INPUT_ACCESS )
+    add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , false )

     add_module( "access", "access", NULL, NULL, ACCESS_TEXT,
                 ACCESS_LONGTEXT, true );
 
     add_module( "access", "access", NULL, NULL, ACCESS_TEXT,
                 ACCESS_LONGTEXT, true );
 

-    set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );
+    set_subcategory( SUBCAT_INPUT_ACCESS_FILTER )

     add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL,
                 ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, false );
 
 
     add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL,
                 ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, false );
 
 

-    set_subcategory( SUBCAT_INPUT_DEMUX );
+    set_subcategory( SUBCAT_INPUT_DEMUX )

     add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT,
                 DEMUX_LONGTEXT, true );
     add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT,
                 DEMUX_LONGTEXT, true );

-    set_subcategory( SUBCAT_INPUT_VCODEC );
-    set_subcategory( SUBCAT_INPUT_ACODEC );
-    set_subcategory( SUBCAT_INPUT_SCODEC );
+    set_subcategory( SUBCAT_INPUT_VCODEC )
+    set_subcategory( SUBCAT_INPUT_ACODEC )
+    set_subcategory( SUBCAT_INPUT_SCODEC )

     add_bool( "prefer-system-codecs", false, NULL, SYSTEM_CODEC_TEXT,
                                 SYSTEM_CODEC_LONGTEXT, false );
 
 
 /* Stream output options */
     add_bool( "prefer-system-codecs", false, NULL, SYSTEM_CODEC_TEXT,
                                 SYSTEM_CODEC_LONGTEXT, false );
 
 
 /* Stream output options */

-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_GENERAL );
-    add_category_hint( N_("Stream output"), SOUT_CAT_LONGTEXT , true );
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_GENERAL )
+    add_category_hint( N_("Stream output"), SOUT_CAT_LONGTEXT , true )

 
 

-    add_string( "sout", NULL, NULL, SOUT_TEXT, SOUT_LONGTEXT, true );
+    add_string( "sout", NULL, NULL, SOUT_TEXT, SOUT_LONGTEXT, true )

     add_bool( "sout-display", false, NULL, SOUT_DISPLAY_TEXT,
                                 SOUT_DISPLAY_LONGTEXT, true );
     add_bool( "sout-keep", false, NULL, SOUT_KEEP_TEXT,
     add_bool( "sout-display", false, NULL, SOUT_DISPLAY_TEXT,
                                 SOUT_DISPLAY_LONGTEXT, true );
     add_bool( "sout-keep", false, NULL, SOUT_KEEP_TEXT,


@@ -1802,92 +1802,92 @@ vlc_module_begin();
     add_integer( "sout-mux-caching", 1500, NULL, SOUT_MUX_CACHING_TEXT,
                                 SOUT_MUX_CACHING_LONGTEXT, true );
 
     add_integer( "sout-mux-caching", 1500, NULL, SOUT_MUX_CACHING_TEXT,
                                 SOUT_MUX_CACHING_LONGTEXT, true );
 

-    set_section( N_("VLM"), NULL );
+    set_section( N_("VLM"), NULL )

     add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT,
                     VLM_CONF_LONGTEXT, true );
 
 
 
     add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT,
                     VLM_CONF_LONGTEXT, true );
 
 
 

-    set_subcategory( SUBCAT_SOUT_STREAM );
-    set_subcategory( SUBCAT_SOUT_MUX );
+    set_subcategory( SUBCAT_SOUT_STREAM )
+    set_subcategory( SUBCAT_SOUT_MUX )

     add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT,
                                 MUX_LONGTEXT, true );
     add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT,
                                 MUX_LONGTEXT, true );

-    set_subcategory( SUBCAT_SOUT_ACO );
+    set_subcategory( SUBCAT_SOUT_ACO )

     add_module( "access_output", "sout access", NULL, NULL,
                 ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, true );
     add_module( "access_output", "sout access", NULL, NULL,
                 ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, true );

-    add_integer( "ttl", -1, NULL, TTL_TEXT, TTL_LONGTEXT, true );
-    add_string( "miface", NULL, NULL, MIFACE_TEXT, MIFACE_LONGTEXT, true );
-    add_string( "miface-addr", NULL, NULL, MIFACE_ADDR_TEXT, MIFACE_ADDR_LONGTEXT, true );
-    add_integer( "dscp", 0, NULL, DSCP_TEXT, DSCP_LONGTEXT, true );
+    add_integer( "ttl", -1, NULL, TTL_TEXT, TTL_LONGTEXT, true )
+    add_string( "miface", NULL, NULL, MIFACE_TEXT, MIFACE_LONGTEXT, true )
+    add_string( "miface-addr", NULL, NULL, MIFACE_ADDR_TEXT, MIFACE_ADDR_LONGTEXT, true )
+    add_integer( "dscp", 0, NULL, DSCP_TEXT, DSCP_LONGTEXT, true )

 
 

-    set_subcategory( SUBCAT_SOUT_PACKETIZER );
+    set_subcategory( SUBCAT_SOUT_PACKETIZER )

     add_module( "packetizer","packetizer", NULL, NULL,
                 PACKETIZER_TEXT, PACKETIZER_LONGTEXT, true );
 
     add_module( "packetizer","packetizer", NULL, NULL,
                 PACKETIZER_TEXT, PACKETIZER_LONGTEXT, true );
 

-    set_subcategory( SUBCAT_SOUT_SAP );
-    add_obsolete_bool( "sap-flow-control" );
+    set_subcategory( SUBCAT_SOUT_SAP )
+    add_obsolete_bool( "sap-flow-control" )

     add_integer( "sap-interval", 5, NULL, ANN_SAPINTV_TEXT,
                                ANN_SAPINTV_LONGTEXT, true );
 
     add_integer( "sap-interval", 5, NULL, ANN_SAPINTV_TEXT,
                                ANN_SAPINTV_LONGTEXT, true );
 

-    set_subcategory( SUBCAT_SOUT_VOD );
+    set_subcategory( SUBCAT_SOUT_VOD )

 
 /* CPU options */
 
 /* CPU options */

-    set_category( CAT_ADVANCED );
-    set_subcategory( SUBCAT_ADVANCED_CPU );
-    add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, true );
-    add_bool( "fpu", 1, NULL, FPU_TEXT, FPU_LONGTEXT, true );
-        change_need_restart();
+    set_category( CAT_ADVANCED )
+    set_subcategory( SUBCAT_ADVANCED_CPU )
+    add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, true )
+    add_bool( "fpu", 1, NULL, FPU_TEXT, FPU_LONGTEXT, true )
+        change_need_restart ()

 #if defined( __i386__ ) || defined( __x86_64__ )
 #if defined( __i386__ ) || defined( __x86_64__ )

-    add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, true );
-        change_need_restart();
-    add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, true );
-        change_need_restart();
-    add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, true );
-        change_need_restart();
-    add_bool( "sse", 1, NULL, SSE_TEXT, SSE_LONGTEXT, true );
-        change_need_restart();
-    add_bool( "sse2", 1, NULL, SSE2_TEXT, SSE2_LONGTEXT, true );
-        change_need_restart();
+    add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, true )
+        change_need_restart ()
+    add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, true )
+        change_need_restart ()
+    add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, true )
+        change_need_restart ()
+    add_bool( "sse", 1, NULL, SSE_TEXT, SSE_LONGTEXT, true )
+        change_need_restart ()
+    add_bool( "sse2", 1, NULL, SSE2_TEXT, SSE2_LONGTEXT, true )
+        change_need_restart ()

 #endif
 #if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
 #endif
 #if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )

-    add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, true );
-        change_need_restart();
+    add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, true )
+        change_need_restart ()

 #endif
 
 /* Misc options */
 #endif
 
 /* Misc options */

-    set_subcategory( SUBCAT_ADVANCED_MISC );
-    set_section( N_("Special modules"), NULL );
-    add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, true );
+    set_subcategory( SUBCAT_ADVANCED_MISC )
+    set_section( N_("Special modules"), NULL )
+    add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, true )

     add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT,
                 MEMCPY_LONGTEXT, true );
     add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT,
                 MEMCPY_LONGTEXT, true );

-        change_need_restart();
+        change_need_restart ()

 
 

-    set_section( N_("Plugins" ), NULL );
+    set_section( N_("Plugins" ), NULL )

     add_bool( "plugins-cache", true, NULL, PLUGINS_CACHE_TEXT,
               PLUGINS_CACHE_LONGTEXT, true );
     add_bool( "plugins-cache", true, NULL, PLUGINS_CACHE_TEXT,
               PLUGINS_CACHE_LONGTEXT, true );

-        change_need_restart();
+        change_need_restart ()

     add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT,
                    PLUGIN_PATH_LONGTEXT, true );
     add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT,
                    PLUGIN_PATH_LONGTEXT, true );

-        change_need_restart();
+        change_need_restart ()

 
 

-    set_section( N_("Performance options"), NULL );
-    add_obsolete_bool( "minimize-threads" );
+    set_section( N_("Performance options"), NULL )
+    add_obsolete_bool( "minimize-threads" )

 
     add_bool( "use-stream-immediate", false, NULL,
                USE_STREAM_IMMEDIATE, USE_STREAM_IMMEDIATE_LONGTEXT, true );
 
 
     add_bool( "use-stream-immediate", false, NULL,
                USE_STREAM_IMMEDIATE, USE_STREAM_IMMEDIATE_LONGTEXT, true );
 

-    add_obsolete_bool( "auto-adjust-pts-delay" );
+    add_obsolete_bool( "auto-adjust-pts-delay" )

 
 #if !defined(__APPLE__) && !defined(SYS_BEOS) && defined(LIBVLC_USE_PTHREAD)
     add_bool( "rt-priority", false, NULL, RT_PRIORITY_TEXT,
               RT_PRIORITY_LONGTEXT, true );
 
 #if !defined(__APPLE__) && !defined(SYS_BEOS) && defined(LIBVLC_USE_PTHREAD)
     add_bool( "rt-priority", false, NULL, RT_PRIORITY_TEXT,
               RT_PRIORITY_LONGTEXT, true );

-        change_need_restart();
+        change_need_restart ()

 #endif
 
 #if !defined(SYS_BEOS) && defined(LIBVLC_USE_PTHREAD)
     add_integer( "rt-offset", 0, NULL, RT_OFFSET_TEXT,
                  RT_OFFSET_LONGTEXT, true );
 #endif
 
 #if !defined(SYS_BEOS) && defined(LIBVLC_USE_PTHREAD)
     add_integer( "rt-offset", 0, NULL, RT_OFFSET_TEXT,
                  RT_OFFSET_LONGTEXT, true );

-        change_need_restart();
+        change_need_restart ()

 #endif
 
 #if defined(HAVE_DBUS)
 #endif
 
 #if defined(HAVE_DBUS)


@@ -1900,39 +1900,39 @@ vlc_module_begin();
               ONEINSTANCE_LONGTEXT, true );
     add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT,
               STARTEDFROMFILE_LONGTEXT, true );
               ONEINSTANCE_LONGTEXT, true );
     add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT,
               STARTEDFROMFILE_LONGTEXT, true );

-        change_internal();
-        change_unsaveable();
+        change_internal ()
+        change_unsaveable ()

     add_bool( "one-instance-when-started-from-file", 1, NULL,
               ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
               ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true );
     add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, true );
     add_bool( "one-instance-when-started-from-file", 1, NULL,
               ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
               ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true );
     add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, true );

-        change_unsaveable();
+        change_unsaveable ()

 #endif
 
 #if defined(WIN32)
     add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT,
               HPRIORITY_LONGTEXT, false );
 #endif
 
 #if defined(WIN32)
     add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT,
               HPRIORITY_LONGTEXT, false );

-        change_need_restart();
+        change_need_restart ()

 #endif
 
 /* Playlist options */
 #endif
 
 /* Playlist options */

-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_GENERAL );
-    add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , false );
-    add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, false );
-        change_short('Z');
-    add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, false );
-        change_short('L');
-    add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, false );
-        change_short('R');
-    add_bool( "play-and-exit", 0, NULL, PAE_TEXT, PAE_LONGTEXT, false );
-    add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, false );
-    add_bool( "media-library", 1, NULL, ML_TEXT, ML_LONGTEXT, false );
-    add_bool( "playlist-tree", 0, NULL, PLTREE_TEXT, PLTREE_LONGTEXT, false );
-
-    add_string( "open", "", NULL, OPEN_TEXT, OPEN_LONGTEXT, false );
-        change_need_restart();
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_GENERAL )
+    add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , false )
+    add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, false )
+        change_short('Z')
+    add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, false )
+        change_short('L')
+    add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, false )
+        change_short('R')
+    add_bool( "play-and-exit", 0, NULL, PAE_TEXT, PAE_LONGTEXT, false )
+    add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, false )
+    add_bool( "media-library", 1, NULL, ML_TEXT, ML_LONGTEXT, false )
+    add_bool( "playlist-tree", 0, NULL, PLTREE_TEXT, PLTREE_LONGTEXT, false )
+
+    add_string( "open", "", NULL, OPEN_TEXT, OPEN_LONGTEXT, false )
+        change_need_restart ()

 
     add_bool( "auto-preparse", true, NULL, PREPARSE_TEXT,
               PREPARSE_LONGTEXT, false );
 
     add_bool( "auto-preparse", true, NULL, PREPARSE_TEXT,
               PREPARSE_LONGTEXT, false );


@@ -1942,82 +1942,82 @@ vlc_module_begin();
         change_integer_list( pi_albumart_values,
                              ppsz_albumart_descriptions, 0 );
 
         change_integer_list( pi_albumart_values,
                              ppsz_albumart_descriptions, 0 );
 

-    set_subcategory( SUBCAT_PLAYLIST_SD );
+    set_subcategory( SUBCAT_PLAYLIST_SD )

     add_module_list_cat( "services-discovery", SUBCAT_PLAYLIST_SD, NULL,
                           NULL, SD_TEXT, SD_LONGTEXT, false );
     add_module_list_cat( "services-discovery", SUBCAT_PLAYLIST_SD, NULL,
                           NULL, SD_TEXT, SD_LONGTEXT, false );

-        change_short('S');
-        change_need_restart();
+        change_short('S')
+        change_need_restart ()

 
 /* Interface options */
 
 /* Interface options */

-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_GENERAL )

     add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT,
                  false );
     add_integer( "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT,
                  false );

-        change_short('v');
+        change_short('v')

     add_string( "verbose-objects", 0, NULL, VERBOSE_OBJECTS_TEXT, VERBOSE_OBJECTS_LONGTEXT,
                  false );
     add_string( "verbose-objects", 0, NULL, VERBOSE_OBJECTS_TEXT, VERBOSE_OBJECTS_LONGTEXT,
                  false );

-    add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, true );
-        change_short('q');
+    add_bool( "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, true )
+        change_short('q')

 
 #if !defined(WIN32)
 
 #if !defined(WIN32)

-    add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, true );
-        change_short('d');
-        change_need_restart();
+    add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, true )
+        change_short('d')
+        change_need_restart ()

 
     add_string( "pidfile", NULL, NULL, PIDFILE_TEXT, PIDFILE_LONGTEXT,
                                        false );
 
     add_string( "pidfile", NULL, NULL, PIDFILE_TEXT, PIDFILE_LONGTEXT,
                                        false );

-        change_need_restart();
+        change_need_restart ()

 #endif
 
     add_bool( "file-logging", false, NULL, FILE_LOG_TEXT, FILE_LOG_LONGTEXT,
               true );
 #endif
 
     add_bool( "file-logging", false, NULL, FILE_LOG_TEXT, FILE_LOG_LONGTEXT,
               true );

-        change_need_restart();
+        change_need_restart ()

 #ifdef HAVE_SYSLOG_H
     add_bool ( "syslog", false, NULL, SYSLOG_TEXT, SYSLOG_LONGTEXT,
                true );
 #ifdef HAVE_SYSLOG_H
     add_bool ( "syslog", false, NULL, SYSLOG_TEXT, SYSLOG_LONGTEXT,
                true );

-        change_need_restart();
+        change_need_restart ()

 #endif
 
 #if defined (WIN32) || defined (__APPLE__)
     add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
                 false );
         change_string_list( ppsz_language, ppsz_language_text, 0 );
 #endif
 
 #if defined (WIN32) || defined (__APPLE__)
     add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
                 false );
         change_string_list( ppsz_language, ppsz_language_text, 0 );

-        change_need_restart();
+        change_need_restart ()

 #endif
 
 #endif
 

-    add_bool( "color", true, NULL, COLOR_TEXT, COLOR_LONGTEXT, true );
+    add_bool( "color", true, NULL, COLOR_TEXT, COLOR_LONGTEXT, true )

     add_bool( "advanced", false, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
                     false );
     add_bool( "advanced", false, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
                     false );

-        change_need_restart();
+        change_need_restart ()

     add_bool( "interact", true, NULL, INTERACTION_TEXT,
               INTERACTION_LONGTEXT, false );
 
     add_bool( "show-intf", false, NULL, SHOWINTF_TEXT, SHOWINTF_LONGTEXT,
               false );
     add_bool( "interact", true, NULL, INTERACTION_TEXT,
               INTERACTION_LONGTEXT, false );
 
     add_bool( "show-intf", false, NULL, SHOWINTF_TEXT, SHOWINTF_LONGTEXT,
               false );

-        change_need_restart();
+        change_need_restart ()

 
 

-    add_bool ( "stats", true, NULL, STATS_TEXT, STATS_LONGTEXT, true );
-        change_need_restart();
+    add_bool ( "stats", true, NULL, STATS_TEXT, STATS_LONGTEXT, true )
+        change_need_restart ()

 
 

-    set_subcategory( SUBCAT_INTERFACE_MAIN );
+    set_subcategory( SUBCAT_INTERFACE_MAIN )

     add_module_cat( "intf", SUBCAT_INTERFACE_MAIN, NULL, NULL, INTF_TEXT,
                 INTF_LONGTEXT, false );
     add_module_cat( "intf", SUBCAT_INTERFACE_MAIN, NULL, NULL, INTF_TEXT,
                 INTF_LONGTEXT, false );

-        change_short('I');
-        change_need_restart();
+        change_short('I')
+        change_need_restart ()

     add_module_list_cat( "extraintf", SUBCAT_INTERFACE_MAIN,
                          NULL, NULL, EXTRAINTF_TEXT,
                          EXTRAINTF_LONGTEXT, false );
     add_module_list_cat( "extraintf", SUBCAT_INTERFACE_MAIN,
                          NULL, NULL, EXTRAINTF_TEXT,
                          EXTRAINTF_LONGTEXT, false );

-        change_need_restart();
+        change_need_restart ()

 
 
 
 

-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
+    set_subcategory( SUBCAT_INTERFACE_CONTROL )

     add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL,
                          CONTROL_TEXT, CONTROL_LONGTEXT, false );
     add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL,
                          CONTROL_TEXT, CONTROL_LONGTEXT, false );

-        change_need_restart();
+        change_need_restart ()

 
 /* Hotkey options*/
 
 /* Hotkey options*/

-    set_subcategory( SUBCAT_INTERFACE_HOTKEYS );
-    add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , false );
+    set_subcategory( SUBCAT_INTERFACE_HOTKEYS )
+    add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , false )

 
 #if defined(__APPLE__)
 /* Don't use the following combo's */
 
 #if defined(__APPLE__)
 /* Don't use the following combo's */


@@ -2276,7 +2276,7 @@ vlc_module_begin();
 
     add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, NULL, TOGGLE_FULLSCREEN_KEY_TEXT,
              TOGGLE_FULLSCREEN_KEY_LONGTEXT, false );
 
     add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, NULL, TOGGLE_FULLSCREEN_KEY_TEXT,
              TOGGLE_FULLSCREEN_KEY_LONGTEXT, false );

-       add_deprecated_alias( "key-fullscreen" ); /*deprecated since 0.9.0 */
+       add_deprecated_alias( "key-fullscreen" ) /*deprecated since 0.9.0 */

     add_key( "key-leave-fullscreen", KEY_LEAVE_FULLSCREEN, NULL, LEAVE_FULLSCREEN_KEY_TEXT,
              LEAVE_FULLSCREEN_KEY_LONGTEXT, false );
     add_key( "key-play-pause", KEY_PLAY_PAUSE, NULL, PLAY_PAUSE_KEY_TEXT,
     add_key( "key-leave-fullscreen", KEY_LEAVE_FULLSCREEN, NULL, LEAVE_FULLSCREEN_KEY_TEXT,
              LEAVE_FULLSCREEN_KEY_LONGTEXT, false );
     add_key( "key-play-pause", KEY_PLAY_PAUSE, NULL, PLAY_PAUSE_KEY_TEXT,


@@ -2421,7 +2421,7 @@ vlc_module_begin();
     add_key( "key-loop", KEY_LOOP, NULL,
              LOOP_KEY_TEXT, LOOP_KEY_LONGTEXT, false );
 
     add_key( "key-loop", KEY_LOOP, NULL,
              LOOP_KEY_TEXT, LOOP_KEY_LONGTEXT, false );
 

-    set_section ( N_("Zoom" ), NULL );
+    set_section ( N_("Zoom" ), NULL )

     add_key( "key-zoom-quarter",  KEY_ZOOM_QUARTER, NULL,
         ZOOM_QUARTER_KEY_TEXT,  NULL, false );
     add_key( "key-zoom-half",     KEY_ZOOM_HALF, NULL,
     add_key( "key-zoom-quarter",  KEY_ZOOM_QUARTER, NULL,
         ZOOM_QUARTER_KEY_TEXT,  NULL, false );
     add_key( "key-zoom-half",     KEY_ZOOM_HALF, NULL,


@@ -2431,7 +2431,7 @@ vlc_module_begin();
     add_key( "key-zoom-double",   KEY_ZOOM_DOUBLE, NULL,
         ZOOM_DOUBLE_KEY_TEXT,   NULL, false );
 
     add_key( "key-zoom-double",   KEY_ZOOM_DOUBLE, NULL,
         ZOOM_DOUBLE_KEY_TEXT,   NULL, false );
 

-    set_section ( N_("Jump sizes" ), NULL );
+    set_section ( N_("Jump sizes" ), NULL )

     add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT,
                                     JIEXTRASHORT_LONGTEXT, false );
     add_integer( "short-jump-size", 10, NULL, JISHORT_TEXT,
     add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT,
                                     JIEXTRASHORT_LONGTEXT, false );
     add_integer( "short-jump-size", 10, NULL, JISHORT_TEXT,


@@ -2442,8 +2442,8 @@ vlc_module_begin();
                                     JILONG_LONGTEXT, false );
 
     /* HACK so these don't get displayed */
                                     JILONG_LONGTEXT, false );
 
     /* HACK so these don't get displayed */

-    set_category( -1 );
-    set_subcategory( -1 );
+    set_category( -1 )
+    set_subcategory( -1 )

     add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL,
              SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, true );
     add_key( "key-set-bookmark2", KEY_SET_BOOKMARK2, NULL,
     add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL,
              SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, true );
     add_key( "key-set-bookmark2", KEY_SET_BOOKMARK2, NULL,


@@ -2538,63 +2538,63 @@ vlc_module_begin();
 #define VERSION_TEXT \
     N_("print version information")
 
 #define VERSION_TEXT \
     N_("print version information")
 

-    add_bool( "help", false, NULL, HELP_TEXT, "", false );
-        change_short( 'h' );
-        change_internal();
-        change_unsaveable();
-    add_bool( "full-help", false, NULL, FULL_HELP_TEXT, "", false );
-        change_short( 'H' );
-        change_internal();
-        change_unsaveable();
-    add_bool( "longhelp", false, NULL, LONGHELP_TEXT, "", false );
-        change_internal();
-        change_unsaveable();
+    add_bool( "help", false, NULL, HELP_TEXT, "", false )
+        change_short( 'h' )
+        change_internal ()
+        change_unsaveable ()
+    add_bool( "full-help", false, NULL, FULL_HELP_TEXT, "", false )
+        change_short( 'H' )
+        change_internal ()
+        change_unsaveable ()
+    add_bool( "longhelp", false, NULL, LONGHELP_TEXT, "", false )
+        change_internal ()
+        change_unsaveable ()

     add_bool( "help-verbose", false, NULL, HELP_VERBOSE_TEXT, "",
               false );
     add_bool( "help-verbose", false, NULL, HELP_VERBOSE_TEXT, "",
               false );

-        change_internal();
-        change_unsaveable();
-    add_bool( "list", false, NULL, LIST_TEXT, "", false );
-        change_short( 'l' );
-        change_internal();
-        change_unsaveable();
+        change_internal ()
+        change_unsaveable ()
+    add_bool( "list", false, NULL, LIST_TEXT, "", false )
+        change_short( 'l' )
+        change_internal ()
+        change_unsaveable ()

     add_bool( "list-verbose", false, NULL, LIST_VERBOSE_TEXT, "",
               false );
     add_bool( "list-verbose", false, NULL, LIST_VERBOSE_TEXT, "",
               false );

-        change_internal();
-        change_unsaveable();
-    add_string( "module", NULL, NULL, MODULE_TEXT, "", false );
-        change_short( 'p' );
-        change_internal();
-        change_unsaveable();
-    add_bool( "ignore-config", false, NULL, IGNORE_CONFIG_TEXT, "", false );
-        change_internal();
-        change_unsaveable();
+        change_internal ()
+        change_unsaveable ()
+    add_string( "module", NULL, NULL, MODULE_TEXT, "", false )
+        change_short( 'p' )
+        change_internal ()
+        change_unsaveable ()
+    add_bool( "ignore-config", false, NULL, IGNORE_CONFIG_TEXT, "", false )
+        change_internal ()
+        change_unsaveable ()

     add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "",
               false );
     add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "",
               false );

-        change_internal();
-        change_unsaveable();
-    add_bool( "reset-config", false, NULL, RESET_CONFIG_TEXT, "", false );
-        change_internal();
-        change_unsaveable();
+        change_internal ()
+        change_unsaveable ()
+    add_bool( "reset-config", false, NULL, RESET_CONFIG_TEXT, "", false )
+        change_internal ()
+        change_unsaveable ()

     add_bool( "reset-plugins-cache", false, NULL,
               RESET_PLUGINS_CACHE_TEXT, "", false );
     add_bool( "reset-plugins-cache", false, NULL,
               RESET_PLUGINS_CACHE_TEXT, "", false );

-        change_internal();
-        change_unsaveable();
-    add_bool( "version", false, NULL, VERSION_TEXT, "", false );
-        change_internal();
-        change_unsaveable();
-    add_string( "config", NULL, NULL, CONFIG_TEXT, "", false );
-        change_internal();
-        change_unsaveable();
-    add_bool( "version", false, NULL, VERSION_TEXT, "", false );
-        change_internal();
-        change_unsaveable();
+        change_internal ()
+        change_unsaveable ()
+    add_bool( "version", false, NULL, VERSION_TEXT, "", false )
+        change_internal ()
+        change_unsaveable ()
+    add_string( "config", NULL, NULL, CONFIG_TEXT, "", false )
+        change_internal ()
+        change_unsaveable ()
+    add_bool( "version", false, NULL, VERSION_TEXT, "", false )
+        change_internal ()
+        change_unsaveable ()

 
    /* Usage (mainly useful for cmd line stuff) */
 
    /* Usage (mainly useful for cmd line stuff) */

-    /* add_usage_hint( PLAYLIST_USAGE ); */
+    /* add_usage_hint( PLAYLIST_USAGE ) */

 
 

-    set_description( N_("main program") );
-    set_capability( "main", 100 );
-vlc_module_end();
+    set_description( N_("main program") )
+    set_capability( "main", 100 )
+vlc_module_end ()

 
 /*****************************************************************************
  * End configuration.
 
 /*****************************************************************************
  * End configuration.