* ALL: the first libvlc commit.

[vlc] / plugins / downmix / downmix3dn.c

diff --git a/plugins/downmix/downmix3dn.c b/plugins/downmix/downmix3dn.c
index 2e364384c67f55d443a74a496c941caa270d328f..463d95c1f78158ea41babf09ba399437edf1d35c 100644 (file)
--- a/plugins/downmix/downmix3dn.c
+++ b/plugins/downmix/downmix3dn.c
@@ -2,7 +2,7 @@
  * downmix3dn.c : accelerated 3D Now! AC3 downmix module
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: downmix3dn.c,v 1.7 2001/12/30 07:09:54 sam Exp $
+ * $Id: downmix3dn.c,v 1.10 2002/06/01 12:31:58 sam Exp $
  *
  * Authors: Renaud Dartus <reno@via.ecp.fr>
  *
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <videolan/vlc.h>
+#include <vlc/vlc.h>
 
 #include "ac3_downmix.h"
 #include "ac3_downmix_common.h"
@@ -36,7 +36,6 @@
  * Local and extern prototypes.
  *****************************************************************************/
 static void downmix_getfunctions( function_list_t * p_function_list );
-static int  downmix_Probe       ( probedata_t *p_data );
 
 /*****************************************************************************
  * Build configuration tree.
@@ -45,12 +44,11 @@ MODULE_CONFIG_START
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START
-    SET_DESCRIPTION( "3D Now! AC3 downmix module" )
+    SET_DESCRIPTION( _("3D Now! AC3 downmix module") )
     ADD_CAPABILITY( DOWNMIX, 200 )
     ADD_REQUIREMENT( 3DNOW )
     ADD_SHORTCUT( "3dn" )
     ADD_SHORTCUT( "3dnow" )
-    ADD_SHORTCUT( "downmix3dn" )
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START
@@ -68,7 +66,6 @@ MODULE_DEACTIVATE_STOP
  *****************************************************************************/
 static void downmix_getfunctions( function_list_t * p_function_list )
 {
-    p_function_list->pf_probe = downmix_Probe;
 #define F p_function_list->functions.downmix
     F.pf_downmix_3f_2r_to_2ch = _M( downmix_3f_2r_to_2ch );
     F.pf_downmix_3f_1r_to_2ch = _M( downmix_3f_1r_to_2ch );
@@ -80,11 +77,3 @@ static void downmix_getfunctions( function_list_t * p_function_list )
 #undef F
 }
 
-/*****************************************************************************
- * downmix_Probe: returns a preference score
- *****************************************************************************/
-static int downmix_Probe( probedata_t *p_data )
-{
-    return( 200 );
-}
-