* Ported Glide and MGA plugins to the new module API. MGA never worked,

[vlc] / plugins / null / null.c

diff --git a/plugins/null/null.c b/plugins/null/null.c
index 7ffa9731116d4367df1123f3e5a2bfa3e19a9b5a..05190efc9a26d6633bc2a9cc0555589f453e92a0 100644 (file)
--- a/plugins/null/null.c
+++ b/plugins/null/null.c
@@ -34,26 +34,26 @@
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "threads.h"
 #include "mtime.h"
-#include "tests.h"
+
 #include "modules.h"
 #include "modules_inner.h"
-#include "modules_config.h"
 
 /*****************************************************************************
  * Build configuration tree.
  *****************************************************************************/
-MODULE_CONFIG_START( "Configuration for null module" )
-    ADD_PANE( "First" )
-        ADD_FRAME( "First test" )
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for null module" )
+    ADD_PANE( "First pane" )
+        ADD_FRAME( "First frame" )
             ADD_COMMENT( "You can put whatever you want here." )
             ADD_STRING( "Random text: ", MODULE_VAR(text), NULL )
-        ADD_FRAME( "Second test" )
+        ADD_FRAME( "Second frame" )
             ADD_COMMENT( "The file below is not used." )
             ADD_FILE( "Select file: ", MODULE_VAR(file), NULL )
-        ADD_FRAME( "Third test" )
+        ADD_FRAME( "Third frame" )
             ADD_COMMENT( "This space intentionally left blank." )
-    ADD_PANE( "Second" )
-        ADD_FRAME( "NULL Frame" )
+    ADD_PANE( "Second pane" )
+        ADD_FRAME( "Frame" )
             ADD_COMMENT( "There is nothing in this frame." )
 MODULE_CONFIG_END
 
@@ -65,10 +65,10 @@ MODULE_CONFIG_END
  * be unloaded later to save memory, and we want to be able to access this
  * data even after the module has been unloaded.
  *****************************************************************************/
-int InitModule( module_t * p_module )
+MODULE_INIT
 {
     p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "the Null Module that does nothing";
+    p_module->psz_longname = "the Null module that does nothing";
     p_module->psz_version = VERSION;
 
     p_module->i_capabilities = MODULE_CAPABILITY_NULL;
@@ -84,9 +84,13 @@ int InitModule( module_t * p_module )
  * be set to 0 and calls to NeedModule() be made to increment it. To unload
  * the module, one has to wait until i_usage == 0 and call DeactivateModule().
  *****************************************************************************/
-int ActivateModule( module_t * p_module )
+MODULE_ACTIVATE
 {
+    /* Since the Null module can't do anything, there is no need to
+     * fill the p_functions structure. */
+    p_module->p_functions = NULL;
     p_module->p_config = p_config;
+
     return( 0 );
 }
 
@@ -97,8 +101,9 @@ int ActivateModule( module_t * p_module )
  * returns, i_usage can be set to -1 and the module unloaded. Be careful to
  * lock usage_lock during the whole process.
  *****************************************************************************/
-int DeactivateModule( module_t * p_module )
+MODULE_DEACTIVATE
 {
+    /* We didn't allocate p_functions - so we don't have to free it */
     return( 0 );
 }