Merge module_release and module_Put

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 7d96a35d33955a52e527aa4a93e7ad1b01445d7c..5b3bb42e11f05b21b3fa3b884a23c790e4f566c9 100644 (file)
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -39,11 +39,12 @@ VLC_EXPORT( bool,  __module_Exists, ( vlc_object_t *, const char * ) );
 
 #define module_Find(a,b) __module_Find(VLC_OBJECT(a),b)
 VLC_EXPORT( module_t *, __module_Find, ( vlc_object_t *, const char * ) );
-VLC_EXPORT( void, module_Put, ( module_t *module ) );
 
 VLC_EXPORT( module_config_t *, module_GetConfig, ( const module_t *, unsigned * ) );
 VLC_EXPORT( void, module_PutConfig, ( 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) );
 

diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index 6967290effcce601514b64348f2fb3d4764bbf11..f543a82434f9d02a2ca55f617ba85b4bd1f22888 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -496,7 +496,7 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         layout->addWidget( box, i_line, 0, 1, -1 );
     }
 
-    module_Put( p_module );
+    module_release (p_module);
 
     scrolled_area->setSizePolicy( QSizePolicy::Preferred,QSizePolicy::Fixed );
     scrolled_area->setLayout( layout );

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index ab69cedace9385c97a76fa2e44a494a193bc8314..2843b3bed62f592967e05ada733de8be97d9ee63 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -271,11 +271,11 @@ void ExtVideo::ChangeVFiltersString( char *psz_name, bool b_add )
     }
     else
     {
-        module_Put( p_obj );
+        module_release (p_obj);
         msg_Err( p_intf, "Unknown video filter type." );
         return;
     }
-    module_Put( p_obj );
+    module_release (p_obj);
 
     psz_string = config_GetPsz( p_intf, psz_filter_type );
 

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index acabe6f20cb66a65a4b5ce3fc4bdacf441e3ee1f..7342a5fad8a17107f3fdb708e4d27a66ec645d55 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1214,6 +1214,6 @@ void CaptureOpenPanel::advancedDialog()
     }
     delete adv;
     module_PutConfig( p_config );
-    module_Put( p_module );
+    module_release (p_module);
 }
 

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 4f3757ac794eacc5c8ac240402db8488ee052808..22337fa3f8fe5729678e00de2fd6ab8a40ac65ba 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1196,7 +1196,7 @@ void KeySelectorControl::finish()
         }
     }
     module_PutConfig (p_config);
-    module_Put (p_main);
+    module_release (p_main);
 
     table->resizeColumnToContents( 0 );
 

diff --git a/modules/gui/wxwidgets/dialogs/open.cpp b/modules/gui/wxwidgets/dialogs/open.cpp
index 7ef01972cf8d3c94597c2bf269e4d79d64115c9b..f876672bd39817202b9990cedff6b32e4681250c 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/open.cpp
+++ b/modules/gui/wxwidgets/dialogs/open.cpp
@@ -515,7 +515,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
         input_tab_array.Add( autopanel );
         notebook->AddPage( autopanel, wxU( module_GetName(p_module, 0) ),
                            i_access_method == CAPTURE_ACCESS );
-        module_Put( p_module );
+        module_release (p_module);
     }
 
     p_module = module_Find( VLC_OBJECT(p_intf), "pvr" );
@@ -526,7 +526,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
         input_tab_array.Add( autopanel );
         notebook->AddPage( autopanel, wxU( module_GetName(p_module, 0) ),
                            i_access_method == CAPTURE_ACCESS );
-        module_Put( p_module );
+        module_release (p_module);
     }
 
     p_module = module_Find( VLC_OBJECT(p_intf), "dvb" );
@@ -537,7 +537,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
         input_tab_array.Add( autopanel );
         notebook->AddPage( autopanel, wxU( module_GetName(p_module, 0) ),
                            i_access_method == CAPTURE_ACCESS );
-        module_Put( p_module );
+        module_release (p_module);
     }
 
     p_module = module_Find( VLC_OBJECT(p_intf), "dshow" );
@@ -548,7 +548,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
         input_tab_array.Add( autopanel );
         notebook->AddPage( autopanel, wxU( module_GetName(p_module, 0) ),
                            i_access_method == CAPTURE_ACCESS );
-        module_Put( p_module );
+        module_release (p_module);
     }
 
     /* Update Disc panel */

diff --git a/modules/gui/wxwidgets/dialogs/preferences.cpp b/modules/gui/wxwidgets/dialogs/preferences.cpp
index edf7de709d769fba38d2c38f15f2bb981098660d..6137848c20ace963ef0271bf8b108f9d05ca6588 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/preferences.cpp
+++ b/modules/gui/wxwidgets/dialogs/preferences.cpp
@@ -1033,7 +1033,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
 
         if( config_data->i_type == TYPE_MODULE )
         {
-            module_Put( p_module );
+            module_release (p_module);
         }
         else
         {

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 466adfb75139ebbcfad8f5a2035618d0242db8ea..3d525043319035a06462f475a6ddb409b4f68cee 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -211,12 +211,13 @@ module_GetHelp
 __module_GetModulesNamesForCapability
 module_GetName
 module_GetObjName
+module_hold
 module_IsCapable
 module_list_free
 module_list_get
 __module_Need
-module_Put
 module_PutConfig
+module_release
 __module_Unneed
 __msg_Dbg
 __msg_DisableObjectPrinting

diff --git a/src/modules/modules.c b/src/modules/modules.c
index a1a3bdd5ef519ce8fb0f1daaab7df0dadd553c02..c73c97d696d7ad08b7664d0c0c885400df978c89 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -325,6 +325,17 @@ const char *module_GetHelp( const module_t *m )
     return m->psz_help;
 }
 
+module_t *module_hold (module_t *m)
+{
+    vlc_hold (&m->vlc_gc_data);
+    return m;
+}
+
+void module_release (module_t *m)
+{
+    vlc_release (&m->vlc_gc_data);
+}
+
 /**
  * Frees the flat list of VLC modules.
  * @param list list obtained by module_list_get
@@ -749,19 +760,6 @@ module_t *__module_Find( vlc_object_t *p_this, const char * psz_name )
     return module;
 }
 
-
-/**
- * Release a module_t pointer from module_Find().
- *
- * \param module the module to release
- * \return nothing
- */
-void module_Put( module_t *module )
-{
-    module_release( module );
-}
-
-
 /**
  * Tell if a module exists and release it in thic case
  *
@@ -773,14 +771,8 @@ bool __module_Exists( vlc_object_t *p_this, const char * psz_name )
 {
     module_t *p_module = __module_Find( p_this, psz_name );
     if( p_module )
-    {
-        module_Put( p_module );
-        return true;
-    }
-    else
-    {
-        return false;
-    }
+        module_release (p_module);
+    return true != NULL;
 }
 
 /**

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 2f9de5bd78432ae9acc567e0d0249f4dc53a62bc..baafe45cc5d0bd7831436aeb1abf29d752c025c7 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -149,17 +149,6 @@ struct module_t
     bool          b_loaded;        /* Set to true if the dll is loaded */
 };
 
-static inline module_t *module_hold (module_t *m)
-{
-    vlc_hold (&m->vlc_gc_data);
-    return m;
-}
-
-static inline void module_release (module_t *m)
-{
-    vlc_release (&m->vlc_gc_data);
-}
-
 #define module_InitBank(a)     __module_InitBank(VLC_OBJECT(a))
 void  __module_InitBank        ( vlc_object_t * );
 #define module_LoadBuiltins(a) __module_LoadBuiltins(VLC_OBJECT(a))