fix initial display of solo-model in monitor section
[ardour.git] / gtk2_ardour / ardour_ui.cc
index d53e441fd27b402d12692e637b92b1e3a3010193..cc173c80e333649ddb51240089dfb33784ab2e36 100644 (file)
@@ -78,6 +78,7 @@
 #include "ardour/midi_track.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/filename_extensions.h"
+#include "ardour/process_thread.h"
 
 typedef uint64_t microseconds_t;
 
@@ -91,6 +92,7 @@ typedef uint64_t microseconds_t;
 #include "engine_dialog.h"
 #include "gain_meter.h"
 #include "global_port_matrix.h"
+#include "gui_object.h"
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "location_ui.h"
@@ -131,52 +133,53 @@ bool could_be_a_valid_path (const string& path);
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
-       : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp),
+       : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
 
-         primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true),
-         secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true),
-         preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, false, true),
-         postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, false, true),
+       , gui_object_state (new GUIObjectState)
+       , primary_clock (new AudioClock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true))
+       , secondary_clock (new AudioClock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true))
+       , preroll_clock (new AudioClock (X_("preroll"), false, X_("PreRollClock"), true, false, true))
+       , postroll_clock (new AudioClock (X_("postroll"), false, X_("PostRollClock"), true, false, true))
 
          /* preroll stuff */
 
-         preroll_button (_("pre\nroll")),
-         postroll_button (_("post\nroll")),
+       , preroll_button (_("pre\nroll"))
+       , postroll_button (_("post\nroll"))
 
          /* big clock */
 
-         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false),
+       , big_clock (new AudioClock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false))
 
          /* transport */
 
-         roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll)),
-         stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop)),
-         goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart)),
-         goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd)),
-         auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop)),
-         play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection)),
-         rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable)),
-
-         roll_button (roll_controllable),
-         stop_button (stop_controllable),
-         goto_start_button (goto_start_controllable),
-         goto_end_button (goto_end_controllable),
-         auto_loop_button (auto_loop_controllable),
-         play_selection_button (play_selection_controllable),
-         rec_button (rec_controllable),
-
-         punch_in_button (_("Punch In")),
-         punch_out_button (_("Punch Out")),
-         auto_return_button (_("Auto Return")),
-         auto_play_button (_("Auto Play")),
-         auto_input_button (_("Auto Input")),
-         click_button (_("Click")),
-         time_master_button (_("time\nmaster")),
-
-         auditioning_alert_button (_("AUDITION")),
-         solo_alert_button (_("SOLO")),
-         
-         error_log_button (_("Errors"))
+       , roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll))
+       , stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop))
+       , goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart))
+       , goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd))
+       , auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop))
+       , play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection))
+       , rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable))
+
+       , roll_button (roll_controllable)
+       , stop_button (stop_controllable)
+       , goto_start_button (goto_start_controllable)
+       , goto_end_button (goto_end_controllable)
+       , auto_loop_button (auto_loop_controllable)
+       , play_selection_button (play_selection_controllable)
+       , rec_button (rec_controllable)
+
+       , auto_return_button (_("Auto Return"))
+       , auto_play_button (_("Auto Play"))
+       , auto_input_button (_("Auto Input"))
+         // , click_button (_("Click"))
+       , time_master_button (_("time\nmaster"))
+
+       , auditioning_alert_button (_("AUDITION"))
+       , solo_alert_button (_("SOLO"))
+
+       , error_log_button (_("Errors"))
+
+       , _status_bar_visibility (X_("status-bar"))
 
 {
        using namespace Gtk::Menu_Helpers;
@@ -259,7 +262,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        ARDOUR::Session::AskAboutSampleRateMismatch.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::sr_mismatch_dialog, this, _1, _2));
 
        /* handle requests to quit (coming from JACK session) */
-       
+
        ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::finish, this), gui_context ());
 
        /* handle requests to deal with missing files */
@@ -295,7 +298,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        keyboard = new ArdourKeyboard(*this);
 
-
        XMLNode* node = ARDOUR_UI::instance()->keyboard_settings();
        if (node) {
                keyboard->set_state (*node, Stateful::loading_state_version);
@@ -309,11 +311,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        TimeAxisViewItem::set_constant_heights ();
 
        /* The following must happen after ARDOUR::init() so that Config is set up */
-       
+
        location_ui = new ActionWindowProxy<LocationUIWindow> (X_("locations"), Config->extra_xml (X_("UI")), X_("ToggleLocations"));
        big_clock_window = new ActionWindowProxy<Gtk::Window> (X_("bigclock"), Config->extra_xml (X_("UI")), X_("ToggleBigClock"));
        speaker_config_window = new ActionWindowProxy<SpeakerDialog> (X_("speakerconf"), Config->extra_xml (X_("UI")), X_("toggle-speaker-config"));
-       
+
        for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
                _global_port_matrix[*i] = new ActionWindowProxy<GlobalPortMatrixWindow> (
                        string_compose ("GlobalPortMatrix-%1", (*i).to_string()),
@@ -327,9 +329,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        SpeakerDialog* s = new SpeakerDialog ();
        s->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-speaker-config")));
        speaker_config_window->set (s);
-       
+
        starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup));
        stopping.connect (sigc::mem_fun(*this, &ARDOUR_UI::shutdown));
+
+       _process_thread = new ProcessThread ();
+       _process_thread->init ();
 }
 
 /** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
@@ -340,7 +345,7 @@ ARDOUR_UI::run_startup (bool should_be_new, string load_template)
        _startup = new ArdourStartup ();
 
        XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
-       
+
        if (audio_setup && _startup->engine_control()) {
                _startup->engine_control()->set_state (*audio_setup);
        }
@@ -409,6 +414,12 @@ ARDOUR_UI::post_engine ()
        if (setup_windows ()) {
                throw failed_constructor ();
        }
+
+       /* Do this after setup_windows (), as that's when the _status_bar_visibility is created */
+       XMLNode* n = Config->extra_xml (X_("UI"));
+       if (n) {
+               _status_bar_visibility.set_state (*n);
+       }
        
        check_memory_locking();
 
@@ -442,11 +453,11 @@ ARDOUR_UI::post_engine ()
        /* set default clock modes */
 
        if (Profile->get_sae()) {
-               primary_clock.set_mode (AudioClock::BBT);
-               secondary_clock.set_mode (AudioClock::MinSec);
+               primary_clock->set_mode (AudioClock::BBT);
+               secondary_clock->set_mode (AudioClock::MinSec);
        }  else {
-               primary_clock.set_mode (AudioClock::Timecode);
-               secondary_clock.set_mode (AudioClock::BBT);
+               primary_clock->set_mode (AudioClock::Timecode);
+               secondary_clock->set_mode (AudioClock::BBT);
        }
 
        /* start the time-of-day-clock */
@@ -712,7 +723,12 @@ ARDOUR_UI::startup ()
        for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
                add_window_proxy (_global_port_matrix[*i]);
        }
-       
+
+       /* We have to do this here since goto_editor_window() ends up calling show_all() on the
+        * editor window, and we may want stuff to be hidden.
+        */
+       _status_bar_visibility.update ();
+
        BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
 }
 
@@ -960,7 +976,7 @@ ARDOUR_UI::every_point_zero_one_seconds ()
 void
 ARDOUR_UI::update_sample_rate (framecnt_t)
 {
-       char buf[32];
+       char buf[64];
 
        ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_sample_rate, ignored)
 
@@ -973,40 +989,111 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
                framecnt_t rate = engine->frame_rate();
 
                if (fmod (rate, 1000.0) != 0.0) {
-                       snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"),
+                       snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"),
                                  (float) rate/1000.0f,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                } else {
-                       snprintf (buf, sizeof (buf), _("%" PRId64 " kHz / %4.1f ms"),
+                       snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%" PRId64 " kHz / %4.1f ms</span>"),
                                  rate/1000,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                }
        }
 
