diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-10 15:41:19 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-10 15:41:19 -0400 |
| commit | 209e4bdcaed8e0f7d66fa5673f9049948e1f1d53 (patch) | |
| tree | bdf1ffca2a5f1f20ac652e6803a77cfcf8278363 /gtk2_ardour/ardour_ui.cc | |
| parent | a6815efb86e5091ce82f66ddfb60b2b2cffc587a (diff) | |
many changes relating to session construction and audioengine interaction
every session member is now initialized using C++ constructor syntax
session construction reordered to clarify the split(s) between work
where the engine is not relevant and work where is it is. this
split is still not 100% obvious, but is enormously clearer than
previously.
if engine/backend are not running as session is created, and the SR
of the sample rate is known, attempt to force backend to that value.
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index d6c6863b14..4992e0a14b 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -268,7 +268,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) /* handle Audio/MIDI setup when session requires it */ - ARDOUR::Session::AudioEngineSetupRequired.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::do_audio_midi_setup, this)); + ARDOUR::Session::AudioEngineSetupRequired.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::do_audio_midi_setup, this, _1)); /* handle sr mismatch with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */ @@ -4159,10 +4159,12 @@ ARDOUR_UI::launch_audio_midi_setup () } int -ARDOUR_UI::do_audio_midi_setup () +ARDOUR_UI::do_audio_midi_setup (uint32_t desired_sample_rate) { launch_audio_midi_setup (); + _audio_midi_setup->set_desired_sample_rate (desired_sample_rate); + int r = _audio_midi_setup->run (); switch (r) { |