* Fixed the BeOS compile typo.

[vlc] / plugins / sdl / sdl.c

diff --git a/plugins/sdl/sdl.c b/plugins/sdl/sdl.c
index 6c161765e70e060baac363a05223e9dc3f9146da..6cc8534a2b09da38c240e1866ca8b1e5381b8602 100644 (file)
--- a/plugins/sdl/sdl.c
+++ b/plugins/sdl/sdl.c
@@ -1,10 +1,13 @@
 /*****************************************************************************
  * sdl.c : SDL plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000 VideoLAN
- *
- * Authors:
+ * Copyright (C) 2000, 2001 VideoLAN
+ * $Id: sdl.c,v 1.16 2001/05/30 17:03:12 sam Exp $
  *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *          Pierre Baillet <oct@zoy.org>
+ *          Arnaud de Bossoreille de Ribou <bozo@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
  * the Free Software Foundation; either version 2 of the License, or
@@ -20,6 +23,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#define MODULE_NAME sdl
+#include "modules_inner.h"
+
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
@@ -31,83 +37,41 @@
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "threads.h"
 #include "mtime.h"
-#include "tests.h"
-#include "plugins.h"
 
-#include "interface.h"
 #include "audio_output.h"
+
 #include "video.h"
 #include "video_output.h"
 
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-static void vout_GetPlugin( p_vout_thread_t p_vout );
-static void intf_GetPlugin( p_intf_thread_t p_intf );
-
-/* Video output */
-int     vout_SDLCreate       ( vout_thread_t *p_vout, char *psz_display,
-                               int i_root_window, void *p_data );
-int     vout_SDLInit         ( p_vout_thread_t p_vout );
-void    vout_SDLEnd          ( p_vout_thread_t p_vout );
-void    vout_SDLDestroy      ( p_vout_thread_t p_vout );
-int     vout_SDLManage       ( p_vout_thread_t p_vout );
-void    vout_SDLDisplay      ( p_vout_thread_t p_vout );
-void    vout_SDLSetPalette   ( p_vout_thread_t p_vout,
-                               u16 *red, u16 *green, u16 *blue, u16 *transp );
-
-/* Interface */
-int     intf_SDLCreate       ( p_intf_thread_t p_intf );
-void    intf_SDLDestroy      ( p_intf_thread_t p_intf );
-void    intf_SDLManage       ( p_intf_thread_t p_intf );
+#include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
- * GetConfig: get the plugin structure and configuration
+ * Capabilities defined in the other files.
  *****************************************************************************/
-plugin_info_t * GetConfig( void )
-{
-    plugin_info_t * p_info = (plugin_info_t *) malloc( sizeof(plugin_info_t) );
-
-    p_info->psz_name    = "SDL";
-    p_info->psz_version = VERSION;
-    p_info->psz_author  = "the VideoLAN team <vlc@videolan.org>";
-
-    p_info->aout_GetPlugin = NULL;
-    p_info->vout_GetPlugin = vout_GetPlugin;
-    p_info->intf_GetPlugin = intf_GetPlugin;
-    p_info->yuv_GetPlugin  = NULL;
-
-    /* if the SDL libraries are there, assume we can enter the
-     * initialization part at least, even if we fail afterwards */
-    p_info->i_score = 0x100;
-
-    /* If this plugin was requested, score it higher */
-    if( TestMethod( VOUT_METHOD_VAR, "sdl" ) )
-    {
-        p_info->i_score += 0x200;
-    }
-
-    return( p_info );
-}
+void _M( aout_getfunctions )( function_list_t * p_function_list );
+void _M( vout_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
- * Following functions are only called through the p_info structure
+ * Building configuration tree
  *****************************************************************************/
-
-static void vout_GetPlugin( p_vout_thread_t p_vout )
-{
-    p_vout->p_sys_create  = vout_SDLCreate;
-    p_vout->p_sys_init    = vout_SDLInit;
-    p_vout->p_sys_end     = vout_SDLEnd;
-    p_vout->p_sys_destroy = vout_SDLDestroy;
-    p_vout->p_sys_manage  = vout_SDLManage;
-    p_vout->p_sys_display = vout_SDLDisplay;
-}
-
-static void intf_GetPlugin( p_intf_thread_t p_intf )
-{
-    p_intf->p_sys_create  = intf_SDLCreate;
-    p_intf->p_sys_destroy = intf_SDLDestroy;
-    p_intf->p_sys_manage  = intf_SDLManage;
-}
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for SDL module" )
+    ADD_COMMENT( "For now, the SDL module cannot be configured" )
+MODULE_CONFIG_STOP
+
+MODULE_INIT_START
+    p_module->i_capabilities = MODULE_CAPABILITY_NULL
+                                | MODULE_CAPABILITY_VOUT
+                                | MODULE_CAPABILITY_AOUT;
+    p_module->psz_longname = "Simple DirectMedia Layer module";
+MODULE_INIT_STOP
+
+MODULE_ACTIVATE_START
+    _M( aout_getfunctions )( &p_module->p_functions->aout );
+    _M( vout_getfunctions )( &p_module->p_functions->vout );
+MODULE_ACTIVATE_STOP
+
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP