Make a few things private in Delivery; couple of minor

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 582c635ca7bbb56cab38314c2c05f2d1feb09d6f..bb3887862d7f43770fc1f493625032f43dd44d91 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -31,6 +31,7 @@
 #include "ardour_ui.h"
 #include "bundle_manager.h"
 #include "global_port_matrix.h"
+#include "gui_object.h"
 #include "gui_thread.h"
 #include "keyeditor.h"
 #include "location_ui.h"
@@ -44,6 +45,7 @@
 #include "speaker_dialog.h"
 #include "sfdb_ui.h"
 #include "theme_manager.h"
+#include "time_info_box.h"
 
 #include "i18n.h"
 
@@ -62,6 +64,18 @@ ARDOUR_UI::set_session (Session *s)
                return;
        }
 
+       const XMLNode* node = _session->extra_xml (X_("UI"));
+
+       if (node) {
+               const XMLNodeList& children = node->children();
+               for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
+                       if ((*i)->name() == GUIObjectState::xml_node_name) {
+                               gui_object_state->load (**i);
+                               break;
+                       }
+               }
+       }
+
        if (location_ui->get()) {
                location_ui->get()->set_session(s);
        }
@@ -92,12 +106,11 @@ ARDOUR_UI::set_session (Session *s)
                }
        }
 
-       primary_clock.set_session (s);
-       secondary_clock.set_session (s);
-       big_clock.set_session (s);
-       preroll_clock.set_session (s);
-       postroll_clock.set_session (s);
-       
+       primary_clock->set_session (s);
+       secondary_clock->set_session (s);
+       big_clock->set_session (s);
+       time_info_box->set_session (s);
+
        /* sensitize menu bar options that are now valid */
 
        ActionManager::set_sensitive (ActionManager::session_sensitive_actions, true);
@@ -141,6 +154,7 @@ ARDOUR_UI::set_session (Session *s)
        Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::solo_blink));
        Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::sync_blink));
        Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::audition_blink));
+       Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::feedback_blink));
 
        _session->RecordStateChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::record_state_changed, this), gui_context());
        _session->StepEditStatusChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::step_edit_status_change, this, _1), gui_context());
@@ -152,6 +166,7 @@ ARDOUR_UI::set_session (Session *s)
        _session->AuditionActive.connect (_session_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::auditioning_changed, this, _1), gui_context());
        _session->locations()->added.connect (_session_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
        _session->locations()->removed.connect (_session_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
+       _session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::session_parameter_changed, this, _1), gui_context ());
 
 #ifdef HAVE_JACK_SESSION
        engine->JackSessionEvent.connect (*_session, MISSING_INVALIDATOR, ui_bind (&Session::jack_session_event, _session, _1), gui_context());
@@ -179,13 +194,19 @@ ARDOUR_UI::set_session (Session *s)
        second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_second), 1000);
        point_one_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_one_seconds), 100);
        point_zero_one_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
+
+       update_format ();
 }
 
 int
 ARDOUR_UI::unload_session (bool hide_stuff)
 {
        if (_session && _session->dirty()) {
-               switch (ask_about_saving_session (_("close"))) {
+               std::vector<std::string> actions;
+               actions.push_back (_("Don't close"));
+               actions.push_back (_("Just close"));
+               actions.push_back (_("Save and close"));
+               switch (ask_about_saving_session (actions)) {
                case -1:
                        // cancel
                        return 1;
@@ -219,6 +240,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        Blink.clear ();
 
        delete _session;
+       _session = 0;
 
        update_buffer_load ();