X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fidct%2Fidctaltivec.c;h=e8ed10fc5f49a3c90efb8204cdb80b3f415402de;hb=440f9992ee947ea5fd0debbf35fdd1011c6404b3;hp=8a4e2ca8ef70fe0468a67e60d89d2bcb14eaee63;hpb=1ffe943ec5e34e24199546b386114bb67586855a;p=vlc

diff --git a/plugins/idct/idctaltivec.c b/plugins/idct/idctaltivec.c
index 8a4e2ca8ef..e8ed10fc5f 100644
--- a/plugins/idct/idctaltivec.c
+++ b/plugins/idct/idctaltivec.c
@@ -2,7 +2,7 @@
  * idctaltivec.c : Altivec IDCT module
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: idctaltivec.c,v 1.6 2001/05/15 16:19:42 sam Exp $
+ * $Id: idctaltivec.c,v 1.7 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -56,71 +56,26 @@ static void idct_getfunctions( function_list_t * p_function_list );
 static int  idct_Probe      ( probedata_t *p_data );
 static void vdec_NormScan   ( u8 ppi_scan[2][64] );
 
-
 /*****************************************************************************
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
 ADD_WINDOW( "Configuration for Altivec IDCT 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.
- *****************************************************************************/
-MODULE_INIT
-{
-    p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "Altivec IDCT module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_STOP
 
+MODULE_INIT_START
     p_module->i_capabilities = MODULE_CAPABILITY_NULL
                                 | MODULE_CAPABILITY_IDCT;
+    p_module->psz_longname = "Altivec IDCT 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().
- *****************************************************************************/
-MODULE_ACTIVATE
-{
-    p_module->p_functions = malloc( sizeof( module_functions_t ) );
-    if( p_module->p_functions == NULL )
-    {
-        return( -1 );
-    }
-
+MODULE_ACTIVATE_START
     idct_getfunctions( &p_module->p_functions->idct );
+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
 
 /* Following functions are local */
 
@@ -135,7 +90,7 @@ static void idct_getfunctions( function_list_t * p_function_list )
     F.pf_sparse_idct = _M( vdec_SparseIDCT );
     F.pf_idct = _M( vdec_IDCT );
     F.pf_norm_scan = vdec_NormScan;
-    F.pf_vdec_init = _M( vdec_Init );
+    F.pf_decode_init = _M( vdec_InitDecode );
     F.pf_decode_mb_c = _M( vdec_DecodeMacroblockC );
     F.pf_decode_mb_bw = _M( vdec_DecodeMacroblockBW );
 #undef F