* Fixed the BeOS compile typo.

[vlc] / plugins / null / null.c

diff --git a/plugins/null/null.c b/plugins/null/null.c
index 7ffa9731116d4367df1123f3e5a2bfa3e19a9b5a..fdcb714dea2a212696d6f189908bf8cf19c68003 100644 (file)
--- a/plugins/null/null.c
+++ b/plugins/null/null.c
@@ -2,6 +2,7 @@
  * null.c : NULL module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
+ * $Id: null.c,v 1.7 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -34,71 +35,39 @@
 #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
-
-/*****************************************************************************
- * InitModule: get the module structure and configuration.
- *****************************************************************************
- * We have to fill psz_name, psz_longname and psz_version. These variables
- * will be strdup()ed later by the main application because the module can
- * 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 )
-{
-    p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "the Null Module that does nothing";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_STOP
 
+MODULE_INIT_START
     p_module->i_capabilities = MODULE_CAPABILITY_NULL;
+    p_module->psz_longname = "the Null module that does nothing";
+MODULE_INIT_STOP
 
-    return( 0 );
-}
-
-/*****************************************************************************
- * ActivateModule: set the module to an usable state.
- *****************************************************************************
- * This function fills the capability functions and the configuration
- * structure. Once ActivateModule() has been called, the i_usage can
- * 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 )
-{
-    p_module->p_config = p_config;
-    return( 0 );
-}
+MODULE_ACTIVATE_START
+    /* Since the Null module can't do anything, there is no need to
+     * fill the p_functions structure. */
+MODULE_ACTIVATE_STOP
 
-/*****************************************************************************
- * DeactivateModule: make sure the module can be unloaded.
- *****************************************************************************
- * This function must only be called when i_usage == 0. If it successfully
- * 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 )
-{
-    return( 0 );
-}
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP