Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / misc / dummy / dummy.c

diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 2547c6357f75badd4f80c660594a3e4a391942cd..373466c273380eae37974052a053af02e9779041 100644 (file)
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -24,13 +24,18 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 #include "dummy.h"
 
+static int OpenDummy(vlc_object_t *);
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -42,8 +47,8 @@
 
 #define SAVE_TEXT N_("Save raw codec data")
 #define SAVE_LONGTEXT N_( \
-    "This option allows you to save the raw codec data if you have " \
-    "selected/forced the dummy decoder in the main options." )
+    "Save the raw codec data if you have selected/forced the dummy " \
+    "decoder in the main options." )
 
 #ifdef WIN32
 #define QUIET_TEXT N_("Do not open a DOS command box interface")
@@ -54,51 +59,71 @@
     "open." )
 #endif
 
-vlc_module_begin();
-    set_shortname( _("Dummy"));
-    set_description( _("Dummy interface function") );
-    set_capability( "interface", 0 );
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
-    add_shortcut( "vlc" );
-    set_callbacks( E_(OpenIntf), NULL );
+vlc_module_begin ()
+    set_shortname( N_("Dummy"))
+    set_description( N_("Dummy interface function") )
+    set_capability( "interface", 0 )
+    set_callbacks( OpenIntf, NULL )
 #ifdef WIN32
-    set_section( N_( "Dummy Interface" ), NULL );
-    add_category_hint( N_("Interface"), NULL, VLC_FALSE );
-    add_bool( "dummy-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_FALSE );
+    set_section( N_( "Dummy Interface" ), NULL )
+    add_category_hint( N_("Interface"), NULL, false )
+    add_bool( "dummy-quiet", false, NULL, QUIET_TEXT, QUIET_LONGTEXT, false )
 #endif
-    add_submodule();
-        set_description( _("Dummy access function") );
-        set_capability( "access2", 0 );
-        set_callbacks( E_(OpenAccess), NULL );
-    add_submodule();
-        set_description( _("Dummy demux function") );
-        set_capability( "demux2", 0 );
-        set_callbacks( E_(OpenDemux), E_(CloseDemux) );
-    add_submodule();
-        set_section( N_( "Dummy decoder" ), NULL );
-        set_description( _("Dummy decoder function") );
-        set_capability( "decoder", 0 );
-        set_callbacks( E_(OpenDecoder), E_(CloseDecoder) );
-        add_bool( "dummy-save-es", 0, NULL, SAVE_TEXT, SAVE_LONGTEXT, VLC_TRUE );
-    add_submodule();
-        set_description( _("Dummy encoder function") );
-        set_capability( "encoder", 0 );
-        set_callbacks( E_(OpenEncoder), E_(CloseEncoder) );
-    add_submodule();
-        set_description( _("Dummy audio output function") );
-        set_capability( "audio output", 1 );
-        set_callbacks( E_(OpenAudio), NULL );
-    add_submodule();
-        set_description( _("Dummy video output function") );
-        set_section( N_( "Dummy Video output" ), NULL );
-        set_capability( "video output", 1 );
-        set_callbacks( E_(OpenVideo), NULL );
-        add_category_hint( N_("Video"), NULL, VLC_FALSE );
-        add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, VLC_TRUE );
-    add_submodule();
-        set_description( _("Dummy font renderer function") );
-        set_capability( "text renderer", 1 );
-        set_callbacks( E_(OpenRenderer), NULL );
-vlc_module_end();
+    add_submodule ()
+        set_description( N_("Dummy demux function") )
+        set_capability( "access_demux", 0 )
+        set_callbacks( OpenDemux, CloseDemux )
+        add_shortcut( "vlc" )
+    add_submodule ()
+        set_section( N_( "Dummy decoder" ), NULL )
+        set_description( N_("Dummy decoder function") )
+        set_capability( "decoder", 0 )
+        set_callbacks( OpenDecoder, CloseDecoder )
+        set_category( CAT_INPUT )
+        set_subcategory( SUBCAT_INPUT_SCODEC )
+        add_bool( "dummy-save-es", false, 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( "vout display", 1 )
+        set_callbacks( OpenVideo, CloseVideo )
+        set_category( CAT_VIDEO )
+        set_subcategory( SUBCAT_VIDEO_VOUT )
+        add_category_hint( N_("Video"), NULL, false )
+        add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
+    add_submodule ()
+        set_section( N_( "Stats video output" ), NULL )
+        set_description( N_("Stats video output function") )
+        set_capability( "vout display", 0 )
+        add_shortcut( "stats" )
+        set_callbacks( OpenVideoStat, CloseVideo )
+    add_submodule ()
+        set_description( N_("Dummy font renderer function") )
+        set_capability( "text renderer", 1 )
+        set_callbacks( OpenRenderer, NULL )
+    add_submodule ()
+        set_description( N_("libc memcpy") )
+        set_capability( "memcpy", 50 )
+        set_callbacks( OpenDummy, NULL )
+        add_shortcut( "c", "libc" )
+vlc_module_end ()
 
+static int OpenDummy( vlc_object_t *obj )
+{
+    (void) obj;
+    return VLC_SUCCESS;
+}