-       sample_rate_label.set_text (buf);
+       sample_rate_label.set_markup (buf);
+}
+
+void
+ARDOUR_UI::update_format ()
+{
+       if (!_session) {
+               format_label.set_text ("");
+               return;
+       }
+
+       stringstream s;
+       s << "File: <span foreground=\"green\">";
+
+       switch (_session->config.get_native_file_header_format ()) {
+       case BWF:
+               s << "BWF";
+               break;
+       case WAVE:
+               s << "WAV";
+               break;
+       case WAVE64:
+               s << "WAV64";
+               break;
+       case CAF:
+               s << "CAF";
+               break;
+       case AIFF:
+               s << "AIFF";
+               break;
+       case iXML:
+               s << "iXML";
+               break;
+       case RF64:
+               s << "RF64";
+               break;
+       }
+
+       s << " ";
+       
+       switch (_session->config.get_native_file_data_format ()) {
+       case FormatFloat:
+               s << "32-float";
+               break;
+       case FormatInt24:
+               s << "24-int";
+               break;
+       case FormatInt16:
+               s << "16-int";
+               break;
+       }
+
+       s << "</span>";
+
+       format_label.set_markup (s.str ());
 }
 
 void
 ARDOUR_UI::update_cpu_load ()
 {
-       char buf[32];
-       snprintf (buf, sizeof (buf), _("DSP: %5.1f%%"), engine->get_cpu_load());
-       cpu_load_label.set_text (buf);
+       char buf[64];
+
+       /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::build_menu_bar
+          should also be changed.
+       */
+
+       float const c = engine->get_cpu_load ();
+       snprintf (buf, sizeof (buf), _("DSP: <span foreground=\"%s\">%5.1f%%</span>"), c >= 90 ? X_("red") : X_("green"), c);
+       cpu_load_label.set_markup (buf);
 }
 
 void
 ARDOUR_UI::update_buffer_load ()
 {
-       char buf[64];
-       uint32_t c, p;
+       char buf[256];
+
+       uint32_t const playback = _session ? _session->playback_load () : 100;
+       uint32_t const capture = _session ? _session->capture_load () : 100;
 
+       /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::build_menu_bar
+          should also be changed.
+       */
+       
        if (_session) {
-               c = _session->capture_load ();
-               p = _session->playback_load ();
+               snprintf (
+                       buf, sizeof (buf),
+                       _("Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">%" PRIu32 "%%</span> "
+                                  "<span foreground=\"green\">c:</span><span foreground=\"%s\">%" PRIu32 "%%</span>"),
+                       playback <= 5 ? X_("red") : X_("green"),
+                       playback,
+                       capture <= 5 ? X_("red") : X_("green"),
+                       capture
+                       );
 
-               snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"),
-                         _session->playback_load(), _session->capture_load());
-               buffer_load_label.set_text (buf);
+               buffer_load_label.set_markup (buf);
        } else {
                buffer_load_label.set_text ("");
        }
@@ -1033,7 +1120,7 @@ ARDOUR_UI::update_disk_space()
        framecnt_t fr = _session->frame_rate();
 
        if (frames == max_framecnt) {
-               strcpy (buf, _("Disk: 24hrs+"));
+               snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">24hrs+</span>"));
        } else {
                rec_enabled_streams = 0;
                _session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
@@ -1052,10 +1139,17 @@ ARDOUR_UI::update_disk_space()
                frames -= mins * fr * 60;
                secs = frames / fr;
 
-               snprintf (buf, sizeof(buf), _("Disk: %02dh:%02dm:%02ds"), hrs, mins, secs);
+               bool const low = (hrs == 0 && mins <= 30);
+
+               snprintf (
+                       buf, sizeof(buf),
+                       _("Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"),
+                       low ? X_("red") : X_("green"),
+                       hrs, mins, secs
+                       );
        }
 
-       disk_space_label.set_text (buf);
+       disk_space_label.set_markup (buf);
 
        // An attempt to make the disk space label flash red when space has run out.
 
