More access functions around module_t

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 38b8eee9eda5ba6ada0aa873ef64dbce57be8ac6..0fb00287bc5d87b21bd8d72ac59e0ae039a08b7f 100644 (file)
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -46,6 +46,7 @@ typedef shl_t module_handle_t;
 /**
  * Module descriptor
  */
+#ifndef __PLUGIN__
 /* FIXME: scheduled for privatization */
 struct module_t
 {
@@ -96,6 +97,7 @@ struct module_t
     vlc_bool_t          b_builtin;  /* Set to true if the module is built in */
     vlc_bool_t          b_loaded;        /* Set to true if the dll is loaded */
 };
+#endif
 
 /*****************************************************************************
  * Exported functions.
@@ -129,4 +131,7 @@ enum vlc_module_properties
     VLC_MODULE_NAME
 };
 
-VLC_EXPORT( vlc_bool_t, module_IsCapable, ( const module_t *, const char *cap ) );
+VLC_EXPORT( vlc_bool_t, module_IsCapable, ( const module_t *m, const char *cap ) );
+VLC_EXPORT( const char *, module_GetObjName, ( const module_t *m ) );
+VLC_EXPORT( const char *, module_GetName, ( const module_t *m, vlc_bool_t long_name ) );
+

diff --git a/src/libvlc.sym b/src/libvlc.sym
index ab54cb7d8d13d01a094f9674898823e153a0edf0..cbf5032a95388a28dccecdab5d70faa6b203c788 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -178,6 +178,8 @@ __module_Exists
 __module_Need
 __module_Unneed
 module_IsCapable
+module_GetObjName
+module_GetName
 __msg_Dbg
 __msg_Err
 __msg_Generic

diff --git a/src/modules/modules.c b/src/modules/modules.c
index fdf123683371be952f0d51c70fcf6461585e64c9..767b537e6cb4235a0379d8553004b2dac053bdac 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -391,6 +391,25 @@ vlc_bool_t module_IsCapable( const module_t *m, const char *cap )
     return !strcmp( m->psz_capability, cap );
 }
 
+/*****************************************************************************
+ * module_GetObjName: internal name of a module.
+ *****************************************************************************/
+const char *module_GetObjName( const module_t *m )
+{
+    return m->psz_object_name;
+}
+
+/*****************************************************************************
+ * module_GetName: human-friendly name of a module.
+ *****************************************************************************/
+const char *module_GetName(const module_t *m, vlc_bool_t long_name )
+{
+    if( long_name && ( m->psz_longname != NULL) )
+        return m->psz_longname;
+    
+    return m->psz_shortname ?: m->psz_object_name;
+}
+
 /*****************************************************************************
  * module_Need: return the best module function, given a capability list.
  *****************************************************************************