* Fixed the BeOS compile typo.

[vlc] / plugins / yuv / yuv.c

diff --git a/plugins/yuv/yuv.c b/plugins/yuv/yuv.c
index a90d23e70f81c1f073caf0a3b54b81d146de9de3..2284824c70cccfa2bf2fa1b483b487a48221492c 100644 (file)
--- a/plugins/yuv/yuv.c
+++ b/plugins/yuv/yuv.c
@@ -2,8 +2,9 @@
  * yuv.c : C YUV module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
+ * $Id: yuv.c,v 1.7 2001/05/30 17:03:12 sam Exp $
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +22,7 @@
  *****************************************************************************/
 
 #define MODULE_NAME yuv
+#include "modules_inner.h"
 
 /*****************************************************************************
  * Preamble
@@ -38,12 +40,11 @@
 #include "video_output.h"
 
 #include "modules.h"
-#include "modules_inner.h"
 
 /*****************************************************************************
  * Local and extern prototypes.
  *****************************************************************************/
-extern void yuv_getfunctions( function_list_t * p_function_list );
+void _M( yuv_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
  * Build configuration tree.
@@ -51,62 +52,18 @@ extern void yuv_getfunctions( function_list_t * p_function_list );
 MODULE_CONFIG_START
 ADD_WINDOW( "Configuration for YUV module" )
     ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
-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 = "C YUV module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_STOP
 
+MODULE_INIT_START
     p_module->i_capabilities = MODULE_CAPABILITY_NULL
                                 | MODULE_CAPABILITY_YUV;
+    p_module->psz_longname = "YUV transformations module";
+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_functions = malloc( sizeof( module_functions_t ) );
-    if( p_module->p_functions == NULL )
-    {
-        return( -1 );
-    }
-
-    yuv_getfunctions( &p_module->p_functions->yuv );
-
-    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.
- *****************************************************************************/
-int DeactivateModule( module_t * p_module )
-{
-    free( p_module->p_functions );
+MODULE_ACTIVATE_START
+    _M( yuv_getfunctions )( &p_module->p_functions->yuv );
+MODULE_ACTIVATE_STOP
 
-    return( 0 );
-}
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP