* Fixed the BeOS compile typo.

[vlc] / plugins / x11 / x11.c

diff --git a/plugins/x11/x11.c b/plugins/x11/x11.c
index 3a104d331a81809463033aa025afd1fdf85397e0..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
  *****************************************************************************/
@@ -31,70 +35,36 @@
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "threads.h"
 #include "mtime.h"
-#include "plugins.h"
 
-#include "interface.h"
-#include "audio_output.h"
 #include "video.h"
 #include "video_output.h"
 
-#include "plugins_export.h"
-
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-void vout_GetPlugin( p_vout_thread_t p_vout );
-void intf_GetPlugin( p_intf_thread_t p_intf );
-
-/*****************************************************************************
- * GetConfig: get the plugin structure and configuration
- *****************************************************************************/
-plugin_info_t * GetConfig( void )
-{
-    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;
-
-    return( p_info );
-}
+#include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
- * Test: tests if the plugin can be launched
+ * Capabilities defined in the other files.
  *****************************************************************************/
-int Test( void )
-{
-    /* TODO: detect an X display */
-    return( 1 );
-}
+void _M( vout_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
- * Following functions are only called through the p_info structure
+ * Building configuration tree
  *****************************************************************************/
-
-void vout_GetPlugin( p_vout_thread_t p_vout )
-{
-    p_vout->p_sys_create  = vout_SysCreate;
-    p_vout->p_sys_init    = vout_SysInit;
-    p_vout->p_sys_end     = vout_SysEnd;
-    p_vout->p_sys_destroy = vout_SysDestroy;
-    p_vout->p_sys_manage  = vout_SysManage;
-    p_vout->p_sys_display = vout_SysDisplay;
-
-    /* optional functions */
-    p_vout->p_set_palette = vout_SetPalette;
-}
-
-void intf_GetPlugin( p_intf_thread_t p_intf )
-{
-    p_intf->p_sys_create  = intf_SysCreate;
-    p_intf->p_sys_destroy = intf_SysDestroy;
-    p_intf->p_sys_manage  = intf_SysManage;
-}
+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