@@ -1410,9 +1504,9 @@ ARDOUR_UI::session_add_audio_route (
 
                        if (routes.size() != how_many) {
                                if (how_many == 1) {
-                                       error << _("could not create a new audio track") << endmsg;
+                                       error << _("could not create a new audio bus") << endmsg;
                                } else {
-                                       error << string_compose (_("could not create %1 new audio tracks"), how_many) << endmsg;
+                                       error << string_compose (_("could not create %1 new audio busses"), how_many) << endmsg;
                                }
                        }
                }
@@ -1588,7 +1682,7 @@ ARDOUR_UI::transport_record (bool roll)
        //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " _session->record_status() = " << _session->record_status() << endl;
 }
 
-void 
+void
 ARDOUR_UI::transport_roll ()
 {
        if (!_session) {
@@ -1637,7 +1731,7 @@ ARDOUR_UI::transport_roll ()
 void
 ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 {
-       
+
        if (!_session) {
                return;
        }
@@ -1664,7 +1758,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                /* drop out of loop/range playback but leave transport rolling */
                if (_session->get_play_loop()) {
                        if (Config->get_seamless_loop()) {
-                               /* the disk buffers contain copies of the loop - we can't 
+                               /* the disk buffers contain copies of the loop - we can't
                                   just keep playing, so stop the transport. the user
                                   can restart as they wish.
                                */
@@ -1677,8 +1771,8 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                } else if (_session->get_play_range ()) {
                        affect_transport = false;
                        _session->request_play_range (0, true);
-               } 
-       } 
+               }
+       }
 
        if (affect_transport) {
                if (rolling) {
@@ -1687,7 +1781,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                        if (join_play_range_button.get_active()) {
                                _session->request_play_range (&editor->get_selection().time, true);
                        }
-                       
+
                        _session->request_transport_speed (1.0f);
                }
        }
@@ -1699,25 +1793,25 @@ ARDOUR_UI::toggle_session_auto_loop ()
        if (!_session) {
                return;
        }
-       
+
        if (_session->get_play_loop()) {
 
                if (_session->transport_rolling()) {
-                 
+
                        Location * looploc = _session->locations()->auto_loop_location();
-                       
+
                        if (looploc) {
                                _session->request_locate (looploc->start(), true);
                                _session->request_play_loop (false);
                        }
-                       
+
                } else {
                        _session->request_play_loop (false);
                }
        } else {
-               
+
          Location * looploc = _session->locations()->auto_loop_location();
-               
+
                if (looploc) {
                        _session->request_play_loop (true);
                }
@@ -1837,13 +1931,13 @@ ARDOUR_UI::map_transport_state ()
                        auto_loop_button.set_visual_state (0);
 
                } else if (_session->get_play_loop ()) {
-                       
+
                        auto_loop_button.set_visual_state (1);
                        play_selection_button.set_visual_state (0);
                        roll_button.set_visual_state (0);
 
                } else {
-                       
+
                        roll_button.set_visual_state (1);
                        play_selection_button.set_visual_state (0);
                        auto_loop_button.set_visual_state (0);
@@ -2074,17 +2168,16 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
        prompter.set_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
        prompter.set_title (_("Take Snapshot"));
-       prompter.set_title (_("Take Snapshot"));
        prompter.set_prompt (_("Name of new snapshot"));
 
        if (!switch_to_it) {
                char timebuf[128];
                time_t n;
                struct tm local_time;
-               
+
                time (&n);
                localtime_r (&n, &local_time);
-               strftime (timebuf, sizeof(timebuf), "%FT%T", &local_time);
+               strftime (timebuf, sizeof(timebuf), "%FT%H.%M.%S", &local_time);
                prompter.set_initial_text (timebuf);
        }
 
@@ -2109,6 +2202,12 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
                                msg.run ();
                                goto again;
                        }
+                       if (snapname.find (':') != string::npos) {
+                               MessageDialog msg (_("To ensure compatibility with various systems\n"
+                                                    "snapshot names may not contain a ':' character"));
+                               msg.run ();
+                               goto again;
+                       }
                }
 
                vector<sys::path> p;
