ardour/livetrax
13
0
Fork 0
Code

engine-dialog: properly restore previous active state

Browse Source
This commit is contained in:
Robin Gareus 2014-06-19 19:42:46 +02:00
parent bc67e47048
commit 07759bbbf2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/engine_dialog.cc
View File

@ -273,11 +273,15 @@ EngineControl::EngineControl ()
ARDOUR::AudioEngine::instance()->Stopped.connect (stopped_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::engine_stopped, this), gui_context()); 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()); ARDOUR::AudioEngine::instance()->Halted.connect (stopped_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::engine_stopped, this), gui_context());
if (audio_setup)
{ {
set_state (*audio_setup);
}
{
/* ignore: don't save state */
PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1); PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
backend_changed (); backend_changed ();
} }
maybe_display_saved_state();
/* Connect to signals */ /* Connect to signals */
@ -292,10 +296,6 @@ EngineControl::EngineControl ()
input_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed)); input_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
output_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed)); output_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
if (audio_setup) {
set_state (*audio_setup);
}
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));
} }