do not push new state to backend from audio/MIDI setup until OK or Apply are clicked (i.e. do not do this when device is changed)

This commit is contained in:
Paul Davis 2013-11-27 17:41:22 -05:00
parent 611d93830a
commit 4c0a274b43
2 changed files with 0 additions and 13 deletions

View file

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

View file

@ -114,7 +114,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
uint32_t ignore_changes; uint32_t ignore_changes;
uint32_t _desired_sample_rate; uint32_t _desired_sample_rate;
bool no_push;
bool started_at_least_once; bool started_at_least_once;
void driver_changed (); void driver_changed ();