@@ -2139,6 +2238,73 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
        }
 }
 
+/** Ask the user for the name of a new shapshot and then take it.
+ */
+
+void
+ARDOUR_UI::rename_session ()
+{
+       if (!_session) {
+               return;
+       }
+
+       ArdourPrompter prompter (true);
+       string name;
+
+       prompter.set_name ("Prompter");
+       prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+       prompter.set_title (_("Rename Session"));
+       prompter.set_prompt (_("New session name"));
+
+  again:
+       switch (prompter.run()) {
+       case RESPONSE_ACCEPT:
+       {
+               prompter.get_result (name);
+
+               bool do_rename = (name.length() != 0);
+
+               if (do_rename) {
+                       if (name.find ('/') != string::npos) {
+                               MessageDialog msg (_("To ensure compatibility with various systems\n"
+                                                    "session names may not contain a '/' character"));
+                               msg.run ();
+                               goto again;
+                       }
+                       if (name.find ('\\') != string::npos) {
+                               MessageDialog msg (_("To ensure compatibility with various systems\n"
+                                                    "session names may not contain a '\\' character"));
+                               msg.run ();
+                               goto again;
+                       }
+
+                       switch (_session->rename (name)) {
+                       case -1: {
+                               MessageDialog msg (_("That name is already in use by another directory/folder. Please try again."));
+                               msg.set_position (WIN_POS_MOUSE);
+                               msg.run ();
+                               goto again;
+                               break;
+                       }
+                       case 0:
+                               break;
+                       default: {
+                               MessageDialog msg (_("Renaming this session failed.\nThings could be seriously messed up at this point"));
+                               msg.set_position (WIN_POS_MOUSE);
+                               msg.run ();
+                               break;
+                       }
+                       }
+               }
+               
+               break;
+       }
+
+       default:
+               break;
+       }
+}
+
 void
 ARDOUR_UI::save_state (const string & name, bool switch_to_it)
 {
@@ -2150,8 +2316,10 @@ ARDOUR_UI::save_state (const string & name, bool switch_to_it)
                }
        }
 
+       node->add_child_nocopy (gui_object_state->get_state());
+
        _session->add_extra_xml (*node);
-       
+
        save_state_canfail (name, switch_to_it);
 }
 
@@ -2178,7 +2346,7 @@ void
 ARDOUR_UI::primary_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (primary_clock.current_time ());
+               _session->request_locate (primary_clock->current_time ());
        }
 }
 
@@ -2186,7 +2354,7 @@ void
 ARDOUR_UI::big_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (big_clock.current_time ());
+               _session->request_locate (big_clock->current_time ());
        }
 }
 
@@ -2194,7 +2362,7 @@ void
 ARDOUR_UI::secondary_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (secondary_clock.current_time ());
+               _session->request_locate (secondary_clock->current_time ());
        }
 }
 
@@ -2453,6 +2621,12 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
                        session_name = _startup->session_name (likely_new);
 
+                       string::size_type suffix = session_name.find (statefile_suffix);
+
+                       if (suffix != string::npos) {
+                               session_name = session_name.substr (0, suffix);
+                       }
+
                        /* this shouldn't happen, but we catch it just in case it does */
 
                        if (session_name.empty()) {
@@ -2559,7 +2733,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                                /* not connected to the AudioEngine, so quit to avoid an infinite loop */
                                exit (1);
                        }
