* Fixed the BeOS compile typo.

[vlc] / plugins / x11 / x11.c

diff --git a/plugins/x11/x11.c b/plugins/x11/x11.c
index 87d69be63c66cc797cc19e125704f0b446b522eb..8d44d7854c9e3282a6e4670ab74c0c7eec21ab06 100644 (file)
--- a/plugins/x11/x11.c
+++ b/plugins/x11/x11.c
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * x11.c : X11 plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000 VideoLAN
- *
- * Authors:
+ * Copyright (C) 2000, 2001 VideoLAN
+ * $Id: x11.c,v 1.7 2001/05/30 17:03:12 sam Exp $
  *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *      
  * 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 +21,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#define MODULE_NAME x11
+#include "modules_inner.h"
+
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
@@ -27,109 +31,40 @@
 
 #include <stdlib.h>                                      /* malloc(), free() */
 
-#include <X11/Xlib.h>
-
 #include "config.h"
 #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"
 
-#include "main.h"
+#include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
- * Exported prototypes
+ * Capabilities defined in the other files.
  *****************************************************************************/
-static void vout_GetPlugin( p_vout_thread_t p_vout );
-static void intf_GetPlugin( p_intf_thread_t p_intf );
-
-/* Video output */
-int     vout_X11Create       ( vout_thread_t *p_vout, char *psz_display,
-                               int i_root_window, void *p_data );
-int     vout_X11Init         ( p_vout_thread_t p_vout );
-void    vout_X11End          ( p_vout_thread_t p_vout );
-void    vout_X11Destroy      ( p_vout_thread_t p_vout );
-int     vout_X11Manage       ( p_vout_thread_t p_vout );
-void    vout_X11Display      ( p_vout_thread_t p_vout );
-void    vout_X11SetPalette   ( p_vout_thread_t p_vout,
-                               u16 *red, u16 *green, u16 *blue, u16 *transp );
-
-/* Interface */
-int     intf_X11Create       ( p_intf_thread_t p_intf );
-void    intf_X11Destroy      ( p_intf_thread_t p_intf );
-void    intf_X11Manage       ( p_intf_thread_t p_intf );
+void _M( vout_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
- * GetConfig: get the plugin structure and configuration
+ * Building configuration tree
  *****************************************************************************/
-plugin_info_t * GetConfig( void )
-{
-    Display *p_display;
-    plugin_info_t * p_info = (plugin_info_t *) malloc( sizeof(plugin_info_t) );
-
-    p_info->psz_name    = "X Window System";
-    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;
-
-    /* check that we can open the X display */
-    if( (p_display = XOpenDisplay( XDisplayName(
-                         main_GetPszVariable( VOUT_DISPLAY_VAR, NULL ) ) ))
-        == NULL )
-    {
-        p_info->i_score = 0x0;
-    }
-    else
-    {
-        XCloseDisplay( p_display );
-        p_info->i_score = 0x200;
-    }
-
-    if( TestProgram( "xvlc" ) )
-    {
-        p_info->i_score += 0x180;
-    }
-
-    /* If this plugin was requested, score it higher */
-    if( TestMethod( VOUT_METHOD_VAR, "x11" ) )
-    {
-        p_info->i_score += 0x200;
-    }
-
-    return( p_info );
-}
-
-/*****************************************************************************
- * Following functions are only called through the p_info structure
- *****************************************************************************/
-
-static void vout_GetPlugin( p_vout_thread_t p_vout )
-{
-    p_vout->p_sys_create  = vout_X11Create;
-    p_vout->p_sys_init    = vout_X11Init;
-    p_vout->p_sys_end     = vout_X11End;
-    p_vout->p_sys_destroy = vout_X11Destroy;
-    p_vout->p_sys_manage  = vout_X11Manage;
-    p_vout->p_sys_display = vout_X11Display;
-
-    /* optional functions */
-    p_vout->p_set_palette = vout_X11SetPalette;
-}
-
-static void intf_GetPlugin( p_intf_thread_t p_intf )
-{
-    p_intf->p_sys_create  = intf_X11Create;
-    p_intf->p_sys_destroy = intf_X11Destroy;
-    p_intf->p_sys_manage  = intf_X11Manage;
-}
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for X11 module" )
+    ADD_COMMENT( "For now, the X11 module cannot be configured" )
+MODULE_CONFIG_STOP
+
+MODULE_INIT_START
+    p_module->i_capabilities = MODULE_CAPABILITY_NULL
+                                | MODULE_CAPABILITY_VOUT;
+    p_module->psz_longname = "X11 module";
+MODULE_INIT_STOP
+
+MODULE_ACTIVATE_START
+    _M( vout_getfunctions )( &p_module->p_functions->vout );
+MODULE_ACTIVATE_STOP
+
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP