Pass const references to plugin-list

diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h
index 9847735c4075e10cd926c604faa63e2968c754a9..c20c49fce16f90f350029f6d02c8ca7cbbcff76d 100644 (file)
--- a/libs/ardour/ardour/plugin_manager.h
+++ b/libs/ardour/ardour/plugin_manager.h
@@ -45,13 +45,13 @@ class LIBARDOUR_API PluginManager : public boost::noncopyable {
 
        ~PluginManager ();
 
-       ARDOUR::PluginInfoList &windows_vst_plugin_info ();
-       ARDOUR::PluginInfoList &lxvst_plugin_info ();
-       ARDOUR::PluginInfoList &mac_vst_plugin_info ();
-       ARDOUR::PluginInfoList &ladspa_plugin_info ();
-       ARDOUR::PluginInfoList &lv2_plugin_info ();
-       ARDOUR::PluginInfoList &au_plugin_info ();
-       ARDOUR::PluginInfoList &lua_plugin_info ();
+       const ARDOUR::PluginInfoList& windows_vst_plugin_info ();
+       const ARDOUR::PluginInfoList& lxvst_plugin_info ();
+       const ARDOUR::PluginInfoList& mac_vst_plugin_info ();
+       const ARDOUR::PluginInfoList& ladspa_plugin_info ();
+       const ARDOUR::PluginInfoList& lv2_plugin_info ();
+       const ARDOUR::PluginInfoList& au_plugin_info ();
+       const ARDOUR::PluginInfoList& lua_plugin_info ();
 
        void refresh (bool cache_only = false);
        void cancel_plugin_scan();

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 46349113a2e46d3eeb1e7e896183c1f457462636..3e1074111cff346a7d3546cba7d4961fdae8dc5b 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -1395,7 +1395,7 @@ PluginManager::set_status (PluginType t, string id, PluginStatusType status)
        statuses.insert (ps);
 }
 
-ARDOUR::PluginInfoList&
+const ARDOUR::PluginInfoList&
 PluginManager::windows_vst_plugin_info ()
 {
 #ifdef WINDOWS_VST_SUPPORT
@@ -1408,7 +1408,7 @@ PluginManager::windows_vst_plugin_info ()
 #endif
 }
 
-ARDOUR::PluginInfoList&
+const ARDOUR::PluginInfoList&
 PluginManager::mac_vst_plugin_info ()
 {
 #ifdef MACVST_SUPPORT
@@ -1419,7 +1419,7 @@ PluginManager::mac_vst_plugin_info ()
 #endif
 }
 
-ARDOUR::PluginInfoList&
+const ARDOUR::PluginInfoList&
 PluginManager::lxvst_plugin_info ()
 {
 #ifdef LXVST_SUPPORT
@@ -1430,14 +1430,14 @@ PluginManager::lxvst_plugin_info ()
 #endif
 }
 
-ARDOUR::PluginInfoList&
+const ARDOUR::PluginInfoList&
 PluginManager::ladspa_plugin_info ()
 {
        assert(_ladspa_plugin_info);
        return *_ladspa_plugin_info;
 }
 
-ARDOUR::PluginInfoList&
+const ARDOUR::PluginInfoList&
 PluginManager::lv2_plugin_info ()
 {
 #ifdef LV2_SUPPORT
@@ -1448,7 +1448,7 @@ PluginManager::lv2_plugin_info ()
 #endif
 }
 
-ARDOUR::PluginInfoList&
+const ARDOUR::PluginInfoList&
 PluginManager::au_plugin_info ()
 {
 #ifdef AUDIOUNIT_SUPPORT
@@ -1459,7 +1459,7 @@ PluginManager::au_plugin_info ()
        return _empty_plugin_info;
 }
 
-ARDOUR::PluginInfoList&
+const ARDOUR::PluginInfoList&
 PluginManager::lua_plugin_info ()
 {
        assert(_lua_plugin_info);

diff --git a/libs/ardour/test/plugins_test.cc b/libs/ardour/test/plugins_test.cc
index d9d0fcf6e9cd3130660b2f6bb602411df70d0bd4..81226c6b6dd712c10b07a6dca2098728b4573d5f 100644 (file)
--- a/libs/ardour/test/plugins_test.cc
+++ b/libs/ardour/test/plugins_test.cc
@@ -41,11 +41,11 @@ PluginsTest::test ()
                cout << "LADSPA search path includes: " << *i << endl;
        }
 
-       PluginInfoList& ladspa_list = pm.ladspa_plugin_info ();
+       const PluginInfoList& ladspa_list = pm.ladspa_plugin_info ();
 
        cout << "Number of Ladspa plugins found: " << ladspa_list.size () << endl;
 
-       for (PluginInfoList::iterator i = ladspa_list.begin (); i != ladspa_list.end(); ++i)
+       for (PluginInfoList::const_iterator i = ladspa_list.begin (); i != ladspa_list.end(); ++i)
        {
                print_plugin_info (*i);
        }