merge fix for tempo branch
[ardour.git] / gtk2_ardour / engine_dialog.cc
index a78b85e7194f528651a297e4b29ccab3a6d2d404..7a9431a54439ad35f1c7c4248d327b6fa819544f 100644 (file)
@@ -48,6 +48,7 @@
 #include "pbd/convert.h"
 #include "pbd/error.h"
 
+#include "opts.h"
 #include "ardour_ui.h"
 #include "engine_dialog.h"
 #include "gui_thread.h"
@@ -93,9 +94,10 @@ EngineControl::EngineControl ()
        , ignore_changes (0)
        , _desired_sample_rate (0)
        , started_at_least_once (false)
+       , queue_device_changed (false)
 {
        using namespace Notebook_Helpers;
-       vector<string> strings;
+       vector<string> backend_names;
        Label* label;
        AttachOptions xopt = AttachOptions (FILL|EXPAND);
        int row;
@@ -113,10 +115,10 @@ EngineControl::EngineControl ()
        }
 
        for (vector<const ARDOUR::AudioBackendInfo*>::const_iterator b = backends.begin(); b != backends.end(); ++b) {
-               strings.push_back ((*b)->name);
+               backend_names.push_back ((*b)->name);
        }
 
-       set_popdown_strings (backend_combo, strings);
+       set_popdown_strings (backend_combo, backend_names);
        backend_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::backend_changed));
 
        /* setup basic packing characteristics for the table used on the main
@@ -277,19 +279,28 @@ EngineControl::EngineControl ()
        ARDOUR::AudioEngine::instance()->Running.connect (running_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::engine_running, 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()->DeviceListChanged.connect (devicelist_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::device_list_changed, this), gui_context());
 
        if (audio_setup) {
                set_state (*audio_setup);
-       } else {
-               backend_combo.set_active_text (strings.front());
        }
 
-       {
+       if (backend_combo.get_active_text().empty()) {
+               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
+               backend_combo.set_active_text (backend_names.front());
+       }
+
+       backend_changed ();
+
+       /* in case the setting the backend failed, e.g. stale config, from set_state(), try again */
+       if (0 == ARDOUR::AudioEngine::instance()->current_backend()) {
+               backend_combo.set_active_text (backend_names.back());
                /* ignore: don't save state */
                PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
                backend_changed ();
        }
 
+
        /* Connect to signals */
 
        driver_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::driver_changed));
@@ -314,6 +325,10 @@ void
 EngineControl::on_show ()
 {
        ArdourDialog::on_show ();
+       if (!ARDOUR::AudioEngine::instance()->current_backend() || !ARDOUR::AudioEngine::instance()->running()) {
+               // re-check _have_control (jackd running) see #6041
+               backend_changed ();
+       }
        device_changed ();
        ok_button->grab_focus();
 }
@@ -328,9 +343,28 @@ EngineControl::on_response (int response_id)
                        push_state_to_backend (true);
                        break;
                case RESPONSE_OK:
+#ifdef PLATFORM_WINDOWS
+                       // For some reason we don't understand, 'hide()'
+                       // needs to get called first in Windows
+                       hide ();
+
+                       // But if there's no session open, this can produce
+                       // a long gap when nothing appears to be happening.
+                       // Let's show the splash image while we're waiting.
+                       if ( !ARDOUR_COMMAND_LINE::no_splash ) {
+                               if ( ARDOUR_UI::instance() ) {
+                                       if ( !ARDOUR_UI::instance()->session_loaded ) {
+                                               ARDOUR_UI::instance()->show_splash();
+                                       }
+                               }
+                       }
+                       push_state_to_backend (true);
+                       break;
+#else
                        push_state_to_backend (true);
                        hide ();
                        break;
+#endif
                case RESPONSE_DELETE_EVENT:
                        {
                                GdkEventButton ev;
@@ -480,7 +514,7 @@ EngineControl::build_full_control_notebook ()
        basic_packer.attach (lm_button_audio, 3, 4, row-1, row+1, xopt, xopt);
        ++row;
 
-       label = manage (left_aligned_label (_("MIDI System")));
+       label = manage (left_aligned_label (_("MIDI System:")));
        basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
        basic_packer.attach (midi_option_combo, 1, 2, row, row + 1, SHRINK, (AttachOptions) 0);
        basic_packer.attach (midi_devices_button, 3, 4, row, row+1, xopt, xopt);
@@ -709,6 +743,7 @@ EngineControl::backend_changed ()
 
        if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, "ardour", ""))) {
                /* eh? setting the backend failed... how ? */
+               /* A: stale config contains a backend that does not exist in current build */
                return;
        }
 
