Remove Apply button from Audio Setup dialog now that there is a start/stop button

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index d0912b0091f8e3fd85ed763156e6d3430d4afd3b..869c2afc6fe6b7c2ec6d0b02022d2d2c6993cc98 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -275,7 +275,6 @@ EngineControl::EngineControl ()
        start_stop_button.set_can_focus(true);
 
        cancel_button = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_CANCEL);
-       apply_button = add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY);
        ok_button = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
 
        /* Pick up any existing audio setup configuration, if appropriate */
@@ -408,9 +407,6 @@ EngineControl::on_response (int response_id)
        ArdourDialog::on_response (response_id);
 
        switch (response_id) {
-               case RESPONSE_APPLY:
-                       push_state_to_backend (true);
-                       break;
                case RESPONSE_OK:
 #ifdef PLATFORM_WINDOWS
                        // For some reason we don't understand, 'hide()'
@@ -738,7 +734,6 @@ EngineControl::update_sensitivity ()
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        if (!backend) {
                ok_button->set_sensitive (false);
-               apply_button->set_sensitive (false);
                start_stop_button.set_sensitive (false);
                return;
        }
@@ -833,10 +828,8 @@ EngineControl::update_sensitivity ()
 
        if (valid || !_have_control) {
                ok_button->set_sensitive (true);
-               apply_button->set_sensitive (true);
        } else {
                ok_button->set_sensitive (false);
-               apply_button->set_sensitive (false);
        }
 }
 
@@ -2502,7 +2495,6 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
        } else {
                cancel_button->set_sensitive (false);
                ok_button->set_sensitive (false);
-               apply_button->set_sensitive (false);
        }
 
        if (page_num == midi_tab) {

diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index 0e44d3585c7296a3a279c624c75e7b8457b20b9a..421228ea1ac4a5e907e6a8748d452cf3b14d0df7 100644 (file)
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -107,7 +107,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 
     Gtk::Button* cancel_button;
     Gtk::Button* ok_button;
-    Gtk::Button* apply_button;
 
     /* MIDI Tab */