* ./plugins/win32: skeleton for the win32 interface Ipkiss is developing.

[vlc] / plugins / macosx / macosx.c

diff --git a/plugins/macosx/macosx.c b/plugins/macosx/macosx.c
index 4145934fd51e1746051747e1e0df7a5e8e250b8a..d301734048ee97d47851c31ff31c09894064d479 100644 (file)
--- a/plugins/macosx/macosx.c
+++ b/plugins/macosx/macosx.c
@@ -2,9 +2,11 @@
  * macosx.c : MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: macosx.c,v 1.3 2001/03/21 13:42:34 sam Exp $
+ * $Id: macosx.c,v 1.12 2002/01/21 00:52:07 sam Exp $
  *
- * Authors: 
+ * Authors: Colin Delacroix <colin@zoy.org>
+ *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
+ *         Florian G. Pflug <fgp@phlo.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
@@ -21,93 +23,41 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME macosx
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdlib.h>                                      /* malloc(), free() */
+#include <string.h>
 
-#include "config.h"
-#include "common.h"                                     /* boolean_t, byte_t */
-#include "threads.h"
-#include "mtime.h"
-
-#include "modules.h"
-
-/*****************************************************************************
- * Build configuration tree.
- *****************************************************************************/
-MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for MacOS X module" )
-    ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
-MODULE_CONFIG_END
+#include <videolan/vlc.h>
 
 /*****************************************************************************
  * Capabilities defined in the other files.
  *****************************************************************************/
+void _M( aout_getfunctions )( function_list_t * p_function_list );
 void _M( vout_getfunctions )( function_list_t * p_function_list );
 void _M( intf_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
- * InitModule: get the module structure and configuration.
- *****************************************************************************
- * We have to fill psz_name, psz_longname and psz_version. These variables
- * will be strdup()ed later by the main application because the module can
- * be unloaded later to save memory, and we want to be able to access this
- * data even after the module has been unloaded.
+ * Build configuration tree.
  *****************************************************************************/
-MODULE_INIT
-{
-    p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "MacOS X interface and video module";
-    p_module->psz_version = VERSION;
-
-    p_module->i_capabilities = MODULE_CAPABILITY_NULL
-                                | MODULE_CAPABILITY_VOUT
-                                | MODULE_CAPABILITY_INTF;
-
-    return( 0 );
-}
+MODULE_CONFIG_START
+MODULE_CONFIG_STOP
 
-/*****************************************************************************
- * ActivateModule: set the module to an usable state.
- *****************************************************************************
- * This function fills the capability functions and the configuration
- * structure. Once ActivateModule() has been called, the i_usage can
- * be set to 0 and calls to NeedModule() be made to increment it. To unload
- * the module, one has to wait until i_usage == 0 and call DeactivateModule().
- *****************************************************************************/
-MODULE_ACTIVATE
-{
-    p_module->p_functions = malloc( sizeof( module_functions_t ) );
-    if( p_module->p_functions == NULL )
-    {
-        return( -1 );
-    }
+MODULE_INIT_START
+    SET_DESCRIPTION( "MacOS X interface, sound and video module" )
+    ADD_CAPABILITY( INTF, 100 )
+    ADD_CAPABILITY( AOUT, 100 )
+    ADD_CAPABILITY( VOUT, 100 )
+    ADD_SHORTCUT( "macosx" )
+MODULE_INIT_STOP
 
+MODULE_ACTIVATE_START
     _M( vout_getfunctions )( &p_module->p_functions->vout );
+    _M( aout_getfunctions )( &p_module->p_functions->aout );
     _M( intf_getfunctions )( &p_module->p_functions->intf );
+MODULE_ACTIVATE_STOP
 
-    p_module->p_config = p_config;
-
-    return( 0 );
-}
-
-/*****************************************************************************
- * DeactivateModule: make sure the module can be unloaded.
- *****************************************************************************
- * This function must only be called when i_usage == 0. If it successfully
- * returns, i_usage can be set to -1 and the module unloaded. Be careful to
- * lock usage_lock during the whole process.
- *****************************************************************************/
-MODULE_DEACTIVATE
-{
-    free( p_module->p_functions );
-
-    return( 0 );
-}
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP