* Fixed the BeOS compile typo.

[vlc] / plugins / motion / motionmmx.c

diff --git a/plugins/motion/motionmmx.c b/plugins/motion/motionmmx.c
index c036d6510288bd67c3e656dc6633ee44210986d1..d803b739d3c9bbf78c5cf938897ae3ec8945db57 100644 (file)
--- a/plugins/motion/motionmmx.c
+++ b/plugins/motion/motionmmx.c
@@ -2,7 +2,7 @@
  * motionmmx.c : MMX motion compensation module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: motionmmx.c,v 1.3 2001/03/21 13:42:34 sam Exp $
+ * $Id: motionmmx.c,v 1.6 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -52,84 +52,36 @@ void motion_getfunctions( function_list_t * p_function_list );
 MODULE_CONFIG_START
 ADD_WINDOW( "Configuration for MMX motion compensation 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 = "MMX motion compensation module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_STOP
 
+MODULE_INIT_START
     p_module->i_capabilities = MODULE_CAPABILITY_NULL
                                 | MODULE_CAPABILITY_MOTION;
+    p_module->psz_longname = "MMX motion compensation 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
     motion_getfunctions( &p_module->p_functions->motion );
+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
 
 /*****************************************************************************
  * motion_Probe: tests probe the CPU and return a score
  *****************************************************************************/
-int motion_Probe( probedata_t *p_data )
+int _M( motion_Probe )( probedata_t *p_data )
 {
-    if( TestCPU( CPU_CAPABILITY_MMX ) )
+    if( !TestCPU( CPU_CAPABILITY_MMX ) )
     {
-        if( TestMethod( MOTION_METHOD_VAR, "motionmmx" ) )
-        {
-            return( 999 );
-        }
-        else
-        {
-            return( 150 );
-        }
+        return( 0 );
     }
-    else
+
+    if( TestMethod( MOTION_METHOD_VAR, "motionmmx" ) )
     {
-        return( 0 );
+        return( 999 );
     }
+
+    return( 150 );
 }