* Fixed some compile issues with what I checked in.

[vlc] / plugins / imdct / imdct3dn.c

diff --git a/plugins/imdct/imdct3dn.c b/plugins/imdct/imdct3dn.c
index c4623a943054f06bd5117f5e07d59c697d625585..5ac2b8ebdefaa43f449997772835402f013fede8 100644 (file)
--- a/plugins/imdct/imdct3dn.c
+++ b/plugins/imdct/imdct3dn.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * imdct3dn.c : accelerated 3D Now! IMDCT module
  *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: imdct3dn.c,v 1.4 2001/06/03 12:47:21 sam Exp $
+ * Copyright (C) 1999-2001 VideoLAN
+ * $Id: imdct3dn.c,v 1.12 2002/06/01 12:31:59 sam Exp $
  *
- * Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
+ * Authors: Renaud Dartus <reno@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,46 +21,34 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME imdct3dn
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdlib.h>
+#include <string.h>
 
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h"
-#include "tests.h"
+#include <vlc/vlc.h>
 
 #include "ac3_imdct.h"
 #include "ac3_imdct_common.h"
 
-#include "modules.h"
-#include "modules_export.h"
-
 /*****************************************************************************
  * Local and extern prototypes.
  *****************************************************************************/
 static void imdct_getfunctions( function_list_t * p_function_list );
-static int  imdct_Probe       ( probedata_t *p_data );
 
 /*****************************************************************************
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for IMDCT module" )
-    ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START
-    p_module->i_capabilities = MODULE_CAPABILITY_NULL
-                                | MODULE_CAPABILITY_IMDCT;
-    p_module->psz_longname = "3D Now! AC3 IMDCT module";
+    SET_DESCRIPTION( _("3D Now! AC3 IMDCT module") )
+    ADD_CAPABILITY( IMDCT, 200 )
+    ADD_REQUIREMENT( 3DNOW )
+    ADD_SHORTCUT( "3dn" )
+    ADD_SHORTCUT( "3dnow" )
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START
@@ -78,7 +66,6 @@ MODULE_DEACTIVATE_STOP
  *****************************************************************************/
 static void imdct_getfunctions( function_list_t * p_function_list )
 {
-    p_function_list->pf_probe = imdct_Probe;
 #define F p_function_list->functions.imdct
     F.pf_imdct_init    = _M( imdct_init );
     F.pf_imdct_256     = _M( imdct_do_256 );
@@ -88,22 +75,3 @@ static void imdct_getfunctions( function_list_t * p_function_list )
 #undef F
 }
 
-/*****************************************************************************
- * imdct_Probe: returns a preference score
- *****************************************************************************/
-static int imdct_Probe( probedata_t *p_data )
-{
-    if( !TestCPU( CPU_CAPABILITY_3DNOW ) )
-    {
-        return( 0 );
-    }
-
-    if( TestMethod( DOWNMIX_METHOD_VAR, "imdct3dn" ) )
-    {
-        return( 999 );
-    }
-
-    /* This plugin always works */
-    return( 200 );
-}
-