[SCM] calf/master: More refactoring.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2f9ae953b30bc8702d302df58f0c7f1a589a15c3
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Fri Apr 2 23:06:31 2010 +0100

    More refactoring.
    
    Make the result of plugin_registry::get_by_uri() const, as no external code
    should modify metadata objects.

diff --git a/src/calf/giface.h b/src/calf/giface.h
index eace902..a968995 100644
--- a/src/calf/giface.h
+++ b/src/calf/giface.h
@@ -388,7 +388,7 @@ public:
     static plugin_registry &instance();
 
     const plugin_vector &get_all() { return plugins; }
-    plugin_metadata_iface *get_by_uri(const char *URI);
+    const plugin_metadata_iface *get_by_uri(const char *URI);
 };
 
 /// Get a list of all "small" (module) plugins
@@ -539,9 +539,9 @@ public:
 class plugin_metadata_proxy: public virtual plugin_metadata_iface
 {
 public:
-    plugin_metadata_iface *impl;
+    const plugin_metadata_iface *impl;
 public:
-    plugin_metadata_proxy(plugin_metadata_iface *_impl) { impl = _impl; }
+    plugin_metadata_proxy(const plugin_metadata_iface *_impl) { impl = _impl; }
     const char *get_name() const { return impl->get_name(); } 
     const char *get_id() const { return impl->get_id(); } 
     const char *get_label() const { return impl->get_label(); } 
diff --git a/src/giface.cpp b/src/giface.cpp
index f950256..9085b18 100644
--- a/src/giface.cpp
+++ b/src/giface.cpp
@@ -300,7 +300,7 @@ calf_plugins::plugin_registry &calf_plugins::plugin_registry::instance()
     return registry;
 }
 
-plugin_metadata_iface *calf_plugins::plugin_registry::get_by_uri(const char *plugin_uri)
+const plugin_metadata_iface *calf_plugins::plugin_registry::get_by_uri(const char *plugin_uri)
 {
     static const char prefix[] = "http://calf.sourceforge.net/plugins/";
     if (strncmp(plugin_uri, prefix, sizeof(prefix) - 1))
diff --git a/src/lv2gui.cpp b/src/lv2gui.cpp
index 6cb9cf3..010642b 100644
--- a/src/lv2gui.cpp
+++ b/src/lv2gui.cpp
@@ -61,7 +61,7 @@ struct plugin_proxy: public plugin_ctl_iface, public plugin_metadata_proxy
     map<string, int> params_by_name;
     uint32_t string_port_uri;
     
-    plugin_proxy(plugin_metadata_iface *md)
+    plugin_proxy(const plugin_metadata_iface *md)
     : plugin_metadata_proxy(md)
     {
         gui = NULL;
@@ -189,7 +189,7 @@ LV2UI_Handle gui_instantiate(const struct _LV2UI_Descriptor* descriptor,
                           const LV2_Feature* const*       features)
 {
     plugin_proxy *proxy = NULL;
-    plugin_metadata_iface *md = plugin_registry::instance().get_by_uri(plugin_uri);
+    const plugin_metadata_iface *md = plugin_registry::instance().get_by_uri(plugin_uri);
     if (!md)
         return NULL;
     proxy = new plugin_proxy(md);

-- 
calf audio plugins packaging