Moved PluginInfo::Type to ARDOUR::PluginType in ardour/types.h.
authorTaybin Rutkin <taybin@taybin.com>
Thu, 10 Aug 2006 04:01:15 +0000 (04:01 +0000)
committerTaybin Rutkin <taybin@taybin.com>
Thu, 10 Aug 2006 04:01:15 +0000 (04:01 +0000)
Figured out (mostly) AUPluginUI hierarchy.
Moved LadspaPluginUI to its own ladspa_pluginui.cc file.

git-svn-id: svn://localhost/ardour2/trunk@782 d708f5d6-7413-0410-9779-e7cbd77b26cf

18 files changed:
au_pluginui.cc [deleted file]
gtk2_ardour/SConscript
gtk2_ardour/au_pluginui.cc [new file with mode: 0644]
gtk2_ardour/ladspa_pluginui.cc [new file with mode: 0644]
gtk2_ardour/plugin_selector.cc
gtk2_ardour/plugin_selector.h
gtk2_ardour/plugin_ui.cc
gtk2_ardour/plugin_ui.h
gtk2_ardour/redirect_box.cc
libs/ardour/ardour/audio_unit.h
libs/ardour/ardour/insert.h
libs/ardour/ardour/plugin.h
libs/ardour/ardour/types.h
libs/ardour/ardour/vst_plugin.h
libs/ardour/audio_unit.cc
libs/ardour/insert.cc
libs/ardour/plugin.cc
libs/ardour/plugin_manager.cc

diff --git a/au_pluginui.cc b/au_pluginui.cc
deleted file mode 100644 (file)
index cbf493a..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-    Copyright (C) 2006 Paul Davis 
-       Written by Taybin Rutkin
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <ardour/insert.h>
-#include <ardour/audio_unit.h>
-
-#include "plugin_ui.h"
-
-using namespace ARDOUR;
-using namespace PBD;
-
-AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<AUPlugin> ap)
-       : PlugUIBase (pi),
-         au (ap)
-{
-       info << "AUPluginUI created" << endmsg;
-}
-
-AUPluginUI::~AUPluginUI ()
-{
-       // nothing to do here - plugin destructor destroys the GUI
-}
-
-int
-AUPluginUI::get_preferred_height ()
-{
-       return -1;
-}
index d004c9c4c65ef64a763d807e25f6f5eebd20eb9c..2a7250eaa42fb0931abdf708ed91960a4c57252e 100644 (file)
@@ -57,14 +57,13 @@ if gtkardour['FFT_ANALYSIS']:
        gtkardour.Merge ([libraries['fftw3f']])
        gtkardour.Append(CCFLAGS='-DFFT_ANALYSIS')
 
-if gtkardour['COREAUDIO']:
-       gtkardour.Append(CCFLAGS='-DHAVE_COREAUDIO')
-       gtkardour.Merge([libraries['appleutility']])
-
 skipped_files=Split("""
 connection_editor.cc
 """)
 
+coreaudio_files=Split("""
+au_pluginui.cc
+""")
 
 gtkardour_files=Split("""
 about.cc
@@ -140,6 +139,7 @@ imageframe_time_axis_view.cc
 imageframe_view.cc
 io_selector.cc
 keyboard.cc
+ladspa_pluginui.cc
 location_ui.cc
 main.cc
 marker.cc
@@ -186,7 +186,6 @@ visual_time_axis.cc
 waveview.cc
 """)
 
-
 fft_analysis_files=Split("""
 analysis_window.cc
 fft_graph.cc
@@ -212,7 +211,12 @@ vst_files = [ 'vst_pluginui.cc' ]
 if env['VST']:
        extra_sources += vst_files
        gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
-  
+
+if gtkardour['COREAUDIO']:
+    extra_sources += coreaudio_files
+    gtkardour.Append(CCFLAGS='-DHAVE_COREAUDIO')
+    gtkardour.Merge([libraries['appleutility']])
 if env['FFT_ANALYSIS']:
        extra_sources += fft_analysis_files
 
diff --git a/gtk2_ardour/au_pluginui.cc b/gtk2_ardour/au_pluginui.cc
new file mode 100644 (file)
index 0000000..3e0e7e4
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+       Written by Taybin Rutkin
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <ardour/insert.h>
+#include <ardour/audio_unit.h>
+
+#include "plugin_ui.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+
+AUPluginUI::AUPluginUI (ARDOUR::AudioEngine& engine, boost::shared_ptr<PluginInsert> ap)
+{
+       info << "AUPluginUI created" << endmsg;
+}
+
+AUPluginUI::~AUPluginUI ()
+{
+       // nothing to do here - plugin destructor destroys the GUI
+}
diff --git a/gtk2_ardour/ladspa_pluginui.cc b/gtk2_ardour/ladspa_pluginui.cc
new file mode 100644 (file)
index 0000000..22b8609
--- /dev/null
@@ -0,0 +1,759 @@
+/*
+    Copyright (C) 2000 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <climits>
+#include <cerrno>
+#include <cmath>
+#include <string>
+
+#include <pbd/stl_delete.h>
+#include <pbd/xml++.h>
+#include <pbd/failed_constructor.h>
+
+#include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/fastmeter.h>
+#include <gtkmm2ext/barcontroller.h>
+#include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/doi.h>
+#include <gtkmm2ext/slider_controller.h>
+
+#include <midi++/manager.h>
+
+#include <ardour/audioengine.h>
+#include <ardour/plugin.h>
+#include <ardour/insert.h>
+#include <ardour/ladspa_plugin.h>
+
+#include <lrdf.h>
+
+#include "ardour_ui.h"
+#include "prompter.h"
+#include "plugin_ui.h"
+#include "utils.h"
+#include "gui_thread.h"
+
+#include "i18n.h"
+
+using namespace std;
+using namespace ARDOUR;
+using namespace PBD;
+using namespace Gtkmm2ext;
+using namespace Gtk;
+using namespace sigc;
+
+LadspaPluginUI::LadspaPluginUI (AudioEngine &engine, boost::shared_ptr<PluginInsert> pi, bool scrollable)
+       : PlugUIBase (pi),
+         engine(engine),
+         button_table (initial_button_rows, initial_button_cols),
+         output_table (initial_output_rows, initial_output_cols),
+         hAdjustment(0.0, 0.0, 0.0),
+         vAdjustment(0.0, 0.0, 0.0),
+         scroller_view(hAdjustment, vAdjustment),
+         automation_menu (0),
+         is_scrollable(scrollable)
+{
+       set_name ("PluginEditor");
+       set_border_width (10);
+       set_homogeneous (false);
+
+       settings_box.set_homogeneous (false);
+
+       HBox* constraint_hbox = manage (new HBox);
+       HBox* smaller_hbox = manage (new HBox);
+       Label* combo_label = manage (new Label (_("<span size=\"large\">Presets</span>")));
+       combo_label->set_use_markup (true);
+
+       smaller_hbox->pack_start (*combo_label, false, false, 10);
+       smaller_hbox->pack_start (combo, false, false);
+       smaller_hbox->pack_start (save_button, false, false);
+
+       constraint_hbox->set_spacing (5);
+       constraint_hbox->pack_start (*smaller_hbox, true, false);
+       constraint_hbox->pack_end (bypass_button, false, false);
+
+       settings_box.pack_end (*constraint_hbox, false, false);
+
+       pack_start (settings_box, false, false);
+
+       if ( is_scrollable ) {
+               scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+               scroller.set_name ("PluginEditor");
+               scroller_view.set_name("PluginEditor");
+               scroller_view.add (hpacker);
+               scroller.add (scroller_view);
+               
+               pack_start (scroller, true, true);
+
+       }
+       else {
+               pack_start (hpacker, false, false);
+       }
+
+       insert->active_changed.connect (mem_fun(*this, &LadspaPluginUI::redirect_active_changed));
+       bypass_button.set_active (!insert->active());
+       
+       build (engine);
+}
+
+LadspaPluginUI::~LadspaPluginUI ()
+{
+       if (output_controls.size() > 0) {
+               screen_update_connection.disconnect();
+       }
+}
+
+void
+LadspaPluginUI::build (AudioEngine &engine)
+
+{
+       guint32 i = 0;
+       guint32 x = 0;
+       Frame* frame;
+       Frame* bt_frame;
+       VBox* box;
+       int output_row, output_col;
+       int button_row, button_col;
+       int output_rows, output_cols;
+       int button_rows, button_cols;
+       guint32 n_ins=0, n_outs = 0;
+
+       prefheight = 30;
+       hpacker.set_spacing (10);
+
+       output_rows = initial_output_rows;
+       output_cols = initial_output_cols;
+       button_rows = initial_button_rows;
+       button_cols = initial_button_cols;
+       output_row = 0;
+       button_row = 0;
+       output_col = 0;
+       button_col = 0;
+
+       button_table.set_homogeneous (false);
+       button_table.set_row_spacings (2);
+       button_table.set_col_spacings (2);
+       output_table.set_homogeneous (true);
+       output_table.set_row_spacings (2);
+       output_table.set_col_spacings (2);
+       button_table.set_border_width (5);
+       output_table.set_border_width (5);
+
+       hpacker.set_border_width (10);
+
+       bt_frame = manage (new Frame);
+       bt_frame->set_name ("BaseFrame");
+       bt_frame->add (button_table);
+       hpacker.pack_start(*bt_frame, true, true);
+
+       box = manage (new VBox);
+       box->set_border_width (5);
+       box->set_spacing (1);
+
+       frame = manage (new Frame);
+       frame->set_name ("BaseFrame");
+       frame->set_label (_("Controls"));
+       frame->add (*box);
+       hpacker.pack_start(*frame, true, true);
+
+       /* find all ports. build control elements for all appropriate control ports */
+
+       for (i = 0; i < plugin->parameter_count(); ++i) {
+
+               if (plugin->parameter_is_control (i)) {
+                       
+                       /* Don't show latency control ports */
+
+                       if (plugin->describe_parameter (i) == X_("latency")) {
+                               continue;
+                       }
+
+                       ControlUI* cui;
+       
+                       /* if we are scrollable, just use one long column */
+
+                       if (!is_scrollable) {
+                               if (x++ > 7){
+                                       frame = manage (new Frame);
+                                       frame->set_name ("BaseFrame");
+                                       box = manage (new VBox);
+                                       
+                                       box->set_border_width (5);
+                                       box->set_spacing (1);
+
+                                       frame->add (*box);
+                                       hpacker.pack_start(*frame,true,true);
+
+                                       x = 0;
+                               }
+                       }
+
+                       if ((cui = build_control_ui (engine, i, plugin->get_nth_control (i))) == 0) {
+                               error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
+                               continue;
+                       }
+                               
+                       if (cui->control || cui->clickbox || cui->combo) {
+
+                               box->pack_start (*cui, false, false);
+
+                       } else if (cui->button) {
+
+                               if (button_row == button_rows) {
+                                       button_row = 0;
+                                       if (++button_col == button_cols) {
+                                               button_cols += 2;
+                                               button_table.resize (button_rows, button_cols);
+                                       }
+                               }
+
+                               button_table.attach (*cui, button_col, button_col + 1, button_row, button_row+1, 
+                                                    FILL|EXPAND, FILL);
+                               button_row++;
+
+                       } else if (cui->display) {
+
+                               output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, 
+                                                    FILL|EXPAND, FILL);
+                               
+                               // TODO: The meters should be divided into multiple rows 
+                               
+                               if (++output_col == output_cols) {
+                                       output_cols ++;
+                                       output_table.resize (output_rows, output_cols);
+                               }
+                               
+                               /* old code, which divides meters into
+                                * columns first, rows later. New code divides into one row
+                                
+                               if (output_row == output_rows) {
+                                       output_row = 0;
+                                       if (++output_col == output_cols) {
+                                               output_cols += 2;
+                                               output_table.resize (output_rows, output_cols);
+                                       }
+                               }
+                               
+                               output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, 
+                                                    FILL|EXPAND, FILL);
+                               output_row++;
+                               */
+                       }
+                               
+                       /* HACK: ideally the preferred height would be queried from
+                          the complete hpacker, but I can't seem to get that
+                          information in time, so this is an estimation 
+                       */
+
+                       prefheight += 30;
+
+               } 
+       }
+
+       n_ins = plugin->get_info()->n_inputs;
+       n_outs = plugin->get_info()->n_outputs;
+
+       if (box->children().empty()) {
+               hpacker.remove (*frame);
+       }
+
+       if (button_table.children().empty()) {
+               hpacker.remove (*bt_frame);
+       }
+
+       if (!output_table.children().empty()) {
+               frame = manage (new Frame);
+               frame->set_name ("BaseFrame");
+               frame->add (output_table);
+               hpacker.pack_end (*frame, true, true);
+       }
+
+       output_update ();
+
+       output_table.show_all ();
+       button_table.show_all ();
+}
+
+LadspaPluginUI::ControlUI::ControlUI ()
+       : automate_button (X_("")) // force creation of a label 
+{
+       automate_button.set_name ("PluginAutomateButton");
+       ARDOUR_UI::instance()->tooltips().set_tip (automate_button,
+                                                  _("Automation control"));
+
+       /* don't fix the height, it messes up the bar controllers */
+
+       set_size_request_to_display_given_text (automate_button, X_("lngnuf"), 2, 2);
+
+       ignore_change = 0;
+       display = 0;
+       button = 0;
+       control = 0;
+       clickbox = 0;
+       adjustment = 0;
+       meterinfo = 0;
+}
+
+LadspaPluginUI::ControlUI::~ControlUI() 
+{
+       if (adjustment) {
+               delete adjustment;
+       }
+
+       if (meterinfo) {
+               delete meterinfo->meter;
+               delete meterinfo;
+       }
+}
+
+void
+LadspaPluginUI::automation_state_changed (ControlUI* cui)
+{
+       /* update button label */
+
+       switch (insert->get_port_automation_state (cui->port_index) & (Off|Play|Touch|Write)) {
+       case Off:
+               cui->automate_button.set_label (_("Off"));
+               break;
+       case Play:
+               cui->automate_button.set_label (_("Play"));
+               break;
+       case Write:
+               cui->automate_button.set_label (_("Write"));
+               break;
+       case Touch:
+               cui->automate_button.set_label (_("Touch"));
+               break;
+       default:
+               cui->automate_button.set_label (_("???"));
+               break;
+       }
+}
+
+
+static void integer_printer (char buf[32], Adjustment &adj, void *arg)
+{
+       snprintf (buf, 32, "%.0f", adj.get_value());
+}
+
+void
+LadspaPluginUI::print_parameter (char *buf, uint32_t len, uint32_t param)
+{
+       plugin->print_parameter (param, buf, len);
+}
+
+LadspaPluginUI::ControlUI*
+LadspaPluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, PBD::Controllable* mcontrol)
+
+{
+       ControlUI* control_ui;
+       Plugin::ParameterDescriptor desc;
+
+       plugin->get_parameter_descriptor (port_index, desc);
+
+       control_ui = manage (new ControlUI ());
+       control_ui->adjustment = 0;
+       control_ui->combo = 0;
+       control_ui->combo_map = 0;
+       control_ui->port_index = port_index;
+       control_ui->update_pending = false;
+       control_ui->label.set_text (desc.label);
+       control_ui->label.set_alignment (0.0, 0.5);
+       control_ui->label.set_name ("PluginParameterLabel");
+
+       control_ui->set_spacing (5);
+
+       if (plugin->parameter_is_input (port_index)) {
+
+               boost::shared_ptr<LadspaPlugin> lp;
+
+               if ((lp = boost::dynamic_pointer_cast<LadspaPlugin>(plugin)) != 0) {
+                       
+                       lrdf_defaults* defaults = lrdf_get_scale_values(lp->unique_id(), port_index);
+                       
+                       if (defaults && defaults->count > 0)    {
+                               
+                               control_ui->combo = new Gtk::ComboBoxText;
+                               //control_ui->combo->set_value_in_list(true, false);
+                               set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
+                               control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &LadspaPluginUI::control_combo_changed), control_ui));
+                               plugin->ParameterChanged.connect (bind (mem_fun (*this, &LadspaPluginUI::parameter_changed), control_ui));
+                               control_ui->pack_start(control_ui->label, true, true);
+                               control_ui->pack_start(*control_ui->combo, false, true);
+                               
+                               update_control_display(control_ui);
+                               
+                               lrdf_free_setting_values(defaults);
+                               return control_ui;
+                       }
+               }
+                       
+               if (desc.toggled) {
+
+                       /* Build a button */
+               
+                       control_ui->button = manage (new ToggleButton ());
+                       control_ui->button->set_name ("PluginEditorButton");
+                       control_ui->button->set_size_request (20, 20);
+
+                       control_ui->pack_start (control_ui->label, true, true);
+                       control_ui->pack_start (*control_ui->button, false, true);
+                       control_ui->pack_start (control_ui->automate_button, false, false);
+
+                       control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &LadspaPluginUI::control_port_toggled), control_ui));
+               
+                       if(plugin->get_parameter (port_index) == 1){
+                               control_ui->button->set_active(true);
+                       }
+
+                       return control_ui;
+               }
+       
+               control_ui->adjustment = new Adjustment (0, 0, 0, 0, 0);
+
+               /* XXX this code is not right yet, because it doesn't handle
+                  the absence of bounds in any sensible fashion.
+               */
+
+               control_ui->adjustment->set_lower (desc.lower);
+               control_ui->adjustment->set_upper (desc.upper);
+
+               control_ui->logarithmic = desc.logarithmic;
+               if (control_ui->logarithmic) {
+                       if (control_ui->adjustment->get_lower() == 0.0) {
+                               control_ui->adjustment->set_lower (control_ui->adjustment->get_upper()/10000);
+                       }
+                       control_ui->adjustment->set_upper (log(control_ui->adjustment->get_upper()));
+                       control_ui->adjustment->set_lower (log(control_ui->adjustment->get_lower()));
+               }
+       
+               float delta = desc.upper - desc.lower;
+
+               control_ui->adjustment->set_page_size (delta/100.0);
+               control_ui->adjustment->set_step_increment (desc.step);
+               control_ui->adjustment->set_page_increment (desc.largestep);
+
+               if (desc.integer_step) {
+                       control_ui->clickbox = new ClickBox (control_ui->adjustment, "PluginUIClickBox");
+                       Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
+                       control_ui->clickbox->set_print_func (integer_printer, 0);
+               } else {
+                       sigc::slot<void,char*,uint32_t> pslot = sigc::bind (mem_fun(*this, &LadspaPluginUI::print_parameter), (uint32_t) port_index);
+
+                       control_ui->control = new BarController (*control_ui->adjustment, *mcontrol, pslot);
+                       // should really match the height of the text in the automation button+label
+                       control_ui->control->set_size_request (200, 22);
+                       control_ui->control->set_name (X_("PluginSlider"));
+                       control_ui->control->set_style (BarController::LeftToRight);
+                       control_ui->control->set_use_parent (true);
+
+                       control_ui->control->StartGesture.connect (bind (mem_fun(*this, &LadspaPluginUI::start_touch), control_ui));
+                       control_ui->control->StopGesture.connect (bind (mem_fun(*this, &LadspaPluginUI::stop_touch), control_ui));
+                       
+               }
+
+               if (control_ui->logarithmic) {
+                       control_ui->adjustment->set_value(log(plugin->get_parameter(port_index)));
+               } else{
+                       control_ui->adjustment->set_value(plugin->get_parameter(port_index));
+               }
+
+               /* XXX memory leak: SliderController not destroyed by ControlUI
+                  destructor, and manage() reports object hierarchy
+                  ambiguity.
+               */
+
+               control_ui->pack_start (control_ui->label, true, true);
+               if (desc.integer_step) {
+                       control_ui->pack_start (*control_ui->clickbox, false, false);
+               } else {
+                       control_ui->pack_start (*control_ui->control, false, false);
+               }
+
+               control_ui->pack_start (control_ui->automate_button, false, false);
+               control_ui->adjustment->signal_value_changed().connect (bind (mem_fun(*this, &LadspaPluginUI::control_adjustment_changed), control_ui));
+               control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &LadspaPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
+
+               automation_state_changed (control_ui);
+
+               plugin->ParameterChanged.connect (bind (mem_fun(*this, &LadspaPluginUI::parameter_changed), control_ui));
+               insert->automation_list (port_index).automation_state_changed.connect 
+                       (bind (mem_fun(*this, &LadspaPluginUI::automation_state_changed), control_ui));
+
+       } else if (plugin->parameter_is_output (port_index)) {
+
+               control_ui->display = manage (new EventBox);
+               control_ui->display->set_name ("ParameterValueDisplay");
+
+               control_ui->display_label = manage (new Label);
+
+               control_ui->display_label->set_name ("ParameterValueDisplay");
+
+               control_ui->display->add (*control_ui->display_label);
+               Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->display, "-99,99", 2, 2);
+
+               control_ui->display->show_all ();
+
+               /* set up a meter */
+               /* TODO: only make a meter if the port is Hinted for it */
+
+               MeterInfo * info = new MeterInfo(port_index);
+               control_ui->meterinfo = info;
+               
+               info->meter = new FastMeter (5, 100, FastMeter::Vertical);
+
+               info->min_unbound = desc.min_unbound;
+               info->max_unbound = desc.max_unbound;
+
+               info->min = desc.lower;
+               info->max = desc.upper;
+
+               control_ui->vbox = manage (new VBox);
+               control_ui->hbox = manage (new HBox);
+               
+               control_ui->label.set_angle(90);
+               control_ui->hbox->pack_start (control_ui->label, false, false);
+               control_ui->hbox->pack_start (*info->meter, false, false);
+
+               control_ui->vbox->pack_start (*control_ui->hbox, false, false);
+               
+               control_ui->vbox->pack_start (*control_ui->display, false, false);
+
+               control_ui->pack_start (*control_ui->vbox);
+
+               control_ui->meterinfo->meter->show_all();
+               control_ui->meterinfo->packed = true;
+               
+               output_controls.push_back (control_ui);
+       }
+       
+       plugin->ParameterChanged.connect (bind (mem_fun(*this, &LadspaPluginUI::parameter_changed), control_ui));
+       return control_ui;
+}
+
+void
+LadspaPluginUI::start_touch (LadspaPluginUI::ControlUI* cui)
+{
+       insert->automation_list (cui->port_index).start_touch ();
+}
+
+void
+LadspaPluginUI::stop_touch (LadspaPluginUI::ControlUI* cui)
+{
+       insert->automation_list (cui->port_index).stop_touch ();
+}
+
+void
+LadspaPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
+{
+       using namespace Menu_Helpers;
+
+       if (automation_menu == 0) {
+               automation_menu = manage (new Menu);
+               automation_menu->set_name ("ArdourContextMenu");
+       } 
+
+       MenuList& items (automation_menu->items());
+
+       items.clear ();
+       items.push_back (MenuElem (_("Off"), 
+                                  bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Off, cui)));
+       items.push_back (MenuElem (_("Play"),
+                                  bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Play, cui)));
+       items.push_back (MenuElem (_("Write"),
+                                  bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Write, cui)));
+       items.push_back (MenuElem (_("Touch"),
+                                  bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Touch, cui)));
+
+       automation_menu->popup (1, 0);
+}
+
+void
+LadspaPluginUI::set_automation_state (AutoState state, ControlUI* cui)
+{
+       insert->set_port_automation_state (cui->port_index, state);
+}
+
+void
+LadspaPluginUI::control_adjustment_changed (ControlUI* cui)
+{
+       if (cui->ignore_change) {
+               return;
+       }
+
+       double value = cui->adjustment->get_value();
+
+       if (cui->logarithmic) {
+               value = exp(value);
+       }
+
+       insert->set_parameter (cui->port_index, (float) value);
+}
+
+void
+LadspaPluginUI::parameter_changed (uint32_t abs_port_id, float val, ControlUI* cui)
+{
+       if (cui->port_index == abs_port_id) {
+               if (!cui->update_pending) {
+                       cui->update_pending = true;
+                       Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &LadspaPluginUI::update_control_display), cui));
+               }
+       }
+}
+
+void
+LadspaPluginUI::update_control_display (ControlUI* cui)        
+{
+       /* XXX how do we handle logarithmic stuff here ? */
+       
+       cui->update_pending = false;
+
+       float val = plugin->get_parameter (cui->port_index);
+
+       cui->ignore_change++;
+       if (cui->combo) {
+               std::map<string,float>::iterator it;
+               for (it = cui->combo_map->begin(); it != cui->combo_map->end(); ++it) {
+                       if (it->second == val) {
+                               cui->combo->set_active_text(it->first);
+                               break;
+                       }
+               }
+       } else if (cui->adjustment == 0) {
+
+               if (val > 0.5) {
+                       cui->button->set_active (true);
+               } else {
+                       cui->button->set_active (false);
+               }
+
+       } else {
+               if (cui->logarithmic) {
+                       val = log(val);
+               }
+               if (val != cui->adjustment->get_value()) {
+                       cui->adjustment->set_value (val);
+               }
+       }
+       cui->ignore_change--;
+}
+
+void
+LadspaPluginUI::control_port_toggled (ControlUI* cui)
+{
+       if (!cui->ignore_change) {
+               insert->set_parameter (cui->port_index, cui->button->get_active());
+       }
+}
+
+void
+LadspaPluginUI::control_combo_changed (ControlUI* cui)
+{
+       if (!cui->ignore_change) {
+               string value = cui->combo->get_active_text();
+               std::map<string,float> mapping = *cui->combo_map;
+               insert->set_parameter (cui->port_index, mapping[value]);
+       }
+
+}
+
+void
+LadspaPluginUI::redirect_active_changed (Redirect* r, void* src)
+{
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &LadspaPluginUI::redirect_active_changed), r, src));
+       
+       bypass_button.set_active (!r->active());
+}
+
+bool
+LadspaPluginUI::start_updating (GdkEventAny* ignored)
+{
+       if (output_controls.size() > 0 ) {
+               screen_update_connection.disconnect();
+               screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect 
+                       (mem_fun(*this, &LadspaPluginUI::output_update));
+       }
+       return false;
+}
+
+bool
+LadspaPluginUI::stop_updating (GdkEventAny* ignored)
+{
+       if (output_controls.size() > 0 ) {
+               screen_update_connection.disconnect();
+       }
+       return false;
+}
+
+void
+LadspaPluginUI::output_update ()
+{
+       for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
+               float val = plugin->get_parameter ((*i)->port_index);
+               char buf[32];
+               snprintf (buf, sizeof(buf), "%.2f", val);
+               (*i)->display_label->set_text (buf);
+
+               /* autoscaling for the meter */
+               if ((*i)->meterinfo && (*i)->meterinfo->packed) {
+                       
+                       if (val < (*i)->meterinfo->min) {
+                               if ((*i)->meterinfo->min_unbound)
+                                       (*i)->meterinfo->min = val;
+                               else
+                                       val = (*i)->meterinfo->min;
+                       }
+
+                       if (val > (*i)->meterinfo->max) {
+                               if ((*i)->meterinfo->max_unbound)
+                                       (*i)->meterinfo->max = val;
+                               else
+                                       val = (*i)->meterinfo->max;
+                       }
+                       
+                       if ((*i)->meterinfo->max > (*i)->meterinfo->min ) {
+                               float lval = (val - (*i)->meterinfo->min) / ((*i)->meterinfo->max - (*i)->meterinfo->min) ;
+                               (*i)->meterinfo->meter->set (lval );
+                       }
+               }
+       }
+}
+
+vector<string> 
+LadspaPluginUI::setup_scale_values(guint32 port_index, ControlUI* cui)
+{
+       vector<string> enums;
+       boost::shared_ptr<LadspaPlugin> lp = boost::dynamic_pointer_cast<LadspaPlugin> (plugin);
+
+       cui->combo_map = new std::map<string, float>;
+       lrdf_defaults* defaults = lrdf_get_scale_values(lp->unique_id(), port_index);
+       if (defaults)   {
+               for (uint32_t i = 0; i < defaults->count; ++i) {
+                       enums.push_back(defaults->items[i].label);
+                       pair<string, float> newpair;
+                       newpair.first = defaults->items[i].label;
+                       newpair.second = defaults->items[i].value;
+                       cui->combo_map->insert(newpair);
+               }
+
+               lrdf_free_setting_values(defaults);
+       }
+
+       return enums;
+}
index e0a62b177f18711ed8f759036e018dfbee28cb62..20db1b394478d0944e916352524d439432fbf602 100644 (file)
@@ -49,7 +49,7 @@ PluginSelector::PluginSelector (PluginManager *mgr)
        manager = mgr;
        session = 0;
        
-       current_selection = PluginInfo::LADSPA;
+       current_selection = ARDOUR::LADSPA;
 
        lmodel = Gtk::ListStore::create(lcols);
        ladspa_display.set_model (lmodel);
@@ -286,7 +286,7 @@ PluginSelector::vst_display_selection_changed()
                btn_add->set_sensitive (false);
        }
 
-       current_selection = PluginInfo::VST;
+       current_selection = ARDOUR::VST;
 }
 
 #endif //VST_SUPPORT
@@ -332,7 +332,7 @@ PluginSelector::au_display_selection_changed()
                btn_add->set_sensitive (false);
        }
        
-       current_selection = PluginInfo::AudioUnit;
+       current_selection = ARDOUR::AudioUnit;
 }
 
 #endif //HAVE_COREAUDIO
@@ -361,19 +361,19 @@ PluginSelector::btn_add_clicked()
        Gtk::TreeModel::Row row;
 
        switch (current_selection) {
-               case PluginInfo::LADSPA:
+               case ARDOUR::LADSPA:
                        row = *(ladspa_display.get_selection()->get_selected());
                        name = row[lcols.name];
                        pi = row[lcols.plugin];
                        break;
-               case PluginInfo::VST:
+               case ARDOUR::VST:
 #ifdef VST_SUPPORT
                        row = *(vst_display.get_selection()->get_selected());
                        name = row[vcols.name];
                        pi = row[vcols.plugin];
 #endif
                        break;
-               case PluginInfo::AudioUnit:
+               case ARDOUR::AudioUnit:
 #ifdef HAVE_COREAUDIO
                        row = *(au_display.get_selection()->get_selected());
                        name = row[aucols.name];
@@ -426,7 +426,7 @@ PluginSelector::ladspa_display_selection_changed()
                btn_add->set_sensitive (false);
        }
        
-       current_selection = PluginInfo::LADSPA;
+       current_selection = ARDOUR::LADSPA;
 }
 
 void
index 583506972a896b80b9f6d26c0b08957895f80214..654088e3d85416a0f7ea911835c3c41cb4d2f44c 100644 (file)
@@ -50,7 +50,7 @@ class PluginSelector : public ArdourDialog
        Gtk::ScrolledWindow auscroller; // AudioUnit
        Gtk::ScrolledWindow ascroller;  // Added plugins
        
-       ARDOUR::PluginInfo::Type current_selection;
+       ARDOUR::PluginType current_selection;
 
        // page 1
        struct LadspaColumns : public Gtk::TreeModel::ColumnRecord {
index edc94864f2a916d51fb934f1f0088f5509d9d8d3..350240cb1e40079857e9598b88dcb15826a0334b 100644 (file)
@@ -117,622 +117,6 @@ PluginUIWindow::~PluginUIWindow ()
 {
 }
 
-LadspaPluginUI::LadspaPluginUI (AudioEngine &engine, boost::shared_ptr<PluginInsert> pi, bool scrollable)
-       : PlugUIBase (pi),
-         engine(engine),
-         button_table (initial_button_rows, initial_button_cols),
-         output_table (initial_output_rows, initial_output_cols),
-         hAdjustment(0.0, 0.0, 0.0),
-         vAdjustment(0.0, 0.0, 0.0),
-         scroller_view(hAdjustment, vAdjustment),
-         automation_menu (0),
-         is_scrollable(scrollable)
-{
-       set_name ("PluginEditor");
-       set_border_width (10);
-       set_homogeneous (false);
-
-       settings_box.set_homogeneous (false);
-
-       HBox* constraint_hbox = manage (new HBox);
-       HBox* smaller_hbox = manage (new HBox);
-       Label* combo_label = manage (new Label (_("<span size=\"large\">Presets</span>")));
-       combo_label->set_use_markup (true);
-
-       smaller_hbox->pack_start (*combo_label, false, false, 10);
-       smaller_hbox->pack_start (combo, false, false);
-       smaller_hbox->pack_start (save_button, false, false);
-
-       constraint_hbox->set_spacing (5);
-       constraint_hbox->pack_start (*smaller_hbox, true, false);
-       constraint_hbox->pack_end (bypass_button, false, false);
-
-       settings_box.pack_end (*constraint_hbox, false, false);
-
-       pack_start (settings_box, false, false);
-
-       if ( is_scrollable ) {
-               scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-               scroller.set_name ("PluginEditor");
-               scroller_view.set_name("PluginEditor");
-               scroller_view.add (hpacker);
-               scroller.add (scroller_view);
-               
-               pack_start (scroller, true, true);
-
-       }
-       else {
-               pack_start (hpacker, false, false);
-       }
-
-       insert->active_changed.connect (mem_fun(*this, &LadspaPluginUI::redirect_active_changed));
-       bypass_button.set_active (!insert->active());
-       
-       build (engine);
-}
-
-LadspaPluginUI::~LadspaPluginUI ()
-{
-       if (output_controls.size() > 0) {
-               screen_update_connection.disconnect();
-       }
-}
-
-void
-LadspaPluginUI::build (AudioEngine &engine)
-
-{
-       guint32 i = 0;
-       guint32 x = 0;
-       Frame* frame;
-       Frame* bt_frame;
-       VBox* box;
-       int output_row, output_col;
-       int button_row, button_col;
-       int output_rows, output_cols;
-       int button_rows, button_cols;
-       guint32 n_ins=0, n_outs = 0;
-
-       prefheight = 30;
-       hpacker.set_spacing (10);
-
-       output_rows = initial_output_rows;
-       output_cols = initial_output_cols;
-       button_rows = initial_button_rows;
-       button_cols = initial_button_cols;
-       output_row = 0;
-       button_row = 0;
-       output_col = 0;
-       button_col = 0;
-
-       button_table.set_homogeneous (false);
-       button_table.set_row_spacings (2);
-       button_table.set_col_spacings (2);
-       output_table.set_homogeneous (true);
-       output_table.set_row_spacings (2);
-       output_table.set_col_spacings (2);
-       button_table.set_border_width (5);
-       output_table.set_border_width (5);
-
-       hpacker.set_border_width (10);
-
-       bt_frame = manage (new Frame);
-       bt_frame->set_name ("BaseFrame");
-       bt_frame->add (button_table);
-       hpacker.pack_start(*bt_frame, true, true);
-
-       box = manage (new VBox);
-       box->set_border_width (5);
-       box->set_spacing (1);
-
-       frame = manage (new Frame);
-       frame->set_name ("BaseFrame");
-       frame->set_label (_("Controls"));
-       frame->add (*box);
-       hpacker.pack_start(*frame, true, true);
-
-       /* find all ports. build control elements for all appropriate control ports */
-
-       for (i = 0; i < plugin->parameter_count(); ++i) {
-
-               if (plugin->parameter_is_control (i)) {
-                       
-                       /* Don't show latency control ports */
-
-                       if (plugin->describe_parameter (i) == X_("latency")) {
-                               continue;
-                       }
-
-                       ControlUI* cui;
-       
-                       /* if we are scrollable, just use one long column */
-
-                       if (!is_scrollable) {
-                               if (x++ > 7){
-                                       frame = manage (new Frame);
-                                       frame->set_name ("BaseFrame");
-                                       box = manage (new VBox);
-                                       
-                                       box->set_border_width (5);
-                                       box->set_spacing (1);
-
-                                       frame->add (*box);
-                                       hpacker.pack_start(*frame,true,true);
-
-                                       x = 0;
-                               }
-                       }
-
-                       if ((cui = build_control_ui (engine, i, plugin->get_nth_control (i))) == 0) {
-                               error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
-                               continue;
-                       }
-                               
-                       if (cui->control || cui->clickbox || cui->combo) {
-
-                               box->pack_start (*cui, false, false);
-
-                       } else if (cui->button) {
-
-                               if (button_row == button_rows) {
-                                       button_row = 0;
-                                       if (++button_col == button_cols) {
-                                               button_cols += 2;
-                                               button_table.resize (button_rows, button_cols);
-                                       }
-                               }
-
-                               button_table.attach (*cui, button_col, button_col + 1, button_row, button_row+1, 
-                                                    FILL|EXPAND, FILL);
-                               button_row++;
-
-                       } else if (cui->display) {
-
-                               output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, 
-                                                    FILL|EXPAND, FILL);
-                               
-                               // TODO: The meters should be divided into multiple rows 
-                               
-                               if (++output_col == output_cols) {
-                                       output_cols ++;
-                                       output_table.resize (output_rows, output_cols);
-                               }
-                               
-                               /* old code, which divides meters into
-                                * columns first, rows later. New code divides into one row
-                                
-                               if (output_row == output_rows) {
-                                       output_row = 0;
-                                       if (++output_col == output_cols) {
-                                               output_cols += 2;
-                                               output_table.resize (output_rows, output_cols);
-                                       }
-                               }
-                               
-                               output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, 
-                                                    FILL|EXPAND, FILL);
-                               output_row++;
-                               */
-                       }
-                               
-                       /* HACK: ideally the preferred height would be queried from
-                          the complete hpacker, but I can't seem to get that
-                          information in time, so this is an estimation 
-                       */
-
-                       prefheight += 30;
-
-               } 
-       }
-
-       n_ins = plugin->get_info()->n_inputs;
-       n_outs = plugin->get_info()->n_outputs;
-
-       if (box->children().empty()) {
-               hpacker.remove (*frame);
-       }
-
-       if (button_table.children().empty()) {
-               hpacker.remove (*bt_frame);
-       }
-
-       if (!output_table.children().empty()) {
-               frame = manage (new Frame);
-               frame->set_name ("BaseFrame");
-               frame->add (output_table);
-               hpacker.pack_end (*frame, true, true);
-       }
-
-       output_update ();
-
-       output_table.show_all ();
-       button_table.show_all ();
-}
-
-LadspaPluginUI::ControlUI::ControlUI ()
-       : automate_button (X_("")) // force creation of a label 
-{
-       automate_button.set_name ("PluginAutomateButton");
-       ARDOUR_UI::instance()->tooltips().set_tip (automate_button,
-                                                  _("Automation control"));
-
-       /* don't fix the height, it messes up the bar controllers */
-
-       set_size_request_to_display_given_text (automate_button, X_("lngnuf"), 2, 2);
-
-       ignore_change = 0;
-       display = 0;
-       button = 0;
-       control = 0;
-       clickbox = 0;
-       adjustment = 0;
-       meterinfo = 0;
-}
-
-LadspaPluginUI::ControlUI::~ControlUI() 
-{
-       if (adjustment) {
-               delete adjustment;
-       }
-
-       if (meterinfo) {
-               delete meterinfo->meter;
-               delete meterinfo;
-       }
-}
-
-void
-LadspaPluginUI::automation_state_changed (ControlUI* cui)
-{
-       /* update button label */
-
-       switch (insert->get_port_automation_state (cui->port_index) & (Off|Play|Touch|Write)) {
-       case Off:
-               cui->automate_button.set_label (_("Off"));
-               break;
-       case Play:
-               cui->automate_button.set_label (_("Play"));
-               break;
-       case Write:
-               cui->automate_button.set_label (_("Write"));
-               break;
-       case Touch:
-               cui->automate_button.set_label (_("Touch"));
-               break;
-       default:
-               cui->automate_button.set_label (_("???"));
-               break;
-       }
-}
-
-
-static void integer_printer (char buf[32], Adjustment &adj, void *arg)
-{
-       snprintf (buf, 32, "%.0f", adj.get_value());
-}
-
-void
-LadspaPluginUI::print_parameter (char *buf, uint32_t len, uint32_t param)
-{
-       plugin->print_parameter (param, buf, len);
-}
-
-LadspaPluginUI::ControlUI*
-LadspaPluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, PBD::Controllable* mcontrol)
-
-{
-       ControlUI* control_ui;
-       Plugin::ParameterDescriptor desc;
-
-       plugin->get_parameter_descriptor (port_index, desc);
-
-       control_ui = manage (new ControlUI ());
-       control_ui->adjustment = 0;
-       control_ui->combo = 0;
-       control_ui->combo_map = 0;
-       control_ui->port_index = port_index;
-       control_ui->update_pending = false;
-       control_ui->label.set_text (desc.label);
-       control_ui->label.set_alignment (0.0, 0.5);
-       control_ui->label.set_name ("PluginParameterLabel");
-
-       control_ui->set_spacing (5);
-
-       if (plugin->parameter_is_input (port_index)) {
-
-               boost::shared_ptr<LadspaPlugin> lp;
-
-               if ((lp = boost::dynamic_pointer_cast<LadspaPlugin>(plugin)) != 0) {
-                       
-                       lrdf_defaults* defaults = lrdf_get_scale_values(lp->unique_id(), port_index);
-                       
-                       if (defaults && defaults->count > 0)    {
-                               
-                               control_ui->combo = new Gtk::ComboBoxText;
-                               //control_ui->combo->set_value_in_list(true, false);
-                               set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
-                               control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &LadspaPluginUI::control_combo_changed), control_ui));
-                               plugin->ParameterChanged.connect (bind (mem_fun (*this, &LadspaPluginUI::parameter_changed), control_ui));
-                               control_ui->pack_start(control_ui->label, true, true);
-                               control_ui->pack_start(*control_ui->combo, false, true);
-                               
-                               update_control_display(control_ui);
-                               
-                               lrdf_free_setting_values(defaults);
-                               return control_ui;
-                       }
-               }
-                       
-               if (desc.toggled) {
-
-                       /* Build a button */
-               
-                       control_ui->button = manage (new ToggleButton ());
-                       control_ui->button->set_name ("PluginEditorButton");
-                       control_ui->button->set_size_request (20, 20);
-
-                       control_ui->pack_start (control_ui->label, true, true);
-                       control_ui->pack_start (*control_ui->button, false, true);
-                       control_ui->pack_start (control_ui->automate_button, false, false);
-
-                       control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &LadspaPluginUI::control_port_toggled), control_ui));
-               
-                       if(plugin->get_parameter (port_index) == 1){
-                               control_ui->button->set_active(true);
-                       }
-
-                       return control_ui;
-               }
-       
-               control_ui->adjustment = new Adjustment (0, 0, 0, 0, 0);
-
-               /* XXX this code is not right yet, because it doesn't handle
-                  the absence of bounds in any sensible fashion.
-               */
-
-               control_ui->adjustment->set_lower (desc.lower);
-               control_ui->adjustment->set_upper (desc.upper);
-
-               control_ui->logarithmic = desc.logarithmic;
-               if (control_ui->logarithmic) {
-                       if (control_ui->adjustment->get_lower() == 0.0) {
-                               control_ui->adjustment->set_lower (control_ui->adjustment->get_upper()/10000);
-                       }
-                       control_ui->adjustment->set_upper (log(control_ui->adjustment->get_upper()));
-                       control_ui->adjustment->set_lower (log(control_ui->adjustment->get_lower()));
-               }
-       
-               float delta = desc.upper - desc.lower;
-
-               control_ui->adjustment->set_page_size (delta/100.0);
-               control_ui->adjustment->set_step_increment (desc.step);
-               control_ui->adjustment->set_page_increment (desc.largestep);
-
-               if (desc.integer_step) {
-                       control_ui->clickbox = new ClickBox (control_ui->adjustment, "PluginUIClickBox");
-                       Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
-                       control_ui->clickbox->set_print_func (integer_printer, 0);
-               } else {
-                       sigc::slot<void,char*,uint32_t> pslot = sigc::bind (mem_fun(*this, &LadspaPluginUI::print_parameter), (uint32_t) port_index);
-
-                       control_ui->control = new BarController (*control_ui->adjustment, *mcontrol, pslot);
-                       // should really match the height of the text in the automation button+label
-                       control_ui->control->set_size_request (200, 22);
-                       control_ui->control->set_name (X_("PluginSlider"));
-                       control_ui->control->set_style (BarController::LeftToRight);
-                       control_ui->control->set_use_parent (true);
-
-                       control_ui->control->StartGesture.connect (bind (mem_fun(*this, &LadspaPluginUI::start_touch), control_ui));
-                       control_ui->control->StopGesture.connect (bind (mem_fun(*this, &LadspaPluginUI::stop_touch), control_ui));
-                       
-               }
-
-               if (control_ui->logarithmic) {
-                       control_ui->adjustment->set_value(log(plugin->get_parameter(port_index)));
-               } else{
-                       control_ui->adjustment->set_value(plugin->get_parameter(port_index));
-               }
-
-               /* XXX memory leak: SliderController not destroyed by ControlUI
-                  destructor, and manage() reports object hierarchy
-                  ambiguity.
-               */
-
-               control_ui->pack_start (control_ui->label, true, true);
-               if (desc.integer_step) {
-                       control_ui->pack_start (*control_ui->clickbox, false, false);
-               } else {
-                       control_ui->pack_start (*control_ui->control, false, false);
-               }
-
-               control_ui->pack_start (control_ui->automate_button, false, false);
-               control_ui->adjustment->signal_value_changed().connect (bind (mem_fun(*this, &LadspaPluginUI::control_adjustment_changed), control_ui));
-               control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &LadspaPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-
-               automation_state_changed (control_ui);
-
-               plugin->ParameterChanged.connect (bind (mem_fun(*this, &LadspaPluginUI::parameter_changed), control_ui));
-               insert->automation_list (port_index).automation_state_changed.connect 
-                       (bind (mem_fun(*this, &LadspaPluginUI::automation_state_changed), control_ui));
-
-       } else if (plugin->parameter_is_output (port_index)) {
-
-               control_ui->display = manage (new EventBox);
-               control_ui->display->set_name ("ParameterValueDisplay");
-
-               control_ui->display_label = manage (new Label);
-
-               control_ui->display_label->set_name ("ParameterValueDisplay");
-
-               control_ui->display->add (*control_ui->display_label);
-               Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->display, "-99,99", 2, 2);
-
-               control_ui->display->show_all ();
-
-               /* set up a meter */
-               /* TODO: only make a meter if the port is Hinted for it */
-
-               MeterInfo * info = new MeterInfo(port_index);
-               control_ui->meterinfo = info;
-               
-               info->meter = new FastMeter (5, 100, FastMeter::Vertical);
-
-               info->min_unbound = desc.min_unbound;
-               info->max_unbound = desc.max_unbound;
-
-               info->min = desc.lower;
-               info->max = desc.upper;
-
-               control_ui->vbox = manage (new VBox);
-               control_ui->hbox = manage (new HBox);
-               
-               control_ui->label.set_angle(90);
-               control_ui->hbox->pack_start (control_ui->label, false, false);
-               control_ui->hbox->pack_start (*info->meter, false, false);
-
-               control_ui->vbox->pack_start (*control_ui->hbox, false, false);
-               
-               control_ui->vbox->pack_start (*control_ui->display, false, false);
-
-               control_ui->pack_start (*control_ui->vbox);
-
-               control_ui->meterinfo->meter->show_all();
-               control_ui->meterinfo->packed = true;
-               
-               output_controls.push_back (control_ui);
-       }
-       
-       plugin->ParameterChanged.connect (bind (mem_fun(*this, &LadspaPluginUI::parameter_changed), control_ui));
-       return control_ui;
-}
-
-void
-LadspaPluginUI::start_touch (LadspaPluginUI::ControlUI* cui)
-{
-       insert->automation_list (cui->port_index).start_touch ();
-}
-
-void
-LadspaPluginUI::stop_touch (LadspaPluginUI::ControlUI* cui)
-{
-       insert->automation_list (cui->port_index).stop_touch ();
-}
-
-void
-LadspaPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
-{
-       using namespace Menu_Helpers;
-
-       if (automation_menu == 0) {
-               automation_menu = manage (new Menu);
-               automation_menu->set_name ("ArdourContextMenu");
-       } 
-
-       MenuList& items (automation_menu->items());
-
-       items.clear ();
-       items.push_back (MenuElem (_("Off"), 
-                                  bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Off, cui)));
-       items.push_back (MenuElem (_("Play"),
-                                  bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Play, cui)));
-       items.push_back (MenuElem (_("Write"),
-                                  bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Write, cui)));
-       items.push_back (MenuElem (_("Touch"),
-                                  bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Touch, cui)));
-
-       automation_menu->popup (1, 0);
-}
-
-void
-LadspaPluginUI::set_automation_state (AutoState state, ControlUI* cui)
-{
-       insert->set_port_automation_state (cui->port_index, state);
-}
-
-void
-LadspaPluginUI::control_adjustment_changed (ControlUI* cui)
-{
-       if (cui->ignore_change) {
-               return;
-       }
-
-       double value = cui->adjustment->get_value();
-
-       if (cui->logarithmic) {
-               value = exp(value);
-       }
-
-       insert->set_parameter (cui->port_index, (float) value);
-}
-
-void
-LadspaPluginUI::parameter_changed (uint32_t abs_port_id, float val, ControlUI* cui)
-{
-       if (cui->port_index == abs_port_id) {
-               if (!cui->update_pending) {
-                       cui->update_pending = true;
-                       Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &LadspaPluginUI::update_control_display), cui));
-               }
-       }
-}
-
-void
-LadspaPluginUI::update_control_display (ControlUI* cui)        
-{
-       /* XXX how do we handle logarithmic stuff here ? */
-       
-       cui->update_pending = false;
-
-       float val = plugin->get_parameter (cui->port_index);
-
-       cui->ignore_change++;
-       if (cui->combo) {
-               std::map<string,float>::iterator it;
-               for (it = cui->combo_map->begin(); it != cui->combo_map->end(); ++it) {
-                       if (it->second == val) {
-                               cui->combo->set_active_text(it->first);
-                               break;
-                       }
-               }
-       } else if (cui->adjustment == 0) {
-
-               if (val > 0.5) {
-                       cui->button->set_active (true);
-               } else {
-                       cui->button->set_active (false);
-               }
-
-       } else {
-               if (cui->logarithmic) {
-                       val = log(val);
-               }
-               if (val != cui->adjustment->get_value()) {
-                       cui->adjustment->set_value (val);
-               }
-       }
-       cui->ignore_change--;
-}
-
-void
-LadspaPluginUI::control_port_toggled (ControlUI* cui)
-{
-       if (!cui->ignore_change) {
-               insert->set_parameter (cui->port_index, cui->button->get_active());
-       }
-}
-
-void
-LadspaPluginUI::control_combo_changed (ControlUI* cui)
-{
-       if (!cui->ignore_change) {
-               string value = cui->combo->get_active_text();
-               std::map<string,float> mapping = *cui->combo_map;
-               insert->set_parameter (cui->port_index, mapping[value]);
-       }
-
-}
-
 void
 PluginUIWindow::plugin_going_away (ARDOUR::Redirect* ignored)
 {
@@ -742,91 +126,6 @@ PluginUIWindow::plugin_going_away (ARDOUR::Redirect* ignored)
        delete_when_idle (this);
 }
 
-void
-LadspaPluginUI::redirect_active_changed (Redirect* r, void* src)
-{
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &LadspaPluginUI::redirect_active_changed), r, src));
-       
-       bypass_button.set_active (!r->active());
-}
-
-bool
-LadspaPluginUI::start_updating (GdkEventAny* ignored)
-{
-       if (output_controls.size() > 0 ) {
-               screen_update_connection.disconnect();
-               screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect 
-                       (mem_fun(*this, &LadspaPluginUI::output_update));
-       }
-       return false;
-}
-
-bool
-LadspaPluginUI::stop_updating (GdkEventAny* ignored)
-{
-       if (output_controls.size() > 0 ) {
-               screen_update_connection.disconnect();
-       }
-       return false;
-}
-
-void
-LadspaPluginUI::output_update ()
-{
-       for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
-               float val = plugin->get_parameter ((*i)->port_index);
-               char buf[32];
-               snprintf (buf, sizeof(buf), "%.2f", val);
-               (*i)->display_label->set_text (buf);
-
-               /* autoscaling for the meter */
-               if ((*i)->meterinfo && (*i)->meterinfo->packed) {
-                       
-                       if (val < (*i)->meterinfo->min) {
-                               if ((*i)->meterinfo->min_unbound)
-                                       (*i)->meterinfo->min = val;
-                               else
-                                       val = (*i)->meterinfo->min;
-                       }
-
-                       if (val > (*i)->meterinfo->max) {
-                               if ((*i)->meterinfo->max_unbound)
-                                       (*i)->meterinfo->max = val;
-                               else
-                                       val = (*i)->meterinfo->max;
-                       }
-                       
-                       if ((*i)->meterinfo->max > (*i)->meterinfo->min ) {
-                               float lval = (val - (*i)->meterinfo->min) / ((*i)->meterinfo->max - (*i)->meterinfo->min) ;
-                               (*i)->meterinfo->meter->set (lval );
-                       }
-               }
-       }
-}
-
-vector<string> 
-LadspaPluginUI::setup_scale_values(guint32 port_index, ControlUI* cui)
-{
-       vector<string> enums;
-       boost::shared_ptr<LadspaPlugin> lp = boost::dynamic_pointer_cast<LadspaPlugin> (plugin);
-
-       cui->combo_map = new std::map<string, float>;
-       lrdf_defaults* defaults = lrdf_get_scale_values(lp->unique_id(), port_index);
-       if (defaults)   {
-               for (uint32_t i = 0; i < defaults->count; ++i) {
-                       enums.push_back(defaults->items[i].label);
-                       pair<string, float> newpair;
-                       newpair.first = defaults->items[i].label;
-                       newpair.second = defaults->items[i].value;
-                       cui->combo_map->insert(newpair);
-               }
-
-               lrdf_free_setting_values(defaults);
-       }
-
-       return enums;
-}
-
 PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
        : insert (pi),
          plugin (insert->plugin()),
@@ -893,4 +192,3 @@ PlugUIBase::bypass_toggled ()
                insert->set_active (!x, this);
        }
 }
-
index dc1e61887b2f3c76fcd9401bbc08b83e459a4e5d..5b1fd89178972c36546f7c22de2803d96b1a7208 100644 (file)
@@ -209,7 +209,6 @@ class PluginUIWindow : public ArdourDialog
        void plugin_going_away (ARDOUR::Redirect*);
 };
 
-
 #ifdef VST_SUPPORT
 class VSTPluginUI : public PlugUIBase, public Gtk::VBox
 {
@@ -235,16 +234,12 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
 #endif // VST_SUPPORT
 
 #ifdef HAVE_COREAUDIO
-class AUPluginUI : public PlugUIBase
+class AUPluginUI
 {
   public:
-       AUPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::AUPlugin>);
+       AUPluginUI (ARDOUR::AudioEngine&, boost::shared_ptr<ARDOUR::PluginInsert>);
        ~AUPluginUI ();
        
-       gint get_preferred_height ();
-       bool start_updating(GdkEventAny*) {return false;}
-       bool stop_updating(GdkEventAny*) {return false;}
-
   private:
        boost::shared_ptr<ARDOUR::AUPlugin> au;
 };
index 74198265d9e82cb34b9707e7cb061a500b237e81..ddb9e85ca2f2439ae98401856d75299ec5235bcc 100644 (file)
@@ -957,44 +957,61 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
                
                if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (insert)) != 0) {
                        
-                       PluginUIWindow *plugin_ui;
+                       ARDOUR::PluginType type = plugin_insert->type();
+
+                       if (type == ARDOUR::LADSPA || type == ARDOUR::VST) {
+                               PluginUIWindow *plugin_ui;
                        
-                       if (plugin_insert->get_gui() == 0) {
+                               if (plugin_insert->get_gui() == 0) {
                                
-                               string title;
-                               string maker = plugin_insert->plugin()->maker();
-                               string::size_type email_pos;
+                                       string title;
+                                       string maker = plugin_insert->plugin()->maker();
+                                       string::size_type email_pos;
                                
-                               if ((email_pos = maker.find_first_of ('<')) != string::npos) {
-                                       maker = maker.substr (0, email_pos - 1);
-                               }
+                                       if ((email_pos = maker.find_first_of ('<')) != string::npos) {
+                                               maker = maker.substr (0, email_pos - 1);
+                                       }
                                
-                               if (maker.length() > 32) {
-                                       maker = maker.substr (0, 32);
-                                       maker += " ...";
-                               }
+                                       if (maker.length() > 32) {
+                                               maker = maker.substr (0, 32);
+                                               maker += " ...";
+                                       }
 
-                               title = string_compose(_("ardour: %1: %2 (by %3)"), _route->name(), plugin_insert->name(), maker);      
+                                       title = string_compose(_("ardour: %1: %2 (by %3)"), _route->name(), plugin_insert->name(), maker);      
+                               
+                                       plugin_ui = new PluginUIWindow (_session.engine(), plugin_insert);
+                                       if (_owner_is_mixer) {
+                                               ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui);
+                                       } else {
+                                               ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui);
+                                       }
+                                       plugin_ui->set_title (title);
+                                       plugin_insert->set_gui (plugin_ui);
                                
-                               plugin_ui = new PluginUIWindow (_session.engine(), plugin_insert);
-                               if (_owner_is_mixer) {
-                                       ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui);
                                } else {
-                                       ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui);
+                                       plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
                                }
-                               plugin_ui->set_title (title);
-                               plugin_insert->set_gui (plugin_ui);
-                               
-                       } else {
-                               plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
-                       }
                        
-                       if (plugin_ui->is_visible()) {
-                               plugin_ui->get_window()->raise ();
+                               if (plugin_ui->is_visible()) {
+                                       plugin_ui->get_window()->raise ();
+                               } else {
+                                       plugin_ui->show_all ();
+                               }
+#ifdef HAVE_COREAUDIO
+                       } else if (type == ARDOUR::AudioUnit) {
+                               AUPluginUI* plugin_ui;
+                               if (plugin_insert->get_gui() == 0) {
+                                       plugin_ui = new AUPluginUI (_session.engine(), plugin_insert);
+                               } else {
+                                       plugin_ui = reinterpret_cast<AUPluginUI*> (plugin_insert->get_gui());
+                               }
+                               
+                               // raise window, somehow
+#endif                         
                        } else {
-                               plugin_ui->show_all ();
+                               warning << "Unsupported plugin sent to RedirectBox::edit_redirect()" << endmsg;
+                               return;
                        }
-                       
                } else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (insert)) != 0) {
                        
                        if (!_session.engine().connected()) {
index 1c8d6cbc2dfa6d7d1617d2bca73dbbde10184819..348a8ff86313fdba0163e798357575352187485d 100644 (file)
@@ -96,6 +96,8 @@ class AUPlugin : public ARDOUR::Plugin
        std::vector<std::pair<uint32_t, uint32_t> > parameter_map;
 };
 
+typedef boost::shared_ptr<AUPlugin> AUPluginPtr;
+
 class AUPluginInfo : public PluginInfo {
   public:      
        AUPluginInfo () { };
index a4c4439942ab0b32894331c755510104aab8c32b..c81d4e576190533133487167963f31cf79defd1b 100644 (file)
@@ -29,6 +29,7 @@
 #include <ardour/ardour.h>
 #include <ardour/redirect.h>
 #include <ardour/plugin_state.h>
+#include <ardour/types.h>
 
 class XMLNode;
 
@@ -39,8 +40,8 @@ namespace MIDI {
 namespace ARDOUR {
 
 class Session;
-class Plugin;
 class Route;
+class Plugin;
 
 class Insert : public Redirect
 {
@@ -149,6 +150,8 @@ class PluginInsert : public Insert
                }
        }
 
+       PluginType type ();
+
        string describe_parameter (uint32_t);
 
        jack_nframes_t latency();
index 6b11a975ca358993e0f196cdb52dde559aab59ca..e5a81f1ef9c01d06ae194fde77495c46bf971505 100644 (file)
@@ -47,27 +47,22 @@ class AudioEngine;
 class Session;
 
 class Plugin;
+
 typedef boost::shared_ptr<Plugin> PluginPtr;
 
 class PluginInfo {
   public:
-       enum Type {
-               AudioUnit,
-               LADSPA,
-               VST
-       };
-
        PluginInfo () { }
        PluginInfo (const PluginInfo &o)
                : name(o.name), n_inputs(o.n_inputs), n_outputs(o.n_outputs),
                unique_id(o.unique_id), path (o.path), index(o.index) {}
        virtual ~PluginInfo () { }
-       
+
        string name;
        string category;
        uint32_t n_inputs;
        uint32_t n_outputs;
-       Type type;
+       ARDOUR::PluginType type;
 
        long unique_id;
 
@@ -187,7 +182,7 @@ class Plugin : public Stateful, public sigc::trackable
        vector<PortControllable*> controls;
 };
 
-PluginPtr find_plugin(ARDOUR::Session&, string name, long unique_id, PluginInfo::Type);
+PluginPtr find_plugin(ARDOUR::Session&, string name, long unique_id, ARDOUR::PluginType);
 
 } // namespace ARDOUR
  
index b2230f12d7ba4c78a56965c746fad708e126d9cc..0a3a7b731c46c3c31fe48ad6e5fe753f14225ace 100644 (file)
@@ -243,7 +243,14 @@ namespace ARDOUR {
            PeakDatum min;
            PeakDatum max;
        };
-}
+       
+       enum PluginType {
+               AudioUnit,
+               LADSPA,
+               VST
+       };
+       
+} // namespace ARDOUR
 
 std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::HeaderFormat& sf);
@@ -254,7 +261,6 @@ session_frame_to_track_frame (jack_nframes_t session_frame, double speed)
        return (jack_nframes_t)( (double)session_frame * speed );
 }
 
-
 static inline jack_nframes_t
 track_frame_to_session_frame (jack_nframes_t track_frame, double speed)
 {
index 5253da7b0a0ad6ca2113327d5f959af6cf70f073..4fb5b0babbaff493390c485e17bcb36b9bf2aad0 100644 (file)
@@ -113,6 +113,8 @@ class VSTPluginInfo : public PluginInfo
        PluginPtr load (Session& session);
 };
 
+typedef boost::shared_ptr<VSTPluginInfo> VSTPluginInfoPtr;
+
 } // namespace ARDOUR
 
 #endif /* __ardour_vst_plugin_h__ */
index 25c8aeb53bd2d89c99e603214478f36f4ddcfa96..0a31df40ee7c207ce7456d3b3a4253ae5339f988 100644 (file)
@@ -322,7 +322,7 @@ AUPluginInfo::discover ()
                
                AUPluginInfoPtr plug(new AUPluginInfo);
                plug->name = AUPluginInfo::get_name (temp);
-               plug->type = PluginInfo::AudioUnit;
+               plug->type = ARDOUR::AudioUnit;
                plug->n_inputs = 0;
                plug->n_outputs = 0;
                plug->category = "AudioUnit";
index a057fef931708e23b733c7e73eaf5ca1e9805dbe..18727e8b5b952f3eb6db61eb62c5af7c93e73c97 100644 (file)
 #include <ardour/port.h>
 #include <ardour/route.h>
 #include <ardour/ladspa_plugin.h>
+
+#ifdef VST_SUPPORT
 #include <ardour/vst_plugin.h>
+#endif
+
+#ifdef HAVE_COREAUDIO
+#include <ardour/audio_unit.h>
+#endif
+
 #include <ardour/audioengine.h>
 #include <ardour/session.h>
+#include <ardour/types.h>
 
 #include "i18n.h"
 
@@ -45,7 +54,6 @@ Insert::Insert(Session& s, Placement p)
 {
 }
 
-
 Insert::Insert(Session& s, Placement p, int imin, int imax, int omin, int omax)
        : Redirect (s, s.next_insert_name(), p, imin, imax, omin, omax)
 {
@@ -505,12 +513,19 @@ PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
 #ifdef VST_SUPPORT
        boost::shared_ptr<VSTPlugin> vp;
 #endif
+#ifdef HAVE_COREAUDIO
+       boost::shared_ptr<AUPlugin> ap;
+#endif
 
        if ((lp = boost::dynamic_pointer_cast<LadspaPlugin> (other)) != 0) {
                return boost::shared_ptr<Plugin> (new LadspaPlugin (*lp));
 #ifdef VST_SUPPORT
        } else if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (other)) != 0) {
                return boost::shared_ptr<Plugin> (new VSTPlugin (*vp));
+#endif
+#ifdef HAVE_COREAUDIO
+       } else if ((ap = boost::dynamic_pointer_cast<AUPlugin> (other)) != 0) {
+               return boost::shared_ptr<Plugin> (new AUPlugin (*ap));
 #endif
        }
 
@@ -630,7 +645,7 @@ PluginInsert::set_state(const XMLNode& node)
        XMLPropertyList plist;
        const XMLProperty *prop;
        long unique = 0;
-       PluginInfo::Type type;
+       ARDOUR::PluginType type;
 
        if ((prop = node.property ("type")) == 0) {
                error << _("XML node describing insert is missing the `type' field") << endmsg;
@@ -638,9 +653,9 @@ PluginInsert::set_state(const XMLNode& node)
        }
 
        if (prop->value() == X_("ladspa") || prop->value() == X_("Ladspa")) { /* handle old school sessions */
-               type = PluginInfo::LADSPA;
+               type = ARDOUR::LADSPA;
        } else if (prop->value() == X_("vst")) {
-               type = PluginInfo::VST;
+               type = ARDOUR::VST;
        } else {
                error << string_compose (_("unknown plugin type %1 in plugin insert state"),
                                  prop->value())
@@ -807,6 +822,35 @@ PluginInsert::state_factory (std::string why) const
        return state;
 }
 
+ARDOUR::PluginType
+PluginInsert::type ()
+{
+       boost::shared_ptr<LadspaPlugin> lp;
+#ifdef VST_SUPPORT
+       boost::shared_ptr<VSTPlugin> vp;
+#endif
+#ifdef HAVE_COREAUDIO
+       boost::shared_ptr<AUPlugin> ap;
+#endif
+       
+       PluginPtr other = plugin ();
+
+       if ((lp = boost::dynamic_pointer_cast<LadspaPlugin> (other)) != 0) {
+               return ARDOUR::LADSPA;
+#ifdef VST_SUPPORT
+       } else if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (other)) != 0) {
+               return ARDOUR::VST;
+#endif
+#ifdef HAVE_COREAUDIO
+       } else if ((ap = boost::dynamic_pointer_cast<AUPlugin> (other)) != 0) {
+               return ARDOUR::AudioUnit;
+#endif
+       } else {
+               /* NOT REACHED */
+               return (ARDOUR::PluginType) 0;
+       }
+}
+
 /***************************************************************
  Port inserts: send output to a port, pick up input at a port
  ***************************************************************/
index 8ea95b89037db9333fdd1713fe32d667fc67ff1e..bedc32a0b359f53e951ef1f344458fea05b05b71 100644 (file)
@@ -244,25 +244,25 @@ Plugin::save_preset (string name, string domain)
 }
 
 PluginPtr
-ARDOUR::find_plugin(Session& session, string name, long unique_id, PluginInfo::Type type)
+ARDOUR::find_plugin(Session& session, string name, long unique_id, PluginType type)
 {
        PluginManager *mgr = PluginManager::the_manager();
        PluginInfoList plugs;
 
        switch (type) {
-       case PluginInfo::LADSPA:
+       case ARDOUR::LADSPA:
                plugs = mgr->ladspa_plugin_info();
                break;
 
 #ifdef VST_SUPPORT
-       case PluginInfo::VST:
+       case ARDOUR::VST:
                plugs = mgr->vst_plugin_info();
                unique_id = 0; // VST plugins don't have a unique id.
                break;
 #endif
 
 #ifdef HAVE_COREAUDIO
-       case PluginInfo::AudioUnit:
+       case ARDOUR::AudioUnit:
                plugs = AUPluginInfo::discover ();
                unique_id = 0; // Neither do AU.
                break;
index 2a753617e88967b8ae87bb9c5f9857c1af2c1187..5b3a4658a80fd55e2658038ad0acda9c3b06ab78 100644 (file)
@@ -254,7 +254,7 @@ PluginManager::ladspa_discover (string path)
                info->index = i;
                info->n_inputs = 0;
                info->n_outputs = 0;
-               info->type = PluginInfo::LADSPA;
+               info->type = ARDOUR::LADSPA;
                info->unique_id = descriptor->UniqueID;
                
                for (uint32_t n=0; n < descriptor->PortCount; ++n) {
@@ -397,7 +397,7 @@ PluginManager::vst_discover (string path)
        info->index = 0;
        info->n_inputs = finfo->numInputs;
        info->n_outputs = finfo->numOutputs;
-       info->type = PluginInfo::VST;
+       info->type = ARDOUR::VST;
        
        _vst_plugin_info.push_back (info);
        fst_free_info (finfo);