do not push new state to backend from audio/MIDI setup until OK or Apply are clicked...

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 37c29f418788f4e351a47d4ca2f61f7b2b36b883..d438ff83270e5d2948ff53ed76564a63592fa1ec 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -87,7 +87,6 @@ EngineControl::EngineControl ()
        , midi_refresh_button (_("Refresh list"))
        , ignore_changes (0)
        , _desired_sample_rate (0)
-       , no_push (true)
        , started_at_least_once (false)
 {
        using namespace Notebook_Helpers;
@@ -290,8 +289,6 @@ EngineControl::EngineControl ()
        output_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
 
        notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page));
-
-       no_push = false;
  }
 
  void
@@ -874,10 +871,6 @@ EngineControl::EngineControl ()
         /* pick up any saved state for this device */
 
         maybe_display_saved_state ();
-
-        /* and push it to the backend */
-
-        push_state_to_backend (false);
  }     
 
  string
@@ -1207,14 +1200,9 @@ EngineControl::EngineControl ()
         }
  }
 
-
  int
  EngineControl::push_state_to_backend (bool start)
  {
-        if (no_push) {
-                return 0;
-        }
-
         boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
 
         if (!backend) {

diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index 31648b6dbbbcd7b2740f1270e2012e4b36b3c3a9..6d10eb76ac7b7264d7b62009770ddb034e77338b 100644 (file)
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -114,7 +114,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     
     uint32_t ignore_changes;
     uint32_t _desired_sample_rate;
-    bool     no_push;
     bool     started_at_least_once;
 
     void driver_changed ();