@@ -781,7 +816,6 @@ bool
 EngineControl::print_channel_count (Gtk::SpinButton* sb)
 {
        if (ARDOUR::Profile->get_mixbus()) {
-               cout << "Mixbus crash trap. sb->get_value(): " << sb->get_value();
                return true;
        }
        
@@ -906,6 +940,15 @@ EngineControl::device_changed ()
        assert (backend);
        string device_name = device_combo.get_active_text ();
        vector<string> s;
+
+       if (device_name != backend->device_name()) {
+               /* we set the backend-device to query various device related intormation.
+                * This has the side effect that backend->device_name() will match
+                * the device_name and  'change_device' will never be true.
+                * so work around this by setting...
+                */
+               queue_device_changed = true;
+       }
        
        //the device name must be set FIRST so ASIO can populate buffersizes and the control panel button
        backend->set_device_name(device_name);
@@ -991,7 +1034,7 @@ EngineControl::device_changed ()
                        if (0 == period) {
                                period = backend->default_buffer_size(device_name);
                        }
-                       buffer_size_combo.set_active_text (bufsize_as_string (period));
+                       set_active_text_if_present (buffer_size_combo, bufsize_as_string (period));
                        show_buffer_duration ();
                } else {
                        buffer_size_combo.set_sensitive (false);
@@ -1016,8 +1059,8 @@ EngineControl::bufsize_as_string (uint32_t sz)
        /* Translators: "samples" is always plural here, so no
           need for plural+singular forms.
         */
-       char buf[32];
-       snprintf (buf, sizeof (buf), _("%u samples"), sz);
+       char buf[64];
+       snprintf (buf, sizeof (buf), "%u %s", sz, P_("sample", "samples", sz));
        return buf;
 }
 
@@ -1029,9 +1072,6 @@ EngineControl::sample_rate_changed ()
         */
 
        show_buffer_duration ();
-       if (!ignore_changes) {
-               save_state ();
-       }
 
 }
 
@@ -1039,9 +1079,6 @@ void
 EngineControl::buffer_size_changed ()
 {
        show_buffer_duration ();
-       if (!ignore_changes) {
-               save_state ();
-       }
 }
 
 void
@@ -1115,18 +1152,11 @@ EngineControl::midi_option_changed ()
        } else {
                midi_devices_button.set_sensitive (true);
        }
-
-       if (!ignore_changes) {
-               save_state ();
-       }
 }
 
 void
 EngineControl::parameter_changed ()
 {
-       if (!ignore_changes) {
-               save_state ();
-       }
 }
 
 EngineControl::State
@@ -1225,7 +1255,7 @@ EngineControl::maybe_display_saved_state ()
                if (!_desired_sample_rate) {
                        sample_rate_combo.set_active_text (rate_as_string (state->sample_rate));
                }
-               buffer_size_combo.set_active_text (bufsize_as_string (state->buffer_size));
+               set_active_text_if_present (buffer_size_combo, bufsize_as_string (state->buffer_size));
                /* call this explicitly because we're ignoring changes to
                   the controls at this point.
                 */
@@ -1438,16 +1468,15 @@ EngineControl::set_state (const XMLNode& root)
        for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) {
 
                if ((*i)->active) {
-                       ignore_changes++;
+                       PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
                        backend_combo.set_active_text ((*i)->backend);
                        driver_combo.set_active_text ((*i)->driver);
                        device_combo.set_active_text ((*i)->device);
                        sample_rate_combo.set_active_text (rate_as_string ((*i)->sample_rate));
-                       buffer_size_combo.set_active_text (bufsize_as_string ((*i)->buffer_size));
+                       set_active_text_if_present (buffer_size_combo, bufsize_as_string ((*i)->buffer_size));
                        input_latency.set_value ((*i)->input_latency);
                        output_latency.set_value ((*i)->output_latency);
                        midi_option_combo.set_active_text ((*i)->midi_option);
-                       ignore_changes--;
                        break;
                }
        }
@@ -1489,7 +1518,7 @@ EngineControl::push_state_to_backend (bool start)
                                }
                        }
 
-                       if (get_device_name() != backend->device_name()) {
+                       if (queue_device_changed || get_device_name() != backend->device_name()) {
                                change_device = true;
                        }
 
@@ -1558,6 +1587,8 @@ EngineControl::push_state_to_backend (bool start)
                }
        }
 
+       queue_device_changed = false;
+
        if (!_have_control) {
 
                /* We do not have control over the backend, so the best we can
@@ -1716,6 +1747,8 @@ EngineControl::post_push ()
        if (!state) {
                state = save_state ();
                assert (state);
+       } else {
+               store_state(state);
        }
 
        /* all off */
@@ -1760,6 +1793,8 @@ EngineControl::get_buffer_size () const
        uint32_t samples;
 
        if (sscanf (txt.c_str(), "%d", &samples) != 1) {
+               fprintf(stderr, "Find a trout and repeatedly slap the nearest C++ who throws exceptions without catching them.\n");
+               fprintf(stderr, "Ardour will likely crash now, giving you time to get the trout.\n");
                throw exception ();
        }
 
@@ -2151,7 +2186,7 @@ EngineControl::engine_running ()
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        assert (backend);
 
-       buffer_size_combo.set_active_text (bufsize_as_string (backend->buffer_size()));
+       set_active_text_if_present (buffer_size_combo, bufsize_as_string (backend->buffer_size()));
        sample_rate_combo.set_active_text (rate_as_string (backend->sample_rate()));
 
        buffer_size_combo.set_sensitive (true);
@@ -2179,6 +2214,14 @@ EngineControl::engine_stopped ()
        engine_status.set_markup(string_compose ("<span foreground=\"red\">%1</span>", _("Inactive")));
 }
 
+void
+EngineControl::device_list_changed ()
+{
+       PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1); // ??
+       list_devices ();
+       midi_option_changed();
+}
+
 void
 EngineControl::connect_disconnect_click()
 {