Uploaded start of CoreAudioSource. More sfdb work.

[ardour.git] / gtk2_ardour / plugin_ui.cc

diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index d155db57c608900e24a007a226f692ad810f71dd..958654dab5de976a218f7eb7cedf4812a3e93633 100644 (file)
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -75,7 +75,7 @@ PluginUIWindow::PluginUIWindow (AudioEngine &engine, PluginInsert& insert, bool
                        VSTPluginUI* vpu = new VSTPluginUI (insert, *vp);
                        
                        _pluginui = vpu;
-                       add (*vpu);
+                       get_vbox()->add (*vpu);
                        vpu->package (*this);
                        
                } else {
@@ -92,7 +92,7 @@ PluginUIWindow::PluginUIWindow (AudioEngine &engine, PluginInsert& insert, bool
                PluginUI*  pu  = new PluginUI (engine, insert, scrollable);
                
                _pluginui = pu;
-               add (*pu);
+               get_vbox()->add (*pu);
                
                signal_map_event().connect (mem_fun (*pu, &PluginUI::start_updating));
                signal_unmap_event().connect (mem_fun (*pu, &PluginUI::stop_updating));
@@ -233,9 +233,6 @@ PluginUI::build (AudioEngine &engine)
        frame->add (*box);
        hpacker.pack_start(*frame, true, true);
 
-       box->set_border_width (5);
-       box->set_spacing (1);
-       
        /* find all ports. build control elements for all appropriate control ports */
 
        for (i = 0; i < plugin.parameter_count(); ++i) {
@@ -553,9 +550,6 @@ PluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, MIDI::Contr
                        control_ui->control->set_style (BarController::LeftToRight);
                        control_ui->control->set_use_parent (true);
 
-                       control_ui->control->get_spin_button().signal_focus_in_event().connect (mem_fun(*this, &PluginUI::entry_focus_event));
-                       control_ui->control->get_spin_button().signal_focus_out_event().connect (mem_fun(*this, &PluginUI::entry_focus_event));
-
                        control_ui->control->StartGesture.connect (bind (mem_fun(*this, &PluginUI::start_touch), control_ui));
                        control_ui->control->StopGesture.connect (bind (mem_fun(*this, &PluginUI::stop_touch), control_ui));
                        
@@ -749,8 +743,8 @@ PluginUI::control_port_toggled (ControlUI* cui)
        }
 }
 
-bool
-PluginUI::control_combo_changed (GdkEventAny* ignored, ControlUI* cui)
+void
+PluginUI::control_combo_changed (ControlUI* cui)
 {
        if (!cui->ignore_change) {
                string value = cui->combo->get_active_text();
@@ -758,7 +752,6 @@ PluginUI::control_combo_changed (GdkEventAny* ignored, ControlUI* cui)
                insert.set_parameter (cui->port_index, mapping[value]);
        }
 
-       return FALSE;
 }
 
 void
@@ -766,21 +759,10 @@ PluginUIWindow::plugin_going_away (ARDOUR::Redirect* ignored)
 {
        ENSURE_GUI_THREAD(bind (mem_fun(*this, &PluginUIWindow::plugin_going_away), ignored));
        
-       _pluginui->stop_updating();
+       _pluginui->stop_updating(0);
        delete_when_idle (this);
 }
 
-gint
-PluginUI::entry_focus_event (GdkEventFocus* ev)
-{
-       if (ev->in) {
-               ARDOUR_UI::instance()->allow_focus (true);
-       } else {
-               ARDOUR_UI::instance()->allow_focus (false);
-       }
-       return TRUE;
-}
-
 void
 PluginUI::redirect_active_changed (Redirect* r, void* src)
 {
@@ -789,22 +771,24 @@ PluginUI::redirect_active_changed (Redirect* r, void* src)
        bypass_button.set_active (!r->active());
 }
 
-void
-PluginUI::start_updating ()
+bool
+PluginUI::start_updating (GdkEventAny* ignored)
 {
        if (output_controls.size() > 0 ) {
                screen_update_connection.disconnect();
                screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect 
                        (mem_fun(*this, &PluginUI::output_update));
        }
+       return false;
 }
 
-void
-PluginUI::stop_updating ()
+bool
+PluginUI::stop_updating (GdkEventAny* ignored)
 {
        if (output_controls.size() > 0 ) {
                screen_update_connection.disconnect();
        }
+       return false;
 }
 
 void
@@ -882,8 +866,8 @@ PlugUIBase::PlugUIBase (PluginInsert& pi)
        bypass_button.signal_toggled().connect (mem_fun(*this, &PlugUIBase::bypass_toggled));
 }
 
-gint
-PlugUIBase::setting_selected(GdkEventAny* ignored)
+void
+PlugUIBase::setting_selected()
 {
        if (combo.get_active_text().length() > 0) {
                if (!plugin.load_preset(combo.get_active_text())) {
@@ -891,7 +875,6 @@ PlugUIBase::setting_selected(GdkEventAny* ignored)
                }
        }
 
-       return FALSE;
 }
 
 void
@@ -903,7 +886,7 @@ PlugUIBase::save_plugin_setting ()
        prompter.show_all();
 
        switch (prompter.run ()) {
-       case GTK_RESPONSE_ACCEPT:
+       case Gtk::RESPONSE_ACCEPT:
 
                string name;