fix pathscanner / stl_vector related memory leaks

[ardour.git] / gtk2_ardour / engine_dialog.cc

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index b2a60dca910b5dd12b7858e07c69a534ad7c7da8..41b48b911c0c410f8b46114736a80d0ed2ad0e0c 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -258,6 +258,7 @@ EngineControl::EngineControl ()
        midi_devices_button.signal_clicked.connect (mem_fun (*this, &EngineControl::configure_midi_devices));
        midi_devices_button.set_sensitive (false);
        midi_devices_button.set_name ("generic button");
+       midi_devices_button.set_can_focus(true);
 
        control_app_button.signal_clicked().connect (mem_fun (*this, &EngineControl::control_app_button_clicked));
        manage_control_app_sensitivity ();
@@ -274,7 +275,11 @@ EngineControl::EngineControl ()
        ARDOUR::AudioEngine::instance()->Stopped.connect (stopped_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::engine_stopped, this), gui_context());
        ARDOUR::AudioEngine::instance()->Halted.connect (stopped_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::engine_stopped, this), gui_context());
 
-       backend_changed ();
+       {
+               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
+               backend_changed ();
+       }
+       maybe_display_saved_state();
 
        /* Connect to signals */
 
@@ -343,6 +348,7 @@ EngineControl::build_notebook ()
 
        lm_button_audio.signal_clicked.connect (sigc::mem_fun (*this, &EngineControl::calibrate_audio_latency));
        lm_button_audio.set_name ("generic button");
+       lm_button_audio.set_can_focus(true);
 
        if (_have_control) {
                build_full_control_notebook ();
@@ -587,19 +593,15 @@ EngineControl::midi_latency_adjustment_changed (Gtk::Adjustment *a, MidiDeviceSe
        }
 }
 
-bool
-EngineControl::midi_device_enabled_toggled (GdkEventButton* ev, ArdourButton *b, MidiDeviceSettings device) {
-       if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS) {
-               return true;
-       }
+void
+EngineControl::midi_device_enabled_toggled (ArdourButton *b, MidiDeviceSettings device) {
        b->set_active (!b->get_active());
        device->enabled = b->get_active();
-       refresh_midi_display();
-       return true;
+       refresh_midi_display(device->name);
 }
 
 void
-EngineControl::refresh_midi_display ()
+EngineControl::refresh_midi_display (std::string focus)
 {
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        assert (backend);
@@ -639,10 +641,14 @@ EngineControl::refresh_midi_display ()
 
                m = manage (new ArdourButton ((*p)->name, ArdourButton::led_default_elements));
                m->set_name ("midi device");
+               m->set_can_focus (Gtk::CAN_FOCUS);
                m->add_events (Gdk::BUTTON_RELEASE_MASK);
                m->set_active (enabled);
-               m->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::midi_device_enabled_toggled), m, *p));
+               m->signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::midi_device_enabled_toggled), m, *p));
                midi_device_table.attach (*m, 0, 1, row, row + 1, xopt, AttachOptions (0)); m->show ();
+               if ((*p)->name == focus) {
+                       m->grab_focus();
+               }
 
                a = manage (new Gtk::Adjustment (0, 0, 99999, 1));
                s = manage (new Gtk::SpinButton (*a));
@@ -796,8 +802,13 @@ EngineControl::list_devices ()
                output_latency.set_sensitive (false);
                input_channels.set_sensitive (false);
                output_channels.set_sensitive (false);
-               ok_button->set_sensitive (false);
-               apply_button->set_sensitive (false);
+               if (_have_control) {
+                       ok_button->set_sensitive (false);
+                       apply_button->set_sensitive (false);
+               } else {
+                       ok_button->set_sensitive (true);
+                       apply_button->set_sensitive (true);
+               }
        }
 }