X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fdvd%2Fdvd.c;h=1e6a195455a3d06d23c3a9d3f7e8ec9dc80f22f4;hb=440f9992ee947ea5fd0debbf35fdd1011c6404b3;hp=cae22c04d41cf01298ee229d59695686cc96007b;hpb=1ffe943ec5e34e24199546b386114bb67586855a;p=vlc

diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c
index cae22c04d4..1e6a195455 100644
--- a/plugins/dvd/dvd.c
+++ b/plugins/dvd/dvd.c
@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: dvd.c,v 1.8 2001/04/16 13:00:54 sam Exp $
+ * $Id: dvd.c,v 1.9 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -43,96 +43,52 @@
 
 #include "modules.h"
 
-/*****************************************************************************
- * Build configuration tree.
- *****************************************************************************/
-MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for DVD module" )
-    ADD_COMMENT( "foobar !" )
-MODULE_CONFIG_END
-
 /*****************************************************************************
  * Capabilities defined in the other files.
  *****************************************************************************/
 void _M( input_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
- * 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.
+ * Build configuration tree.
  *****************************************************************************/
-MODULE_INIT
-{
-    p_module->psz_name = MODULE_STRING;
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for DVD module" )
+    ADD_COMMENT( "foobar !" )
+MODULE_CONFIG_STOP
+
+MODULE_INIT_START
+    p_module->i_capabilities = MODULE_CAPABILITY_NULL
+                                | MODULE_CAPABILITY_INPUT;
 #ifdef HAVE_CSS
     p_module->psz_longname = "full DVD input module with CSS decryption";
 #else /* HAVE_CSS */
     p_module->psz_longname = "DVD input module, CSS decryption disabled";
 #endif /* HAVE_CSS */
-    p_module->psz_version = VERSION;
-
-    p_module->i_capabilities = MODULE_CAPABILITY_NULL
-                                | MODULE_CAPABILITY_INPUT;
-
-    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().
- *****************************************************************************/
-MODULE_ACTIVATE
-{
-    p_module->p_functions = malloc( sizeof( module_functions_t ) );
-    if( p_module->p_functions == NULL )
-    {
-        return( -1 );
-    }
+MODULE_INIT_STOP
 
+MODULE_ACTIVATE_START
     _M( input_getfunctions )( &p_module->p_functions->input );
+MODULE_ACTIVATE_STOP
 
-    p_module->p_config = p_config;
-
-    return( 0 );
-}
-
-/*****************************************************************************
- * 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.
- *****************************************************************************/
-MODULE_DEACTIVATE
-{
-    free( p_module->p_functions );
-
-    return( 0 );
-}
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP
 
 #ifdef HAVE_CSS
 #else /* HAVE_CSS */
 #ifdef BUILTIN
 int module_dvd_InitModule( module_t *p_module )
 {
-    module_dvdnocss_InitModule( p_module );
+    return module_dvdnocss_InitModule( p_module );
 }
 
 int module_dvd_ActivateModule( module_t *p_module )
 {
-    module_dvdnocss_ActivateModule( p_module );
+    return module_dvdnocss_ActivateModule( p_module );
 }
 
 int module_dvd_DeactivateModule( module_t *p_module )
 {
-    module_dvdnocss_DeactivateModule( p_module );
+    return module_dvdnocss_DeactivateModule( p_module );
 }
 #endif /* BUILTIN */
 #endif /* HAVE_CSS */