Changeset a3576a2716c6ea17349b9dbeea4757d2198b40e6

Timestamp:

12/12/07 20:29:02 (9 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1197487742 +0000

git-parent:

[9cda1945bc9239beea6bb644498058564520302a]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1197487742 +0000

Message:

• Remove config_FindModule as module_Find nowadays does the same thing
  
• Use module_Exists as appropriate
  
• Rename module_FindName as module_Find
  

Files:

• include/vlc_configuration.h (modified) (1 diff)
• include/vlc_modules.h (modified) (1 diff)
• modules/codec/mpeg_audio.c (modified) (1 diff)
• modules/gui/qt4/components/complete_preferences.cpp (modified) (1 diff)
• modules/gui/qt4/components/extended_panels.cpp (modified) (1 diff)
• modules/gui/qt4/components/preferences_widgets.cpp (modified) (2 diffs)
• src/audio_output/input.c (modified) (3 diffs)
• src/config/core.c (modified) (1 diff)
• src/libvlc.sym (modified) (2 diffs)
• src/modules/modules.c (modified) (3 diffs)

include/vlc_configuration.h

@@ -211 +211 @@
-
-VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) );
-VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) );
-
-VLC_EXPORT( int, config_Duplicate,( module_t *, const module_config_t *, size_t ));

include/vlc_modules.h

@@ -36 +36 @@
-VLC_EXPORT( vlc_bool_t,  __module_Exists, ( vlc_object_t *, const char * ) );
-
-
-
-
+
+
-VLC_EXPORT( void, module_Put, ( module_t *module ) );
-

modules/codec/mpeg_audio.c

@@ -140 +140 @@
-    /* HACK: Don't use this codec if we don't have an mpga audio filter */
-    if( p_dec->i_object_type == VLC_OBJECT_DECODER &&
-config_FindModule
+module_Exists
-    {
-        return VLC_EGENERIC;

modules/gui/qt4/components/complete_preferences.cpp

@@ -337 +337 @@
-        return;
-    else if( data->i_type == TYPE_MODULE )
-Name
+
-    else
-    {
-Name
+
-        assert( p_module );
-    }

modules/gui/qt4/components/extended_panels.cpp

@@ -213 +213 @@
-    /* Please leave p_libvlc_global. This is where cached modules are
-     * stored. We're not trying to find a module instance. */
-Name
+
-    if( !p_obj )
-    {

modules/gui/qt4/components/preferences_widgets.cpp

@@ -1032 +1032 @@
-    table->setAlternatingRowColors( true );
-
-config_FindModule
+module_Find
-    assert( p_main );
-
@@ -1057 +1057 @@
-    }
-    module_PutConfig (p_config);
+    module_Put (p_module);
-
-    table->resizeColumnToContents( 0 );

src/audio_output/input.c

@@ -85 +85 @@
-    if( var_Type( p_aout, "visual" ) == 0 )
-    {
-        module_t *p_module;
-        var_Create( p_aout, "visual", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
-        text.psz_string = _("Visualizations");
@@ -99 +98 @@
-
-        /* Look for goom plugin */
-
-
+
-        {
-            val.psz_string = "goom"; text.psz_string = "Goom";
@@ -107 +105 @@
-
-        /* Look for galaktos plugin */
-
-
+
-        {
-            val.psz_string = "galaktos"; text.psz_string = "GaLaktos";

src/config/core.c

@@ -482 +482 @@
-
-    return NULL;
-}
-
-/*****************************************************************************
- * config_FindModule: find a specific module structure.
- *****************************************************************************/
-module_t *config_FindModule( vlc_object_t *p_this, const char *psz_name )
-{
-    vlc_list_t *p_list;
-    module_t *p_module, *p_result = NULL;
-    int i_index;
-
-    if( !psz_name ) return NULL;
-
-    p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
-
-    for( i_index = 0; i_index < p_list->i_count; i_index++ )
-    {
-        p_module = (module_t *)p_list->p_values[i_index].p_object;
-        if( !strcmp( p_module->psz_object_name, psz_name ) )
-        {
-             p_result = p_module;
-             break;
-        }
-    }
-
-    vlc_list_release( p_list );
-
-    return p_result;
-}
-

src/libvlc.sym

@@ -49 +49 @@
-config_Duplicate
-config_FindConfig
-config_FindModule
-config_GetDataDir
-__config_GetFloat
@@ -146 +145 @@
-mdate
-__module_Exists
-Name
+
-module_GetConfig
-module_GetHelp

src/modules/modules.c

@@ -687 +687 @@
-
-/*****************************************************************************
-Name
-
-Name
+
+
+
-{
-    vlc_list_t *p_list;
@@ -712 +712 @@
-
-/*****************************************************************************
-Name
+
- *****************************************************************************/
-void module_Put ( module_t *module )
@@ -727 +727 @@
-vlc_bool_t __module_Exists(  vlc_object_t *p_this, const char * psz_name )
-{
-Name
+
-    if( p_module )
-    {