From 16f24125fd96e322ae051fb64c8169a1de82374b Mon Sep 17 00:00:00 2001
From: Krzysztof Foltman <wdev@foltman.com>
Date: Sat, 25 Sep 2010 21:39:34 +0100
Subject: [PATCH] Move the table_edit_iface out of plugin_metadata_iface, where
 it should have never been in first place. (cherry picked from commit
 6907dc9670eae2313707b142c552a8d9e8b477b5)

---
 plugins/ladspa_effect/calf/src/calf/giface.h      | 8 +++++---
 plugins/ladspa_effect/calf/src/calf/ladspa_wrap.h | 1 +
 plugins/ladspa_effect/calf/src/calf/lv2wrap.h     | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/ladspa_effect/calf/src/calf/giface.h b/plugins/ladspa_effect/calf/src/calf/giface.h
index d4eb287e3..55e8323e5 100644
--- a/plugins/ladspa_effect/calf/src/calf/giface.h
+++ b/plugins/ladspa_effect/calf/src/calf/giface.h
@@ -315,8 +315,6 @@ struct plugin_metadata_iface
     virtual bool requires_midi() const =0;
     /// @return port offset of first control (parameter) port (= number of audio inputs + number of audio outputs in all existing plugins as for 1 Aug 2008)
     virtual int get_param_port_offset() const  = 0;
-    /// @return table_edit_iface if any
-    virtual const table_edit_iface *get_table_edit_iface() const = 0;
     /// @return NULL-terminated list of menu commands
     virtual plugin_command_info *get_commands() const { return NULL; }
     /// @return description structure for given parameter
@@ -367,6 +365,8 @@ struct plugin_ctl_iface
     virtual const plugin_metadata_iface *get_metadata_iface() const = 0;
     /// @return line_graph_iface if any
     virtual const line_graph_iface *get_line_graph_iface() const = 0;
+    /// @return table_edit_iface if any
+    virtual const table_edit_iface *get_table_edit_iface() const = 0;
     /// Do-nothing destructor to silence compiler warning
     virtual ~plugin_ctl_iface() {}
 };
@@ -447,6 +447,8 @@ struct audio_module_iface
     virtual uint32_t message_run(const void *valid_ports, void *output_ports) = 0;
     /// @return line_graph_iface if any
     virtual const line_graph_iface *get_line_graph_iface() const = 0;
+    /// @return table_edit_iface if any
+    virtual const table_edit_iface *get_table_edit_iface() const = 0;
     virtual ~audio_module_iface() {}
 };
 
@@ -546,6 +548,7 @@ public:
     }
     /// @return line_graph_iface if any
     virtual const line_graph_iface *get_line_graph_iface() const { return dynamic_cast<const line_graph_iface *>(this); }
+    virtual const table_edit_iface *get_table_edit_iface() const { return dynamic_cast<const table_edit_iface *>(this); }    
 };
 
 #if USE_EXEC_GUI || USE_DSSI
@@ -609,7 +612,6 @@ public:
     bool get_midi() const { return Metadata::support_midi; }
     bool requires_midi() const { return Metadata::require_midi; }
     bool is_rt_capable() const { return Metadata::rt_capable; }
-    const table_edit_iface *get_table_edit_iface() const { return dynamic_cast<const table_edit_iface *>(this); }    
     int get_param_port_offset()  const { return Metadata::in_count + Metadata::out_count; }
     const char *get_gui_xml() const { static const char *data_ptr = calf_plugins::load_gui_xml(get_id()); return data_ptr; }
     plugin_command_info *get_commands() const { return NULL; }
diff --git a/plugins/ladspa_effect/calf/src/calf/ladspa_wrap.h b/plugins/ladspa_effect/calf/src/calf/ladspa_wrap.h
index d94ebcea3..8859b989a 100644
--- a/plugins/ladspa_effect/calf/src/calf/ladspa_wrap.h
+++ b/plugins/ladspa_effect/calf/src/calf/ladspa_wrap.h
@@ -48,6 +48,7 @@ struct ladspa_instance: public plugin_ctl_iface
     
     ladspa_instance(audio_module_iface *_module, ladspa_plugin_metadata_set *_ladspa, int sample_rate);
     virtual const line_graph_iface *get_line_graph_iface() const { return module->get_line_graph_iface(); }
+    virtual const table_edit_iface *get_table_edit_iface() const { return module->get_table_edit_iface(); }
     virtual float get_param_value(int param_no);
     virtual void set_param_value(int param_no, float value);
     virtual bool activate_preset(int bank, int program);
diff --git a/plugins/ladspa_effect/calf/src/calf/lv2wrap.h b/plugins/ladspa_effect/calf/src/calf/lv2wrap.h
index 198b713e3..c43237fa9 100644
--- a/plugins/ladspa_effect/calf/src/calf/lv2wrap.h
+++ b/plugins/ladspa_effect/calf/src/calf/lv2wrap.h
@@ -160,6 +160,7 @@ struct lv2_instance: public plugin_ctl_iface, public progress_report_iface
     }
     virtual const plugin_metadata_iface *get_metadata_iface() const { return metadata; }
     virtual const line_graph_iface *get_line_graph_iface() const { return module->get_line_graph_iface(); }
+    virtual const table_edit_iface *get_table_edit_iface() const { return module->get_table_edit_iface(); }
     virtual int send_status_updates(send_updates_iface *sui, int last_serial) { return module->send_status_updates(sui, last_serial); }
 };