X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_modules.h;h=7f45217969b63e32af360d2e48789f5a16809b9a;hb=156b305884ea57e5d5bc7f96ebe13466f845149a;hp=2a1fdd52785c4e4578af0a31e1c2aae789b06425;hpb=7b1cd54796b9f1d7709324c41b1b45b33f576f62;p=vlc

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 2a1fdd5278..7f45217969 100644
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -1,24 +1,24 @@
 /*****************************************************************************
- * modules.h : Module descriptor and load functions
+ * vlc_modules.h : Module descriptor and load functions
  *****************************************************************************
- * Copyright (C) 2001 the VideoLAN team
+ * Copyright (C) 2001-2011 VLC authors and VideoLAN
  * $Id$
  *
  * 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /**
@@ -26,41 +26,52 @@
  * This file defines functions for modules in vlc
  */
 
+typedef int (*vlc_activate_t)(void *func, va_list args);
+typedef void (*vlc_deactivate_t)(void *func, va_list args);
+
 /*****************************************************************************
  * Exported functions.
  *****************************************************************************/
 
-VLC_EXPORT( module_t *, module_need, ( vlc_object_t *, const char *, const char *, bool ) );
+VLC_API module_t * vlc_module_load( vlc_object_t *obj, const char *cap, const char *name, bool strict, vlc_activate_t probe, ... ) VLC_USED;
+#define vlc_module_load(o,c,n,s,...) \
+        vlc_module_load(VLC_OBJECT(o),c,n,s,__VA_ARGS__)
+VLC_API void vlc_module_unload( module_t *, vlc_deactivate_t deinit, ... );
+
+VLC_API module_t * module_need( vlc_object_t *, const char *, const char *, bool ) VLC_USED;
 #define module_need(a,b,c,d) module_need(VLC_OBJECT(a),b,c,d)
-VLC_EXPORT( void, module_unneed, ( vlc_object_t *, module_t * ) );
+VLC_API void module_unneed( vlc_object_t *, module_t * );
 #define module_unneed(a,b) module_unneed(VLC_OBJECT(a),b)
-VLC_EXPORT( bool,  module_exists, (const char *) );
-VLC_EXPORT( module_t *, module_find, (const char *) );
+VLC_API bool module_exists(const char *) VLC_USED;
+VLC_API module_t * module_find(const char *) VLC_USED;
+
+int module_start(vlc_object_t *, const module_t *);
+#define module_start(o, m) module_start(VLC_OBJECT(o),m)
+void module_stop(vlc_object_t *, const module_t *);
+#define module_stop(o, m) module_stop(VLC_OBJECT(o),m)
 
-VLC_EXPORT( module_config_t *, module_config_get, ( const module_t *, unsigned * ) );
-VLC_EXPORT( void, module_config_free, ( module_config_t * ) );
+VLC_API module_config_t * module_config_get( const module_t *, unsigned * ) VLC_USED;
+VLC_API void module_config_free( module_config_t * );
 
-VLC_EXPORT( module_t *, module_hold, (module_t *module) );
-VLC_EXPORT( void, module_release, (module_t *module) );
-VLC_EXPORT( void, module_list_free, (module_t **) );
-VLC_EXPORT( module_t **, module_list_get, (size_t *n) );
+VLC_API void module_list_free(module_t **);
+VLC_API module_t ** module_list_get(size_t *n) VLC_USED;
 
-VLC_EXPORT( bool, module_provides, ( const module_t *m, const char *cap ) );
-VLC_EXPORT( const char *, module_get_object, ( const module_t *m ) );
-VLC_EXPORT( const char *, module_get_name, ( const module_t *m, bool long_name ) );
+VLC_API bool module_provides( const module_t *m, const char *cap );
+VLC_API const char * module_get_object( const module_t *m ) VLC_USED;
+VLC_API const char * module_get_name( const module_t *m, bool long_name ) VLC_USED;
 #define module_GetLongName( m ) module_get_name( m, true )
-VLC_EXPORT( const char *, module_get_help, ( const module_t *m ) );
-VLC_EXPORT( const char *, module_get_capability, ( const module_t *m ) );
-VLC_EXPORT( int, module_get_score, ( const module_t *m ) );
-VLC_EXPORT( const char *, module_gettext, ( const module_t *, const char * ) );
+VLC_API const char * module_get_help( const module_t *m ) VLC_USED;
+VLC_API const char * module_get_capability( const module_t *m ) VLC_USED;
+VLC_API int module_get_score( const module_t *m ) VLC_USED;
+VLC_API const char * module_gettext( const module_t *, const char * ) VLC_USED;
 
-static inline module_t *module_get_main (void)
+VLC_USED static inline module_t *module_get_main (void)
 {
-    return module_find ("main");
+    return module_find ("core");
 }
 #define module_get_main(a) module_get_main()
 
-static inline bool module_is_main( const module_t * p_module )
+VLC_USED static inline bool module_is_main( const module_t * p_module )
 {
-    return !strcmp( module_get_object( p_module ), "main" );
+    return !strcmp( module_get_object( p_module ), "core" );
 }