Skip to content

V
vlc-gpu
Commit 85523bcf authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* Converted the plugin initialization code of the macosx, beos and qnx
    code. (please note that they should still not compile as they need
    to be adapted to the new Vout4 architecture)
parent 4416b2cb
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 54 deletions
plugins/beos/intf_beos.cpp
View file @ 85523bcf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_beos.cpp: beos interface * intf_beos.cpp: beos interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: intf_beos.cpp,v 1.36 2002/01/07 02:12:29 sam Exp $ * $Id: intf_beos.cpp,v 1.37 2002/01/19 19:54:01 gbazin Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -85,11 +85,6 @@ void _M( intf_getfunctions )( function_list_t * p_function_list ) ...@@ -85,11 +85,6 @@ void _M( intf_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int intf_Probe( probedata_t *p_data ) static int intf_Probe( probedata_t *p_data )
{ {
if( TestMethod( INTF_METHOD_VAR, "beos" ) )
{
return( 999 );
}
return( 100 ); return( 100 );
} }
......
plugins/beos/vout_beos.cpp
View file @ 85523bcf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_beos.cpp: beos video output display method * vout_beos.cpp: beos video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * Copyright (C) 2000, 2001 VideoLAN
* $Id: vout_beos.cpp,v 1.37 2002/01/05 18:25:48 sam Exp $ * $Id: vout_beos.cpp,v 1.38 2002/01/19 19:54:01 gbazin Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -420,10 +420,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list ) ...@@ -420,10 +420,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int vout_Probe( probedata_t *p_data ) static int vout_Probe( probedata_t *p_data )
{ {
if( TestMethod( VOUT_METHOD_VAR, "beos" ) )
{
return( 999 );
}
return( 100 ); return( 100 );
} }
......
plugins/macosx/aout_macosx.c
View file @ 85523bcf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* aout_darwin.c : Darwin audio output plugin * aout_darwin.c : Darwin audio output plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: aout_macosx.c,v 1.9 2001/12/30 07:09:55 sam Exp $ * $Id: aout_macosx.c,v 1.10 2002/01/19 19:54:01 gbazin Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* *
...@@ -118,11 +118,6 @@ void _M( aout_getfunctions )( function_list_t * p_function_list ) ...@@ -118,11 +118,6 @@ void _M( aout_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int aout_Probe( probedata_t *p_data ) static int aout_Probe( probedata_t *p_data )
{ {
if( TestMethod( AOUT_METHOD_VAR, "macosx" ) )
{
return( 999 );
}
/* This plugin always works under OS X */ /* This plugin always works under OS X */
return( 100 ); return( 100 );
} }
......
plugins/macosx/intf_main.c
View file @ 85523bcf
...@@ -73,11 +73,6 @@ void _M( intf_getfunctions )( function_list_t * p_function_list ) ...@@ -73,11 +73,6 @@ void _M( intf_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int intf_Probe( probedata_t *p_data ) static int intf_Probe( probedata_t *p_data )
{ {
if( TestMethod( INTF_METHOD_VAR, "macosx" ) )
{
return( 999 );
}
/* Under MacOS X, this plugin always works */ /* Under MacOS X, this plugin always works */
return( 100 ); return( 100 );
} }
......
plugins/macosx/macosx.c
View file @ 85523bcf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* macosx.c : MacOS X plugin for vlc * macosx.c : MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: macosx.c,v 1.10 2001/12/30 07:09:55 sam Exp $ * $Id: macosx.c,v 1.11 2002/01/19 19:54:01 gbazin Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Eugenio Jarosiewicz <ej0@cise.ufl.edu> * Eugenio Jarosiewicz <ej0@cise.ufl.edu>
...@@ -42,16 +42,16 @@ void _M( intf_getfunctions )( function_list_t * p_function_list ); ...@@ -42,16 +42,16 @@ void _M( intf_getfunctions )( function_list_t * p_function_list );
* Build configuration tree. * Build configuration tree.
*****************************************************************************/ *****************************************************************************/
MODULE_CONFIG_START MODULE_CONFIG_START
ADD_WINDOW( "Configuration for MacOS X module" ) ADD_WINDOW( "Configuration for MacOS X module" )
ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
p_module->i_capabilities = MODULE_CAPABILITY_NULL SET_DESCRIPTION( "MacOS X interface, sound and video module" )
| MODULE_CAPABILITY_VOUT ADD_CAPABILITY( INTF, 100 )
| MODULE_CAPABILITY_AOUT ADD_CAPABILITY( AOUT, 100 )
| MODULE_CAPABILITY_INTF; ADD_CAPABILITY( VOUT, 100 )
p_module->psz_longname = "MacOS X interface, sound and video module"; ADD_SHORTCUT( "macosx" )
MODULE_INIT_STOP MODULE_INIT_STOP
MODULE_ACTIVATE_START MODULE_ACTIVATE_START
......
plugins/macosx/vout_macosx.c
View file @ 85523bcf
...@@ -102,11 +102,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list ) ...@@ -102,11 +102,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int vout_Probe( probedata_t *p_data ) static int vout_Probe( probedata_t *p_data )
{ {
if( TestMethod( VOUT_METHOD_VAR, "macosx" ) )
{
return( 999 );
}
return( 100 ); return( 100 );
} }
......
plugins/mga/vout_mga.c
View file @ 85523bcf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_mga.c: MGA video output display method * vout_mga.c: MGA video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: vout_mga.c,v 1.13 2002/01/05 15:17:12 sam Exp $ * $Id: vout_mga.c,v 1.14 2002/01/19 19:54:01 gbazin Exp $
* *
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -103,11 +103,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list ) ...@@ -103,11 +103,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int vout_Probe( probedata_t *p_data ) static int vout_Probe( probedata_t *p_data )
{ {
if( TestMethod( VOUT_METHOD_VAR, "mga" ) )
{
return( 999 );
}
return( 10 ); return( 10 );
} }
......
plugins/qnx/aout_qnx.c
View file @ 85523bcf
...@@ -96,11 +96,6 @@ static int aout_Probe( probedata_t *p_data ) ...@@ -96,11 +96,6 @@ static int aout_Probe( probedata_t *p_data )
return( 0 ); return( 0 );
} }
if( TestMethod( AOUT_METHOD_VAR, "qnx" ) )
{
return( 999 );
}
/* return score */ /* return score */
return( 50 ); return( 50 );
} }
......
plugins/qnx/qnx.c
View file @ 85523bcf
...@@ -46,10 +46,10 @@ ADD_WINDOW( "Configuration for QNX RTOS module" ) ...@@ -46,10 +46,10 @@ ADD_WINDOW( "Configuration for QNX RTOS module" )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
p_module->psz_longname = "QNX RTOS module"; SET_DESCRIPTION( "QNX RTOS module" )
p_module->i_capabilities = MODULE_CAPABILITY_NULL ADD_CAPABILITY( VOUT, 100 )
| MODULE_CAPABILITY_AOUT ADD_CAPABILITY( AOUT, 50 )
| MODULE_CAPABILITY_VOUT; ADD_SHORTCUT( "qnx" )
MODULE_INIT_STOP MODULE_INIT_STOP
MODULE_ACTIVATE_START MODULE_ACTIVATE_START
......
plugins/qnx/vout_qnx.c
View file @ 85523bcf
...@@ -125,11 +125,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list ) ...@@ -125,11 +125,6 @@ void _M( vout_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int vout_Probe( probedata_t *p_data ) static int vout_Probe( probedata_t *p_data )
{ {
if( TestMethod( VOUT_METHOD_VAR, "qnx" ) )
{
return( 999 );
}
return( 100 ); return( 100 );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment