Make VST preset files pre-preset rather than global. Clean up VST preset handling...

[ardour.git] / gtk2_ardour / vst_pluginui.cc

diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc
index 134ae6f2c1c3196a2e9a745b502bb9ef0cdaffd2..8de5ebe63b48cf5e9244c2120d79c2b2267bd0ee 100644 (file)
--- a/gtk2_ardour/vst_pluginui.cc
+++ b/gtk2_ardour/vst_pluginui.cc
@@ -35,13 +35,6 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<
        : PlugUIBase (pi),
          vst (vp)
 {
-       preset_model = ListStore::create (preset_columns);
-
-       CellRenderer* renderer = manage (new CellRendererText());
-       vst_preset_combo.pack_start (*renderer, true);
-       vst_preset_combo.add_attribute (*renderer, "text", 0);
-       vst_preset_combo.set_model (preset_model);
-
        update_presets ();
 
        fst_run_editor (vst->fst());
@@ -49,12 +42,10 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<
        preset_box.set_spacing (6);
        preset_box.set_border_width (6);
        preset_box.pack_end (bypass_button, false, false, 10);
-       preset_box.pack_end (edit_button, false, false);
+       preset_box.pack_end (delete_button, false, false);
        preset_box.pack_end (save_button, false, false);
        preset_box.pack_end (add_button, false, false);
-       preset_box.pack_end (vst_preset_combo, false, false);
-
-       vst_preset_combo.signal_changed().connect (sigc::mem_fun (*this, &VSTPluginUI::preset_chosen));
+       preset_box.pack_end (preset_combo, false, false);
 
        bypass_button.set_active (!insert->active());
 
@@ -70,9 +61,9 @@ VSTPluginUI::~VSTPluginUI ()
 }
 
 void
-VSTPluginUI::preset_chosen ()
+VSTPluginUI::setting_selected ()
 {
-       int const r = vst_preset_combo.get_active_row_number ();
+       int const r = preset_combo.get_active_row_number ();
 
        if (r < vst->first_user_preset_index()) {
                /* This is a plugin-provided preset.
@@ -81,11 +72,11 @@ VSTPluginUI::preset_chosen ()
                vst->fst()->want_program = r;
        } else {
                /* This is a user preset.  This method knows about the direct dispatch restriction, too */
-               TreeModel::iterator i = vst_preset_combo.get_active ();
-               plugin->load_preset ((*i)[preset_columns.name]);
+               plugin->load_preset (preset_combo.get_active_text());
        }
        
        socket.grab_focus ();
+       update_sensitivity ();
 }
 
 int
@@ -157,31 +148,6 @@ VSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket)
        return false;
 }
 
-void
-VSTPluginUI::update_presets ()
-{
-       std::vector<Plugin::PresetRecord> presets = plugin->get_presets ();
-
-       preset_model->clear ();
-
-       int j = 0;
-       for (std::vector<Plugin::PresetRecord>::const_iterator i = presets.begin(); i != presets.end(); ++i) {
-               TreeModel::Row row = *(preset_model->append ());
-               row[preset_columns.name] = i->label;
-               row[preset_columns.number] = j++;
-       }
-
-       if (presets.size() > 0) {
-               vst->fst()->plugin->dispatcher (vst->fst()->plugin, effSetProgram, 0, 0, NULL, 0);
-       }
-
-       if (vst->fst()->current_program != -1) {
-               vst_preset_combo.set_active (vst->fst()->current_program);
-       } else {
-               vst_preset_combo.set_active (0);
-       }
-}
-
 typedef int (*error_handler_t)( Display *, XErrorEvent *);
 static Display *the_gtk_display;
 static error_handler_t wine_error_handler;