Some heavy changes today:

[vlc] / plugins / downmix / downmix.c

diff --git a/plugins/downmix/downmix.c b/plugins/downmix/downmix.c
index b7b2dcdd9c36eca67f0906b4c1ed562c70ab7619..702d4d6636c6414f681a114d42a4cbebf4242df1 100644 (file)
--- a/plugins/downmix/downmix.c
+++ b/plugins/downmix/downmix.c
@@ -2,7 +2,7 @@
  * downmix.c : AC3 downmix module
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: downmix.c,v 1.5 2001/12/09 17:01:36 sam Exp $
+ * $Id: downmix.c,v 1.6 2001/12/30 07:09:54 sam Exp $
  *
  * Authors: Renaud Dartus <reno@via.ecp.fr>
  *
@@ -21,29 +21,17 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME downmix
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdlib.h>
 #include <string.h>
 
-#include "common.h"
-#include "intf_msg.h"
-#include "threads.h"
-#include "mtime.h"
-#include "tests.h"
+#include <videolan/vlc.h>
 
 #include "ac3_downmix.h"
 #include "ac3_downmix_common.h"
 
-#include "modules.h"
-#include "modules_export.h"
-
 /*****************************************************************************
  * Local and extern prototypes.
  *****************************************************************************/
@@ -54,14 +42,13 @@ static int  downmix_Probe       ( probedata_t *p_data );
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for AC3 downmix module" )
-    ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START
-    p_module->i_capabilities = MODULE_CAPABILITY_NULL
-                                | MODULE_CAPABILITY_DOWNMIX;
-    p_module->psz_longname = "AC3 downmix module";
+    SET_DESCRIPTION( "AC3 downmix module" )
+    ADD_CAPABILITY( DOWNMIX, 50 )
+    ADD_SHORTCUT( "c" )
+    ADD_SHORTCUT( "downmix" )
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START
@@ -96,13 +83,6 @@ static void downmix_getfunctions( function_list_t * p_function_list )
  *****************************************************************************/
 static int downmix_Probe( probedata_t *p_data )
 {
-    if( TestMethod( DOWNMIX_METHOD_VAR, "downmix" )
-         || TestMethod( DOWNMIX_METHOD_VAR, "c" ) )
-    {
-        return( 999 );
-    }
-
-    /* This plugin always works */
     return( 50 );
 }