-                       
+
                        if (!ARDOUR_COMMAND_LINE::immediate_save.empty()) {
                                _session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
                                exit (1);
@@ -2992,7 +3166,7 @@ ARDOUR_UI::cleanup ()
                                (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
 
        checker.set_title (_("Clean-up"));
-       
+
        checker.set_secondary_text(_("Clean-up is a destructive operation.\n\
 ALL undo/redo information will be lost if you clean-up.\n\
 Clean-up will move all unused files to a \"dead\" location."));
@@ -3183,7 +3357,7 @@ ARDOUR_UI::editor_settings () const
        } else {
                node = Config->instant_xml(X_("Editor"));
        }
-       
+
        if (!node) {
                if (getenv("ARDOUR_INSTANT_XML_PATH")) {
                        node = Config->instant_xml(getenv("ARDOUR_INSTANT_XML_PATH"));
@@ -3409,19 +3583,19 @@ void
 ARDOUR_UI::update_transport_clocks (framepos_t pos)
 {
        if (Config->get_primary_clock_delta_edit_cursor()) {
-               primary_clock.set (pos, false, editor->get_preferred_edit_position(), 1);
+               primary_clock->set (pos, false, editor->get_preferred_edit_position(), 1);
        } else {
-               primary_clock.set (pos, 0, true);
+               primary_clock->set (pos, 0, true);
        }
 
        if (Config->get_secondary_clock_delta_edit_cursor()) {
-               secondary_clock.set (pos, false, editor->get_preferred_edit_position(), 2);
+               secondary_clock->set (pos, false, editor->get_preferred_edit_position(), 2);
        } else {
-               secondary_clock.set (pos);
+               secondary_clock->set (pos);
        }
 
        if (big_clock_window->get()) {
-               big_clock.set (pos);
+               big_clock->set (pos);
        }
 }
 
@@ -3455,9 +3629,9 @@ ARDOUR_UI::record_state_changed ()
        bool const h = _session->have_rec_enabled_track ();
 
        if (r == Session::Recording && h)  {
-               big_clock.set_widget_name ("BigClockRecording");
+               big_clock->set_widget_name ("BigClockRecording");
        } else {
-               big_clock.set_widget_name ("BigClockNonRecording");
+               big_clock->set_widget_name ("BigClockNonRecording");
        }
 }
 
@@ -3482,15 +3656,19 @@ ARDOUR_UI::store_clock_modes ()
        XMLNode* node = new XMLNode(X_("ClockModes"));
 
        for (vector<AudioClock*>::iterator x = AudioClock::clocks.begin(); x != AudioClock::clocks.end(); ++x) {
-               node->add_property ((*x)->name().c_str(), enum_2_string ((*x)->mode()));
+               XMLNode* child = new XMLNode (X_("Clock"));
+               
+               child->add_property (X_("name"), (*x)->name());
+               child->add_property (X_("mode"), enum_2_string ((*x)->mode()));
+               child->add_property (X_("on"), ((*x)->off() ? X_("no") : X_("yes")));
+
+               node->add_child_nocopy (*child);
        }
 
        _session->add_extra_xml (*node);
        _session->set_dirty ();
 }
 
-
-
 ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOUR_UI& u, ToggleType tp)
        : Controllable (name), ui (u), type(tp)
 {
@@ -3571,12 +3749,6 @@ ARDOUR_UI::TransportControllable::get_value (void) const
        return val;
 }
 
-void
-ARDOUR_UI::TransportControllable::set_id (const string& str)
-{
-       _id = str;
-}
-
 void
 ARDOUR_UI::setup_profile ()
 {
@@ -3672,7 +3844,7 @@ ARDOUR_UI::missing_file (Session*s, std::string str, DataType type)
 }
 
 int
-ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector<std::string> hits)
+ARDOUR_UI::ambiguous_file (std::string file, std::string /*path*/, std::vector<std::string> hits)
 {
        AmbiguousFileDialog dialog (file, hits);
 
@@ -3682,3 +3854,17 @@ ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector<std::
        dialog.run ();
        return dialog.get_which ();
 }
+
+/** Allocate our thread-local buffers */
+void
+ARDOUR_UI::get_process_buffers ()
+{
+       _process_thread->get_buffers ();
+}
+
+/** Drop our thread-local buffers */
+void
+ARDOUR_UI::drop_process_buffers ()
+{
+       _process_thread->drop_buffers ();
+}