Merged with trunk R1761

[ardour.git] / gtk2_ardour / ardour_ui.cc

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 07d322a1fb70f5a335c1c077c6726f200dca57ca..de006a8fecab3eb4a3e40e723118bd4e35ef2f85 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1,5 +1,5 @@
 /*
 /*

-    Copyright (C) 1999-2002 Paul Davis 
+    Copyright (C) 1999-2007 Paul Davis 

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id$

 */
 
 #define __STDC_FORMAT_MACROS 1
 */
 
 #define __STDC_FORMAT_MACROS 1


@@ -31,6 +30,8 @@
 
 #include <iostream>
 
 
 #include <iostream>
 

+#include <sys/resource.h>
+

 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
 


@@ -46,11 +47,14 @@
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/popup.h>

+#include <gtkmm2ext/window_title.h>

 
 #include <midi++/port.h>
 #include <midi++/mmc.h>
 
 #include <ardour/ardour.h>
 
 #include <midi++/port.h>
 #include <midi++/mmc.h>
 
 #include <ardour/ardour.h>

+#include <ardour/profile.h>
+#include <ardour/session_route.h>

 #include <ardour/port.h>
 #include <ardour/audioengine.h>
 #include <ardour/playlist.h>
 #include <ardour/port.h>
 #include <ardour/audioengine.h>
 #include <ardour/playlist.h>


@@ -58,7 +62,6 @@
 #include <ardour/audio_diskstream.h>
 #include <ardour/audiofilesource.h>
 #include <ardour/recent_sessions.h>
 #include <ardour/audio_diskstream.h>
 #include <ardour/audiofilesource.h>
 #include <ardour/recent_sessions.h>

-#include <ardour/session_route.h>

 #include <ardour/port.h>
 #include <ardour/audio_track.h>
 #include <ardour/midi_track.h>
 #include <ardour/port.h>
 #include <ardour/audio_track.h>
 #include <ardour/midi_track.h>


@@ -71,7 +74,6 @@
 #include "mixer_ui.h"
 #include "prompter.h"
 #include "opts.h"
 #include "mixer_ui.h"
 #include "prompter.h"
 #include "opts.h"

-#include "keyboard_target.h"

 #include "add_route_dialog.h"
 #include "new_session_dialog.h"
 #include "about.h"
 #include "add_route_dialog.h"
 #include "new_session_dialog.h"
 #include "about.h"


@@ -96,7 +98,7 @@ sigc::signal<void,nframes_t> ARDOUR_UI::Clock;
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 

-       : Gtkmm2ext::UI ("ardour", argcp, argvp, rcfile),
+       : Gtkmm2ext::UI (X_("Ardour"), argcp, argvp, rcfile),

          
          primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, false, true),
          secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, false, true),
          
          primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, false, true),
          secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, false, true),


@@ -118,16 +120,34 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 
          /* transport */
 
 
          /* transport */
 

-         time_master_button (_("time\nmaster")),
-
+         roll_controllable ("transport roll", *this, TransportControllable::Roll),
+         stop_controllable ("transport stop", *this, TransportControllable::Stop),
+         goto_start_controllable ("transport goto start", *this, TransportControllable::GotoStart),
+         goto_end_controllable ("transport goto end", *this, TransportControllable::GotoEnd),
+         auto_loop_controllable ("transport auto loop", *this, TransportControllable::AutoLoop),
+         play_selection_controllable ("transport play selection", *this, TransportControllable::PlaySelection),
+         rec_controllable ("transport rec-enable", *this, TransportControllable::RecordEnable),
+         shuttle_controllable ("shuttle", *this, TransportControllable::ShuttleControl),
+         shuttle_controller_binding_proxy (shuttle_controllable),
+
+         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),
+         

          shuttle_units_button (_("% ")),
 
          punch_in_button (_("Punch In")),
          punch_out_button (_("Punch Out")),
          auto_return_button (_("Auto Return")),
          shuttle_units_button (_("% ")),
 
          punch_in_button (_("Punch In")),
          punch_out_button (_("Punch Out")),
          auto_return_button (_("Auto Return")),

-         auto_play_button (_("Autuo Play")),
+         auto_play_button (_("Auto Play")),

          auto_input_button (_("Auto Input")),
          click_button (_("Click")),
          auto_input_button (_("Auto Input")),
          click_button (_("Click")),

+         time_master_button (_("time\nmaster")),
+

          auditioning_alert_button (_("AUDITION")),
          solo_alert_button (_("SOLO")),
          shown_flag (false)
          auditioning_alert_button (_("AUDITION")),
          solo_alert_button (_("SOLO")),
          shown_flag (false)


@@ -164,15 +184,13 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
        location_ui = 0;
        open_session_selector = 0;
        have_configure_timeout = false;
        location_ui = 0;
        open_session_selector = 0;
        have_configure_timeout = false;

-       have_disk_overrun_displayed = false;
-       have_disk_underrun_displayed = false;
+       have_disk_speed_dialog_displayed = false;

        _will_create_new_session_automatically = false;
        session_loaded = false;
        last_speed_displayed = -1.0f;
        keybindings_path = ARDOUR::find_config_file ("ardour.bindings");
 
        can_save_keybindings = false;
        _will_create_new_session_automatically = false;
        session_loaded = false;
        last_speed_displayed = -1.0f;
        keybindings_path = ARDOUR::find_config_file ("ardour.bindings");
 
        can_save_keybindings = false;

-       Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::first_idle));

 
        last_configure_time.tv_sec = 0;
        last_configure_time.tv_usec = 0;
 
        last_configure_time.tv_sec = 0;
        last_configure_time.tv_usec = 0;


@@ -249,10 +267,6 @@ ARDOUR_UI::set_engine (AudioEngine& e)
        AudioFileSource::set_build_peakfiles (true);
        AudioFileSource::set_build_missing_peakfiles (true);
 
        AudioFileSource::set_build_peakfiles (true);
        AudioFileSource::set_build_missing_peakfiles (true);
 

-       if (AudioSource::start_peak_thread ()) {
-               throw failed_constructor();
-       }
-       

        /* set default clock modes */
 
        primary_clock.set_mode (AudioClock::SMPTE);
        /* set default clock modes */
 
        primary_clock.set_mode (AudioClock::SMPTE);


@@ -290,8 +304,6 @@ ARDOUR_UI::~ARDOUR_UI ()
        if (add_route_dialog) {
                delete add_route_dialog;
        }
        if (add_route_dialog) {
                delete add_route_dialog;
        }

-
-       AudioSource::stop_peak_thread ();

 }
 
 gint
 }
 
 gint


@@ -333,6 +345,63 @@ ARDOUR_UI::configure_handler (GdkEventConfigure* conf)
        return FALSE;
 }
 
        return FALSE;
 }
 

+void
+ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
+{
+       const XMLProperty* prop;
+
+       if ((prop = node.property ("roll")) != 0) {
+               roll_controllable.set_id (prop->value());
+       }
+       if ((prop = node.property ("stop")) != 0) {
+               stop_controllable.set_id (prop->value());
+       }
+       if ((prop = node.property ("goto_start")) != 0) {
+               goto_start_controllable.set_id (prop->value());
+       }
+       if ((prop = node.property ("goto_end")) != 0) {
+               goto_end_controllable.set_id (prop->value());
+       }
+       if ((prop = node.property ("auto_loop")) != 0) {
+               auto_loop_controllable.set_id (prop->value());
+       }
+       if ((prop = node.property ("play_selection")) != 0) {
+               play_selection_controllable.set_id (prop->value());
+       }
+       if ((prop = node.property ("rec")) != 0) {
+               rec_controllable.set_id (prop->value());
+       }
+       if ((prop = node.property ("shuttle")) != 0) {
+               shuttle_controllable.set_id (prop->value());
+       }
+}
+
+XMLNode&
+ARDOUR_UI::get_transport_controllable_state ()
+{
+       XMLNode* node = new XMLNode(X_("TransportControllables"));
+       char buf[64];
+
+       roll_controllable.id().print (buf, sizeof (buf));
+       node->add_property (X_("roll"), buf);
+       stop_controllable.id().print (buf, sizeof (buf));
+       node->add_property (X_("stop"), buf);
+       goto_start_controllable.id().print (buf, sizeof (buf));
+       node->add_property (X_("goto_start"), buf);
+       goto_end_controllable.id().print (buf, sizeof (buf));
+       node->add_property (X_("goto_end"), buf);
+       auto_loop_controllable.id().print (buf, sizeof (buf));
+       node->add_property (X_("auto_loop"), buf);
+       play_selection_controllable.id().print (buf, sizeof (buf));
+       node->add_property (X_("play_selection"), buf);
+       rec_controllable.id().print (buf, sizeof (buf));
+       node->add_property (X_("rec"), buf);
+       shuttle_controllable.id().print (buf, sizeof (buf));
+       node->add_property (X_("shuttle"), buf);
+
+       return *node;
+}
+

 void
 ARDOUR_UI::save_ardour_state ()
 {
 void
 ARDOUR_UI::save_ardour_state ()
 {


@@ -346,6 +415,7 @@ ARDOUR_UI::save_ardour_state ()
 
        XMLNode* node = new XMLNode (keyboard->get_state());
        Config->add_extra_xml (*node);
 
        XMLNode* node = new XMLNode (keyboard->get_state());
        Config->add_extra_xml (*node);

+       Config->add_extra_xml (get_transport_controllable_state());

        Config->save_state();
 
        XMLNode enode(static_cast<Stateful*>(editor)->get_state());
        Config->save_state();
 
        XMLNode enode(static_cast<Stateful*>(editor)->get_state());


@@ -362,12 +432,108 @@ ARDOUR_UI::save_ardour_state ()
        save_keybindings ();
 }
 
        save_keybindings ();
 }
 

+gint
+ARDOUR_UI::autosave_session ()
+{
+        if (!Config->get_periodic_safety_backups())
+                return 1;
+        
+        if (session) {
+                session->maybe_write_autosave();
+        }
+
+        return 1;
+}
+
+void
+ARDOUR_UI::update_autosave ()
+{
+        ENSURE_GUI_THREAD (mem_fun (*this, &ARDOUR_UI::update_autosave));
+        
+        if (session->dirty()) {
+                if (_autosave_connection.connected()) {
+                        _autosave_connection.disconnect();
+                }
+
+                _autosave_connection = Glib::signal_timeout().connect (mem_fun (*this, &ARDOUR_UI::autosave_session),
+                                                                   Config->get_periodic_safety_backup_interval() * 1000);
+
+        } else {
+                if (_autosave_connection.connected()) {
+                        _autosave_connection.disconnect();
+                }               
+        }
+}
+

 void
 ARDOUR_UI::startup ()
 {
 void
 ARDOUR_UI::startup ()
 {

-       // relax
+       check_memory_locking();
+}
+
+void
+ARDOUR_UI::no_memory_warning ()
+{
+       XMLNode node (X_("no-memory-warning"));
+       Config->add_instant_xml (node, get_user_ardour_path());
+}
+
+void
+ARDOUR_UI::check_memory_locking ()
+{
+#ifdef __APPLE__
+       /* OS X doesn't support mlockall(2), and so testing for memory locking capability there is pointless */
+       return;
+#else // !__APPLE__
+
+       XMLNode* memory_warning_node = Config->instant_xml (X_("no-memory-warning"), get_user_ardour_path());
+
+       if (engine->is_realtime() && memory_warning_node == 0) {
+
+               struct rlimit limits;
+               int64_t ram;
+               long pages, page_size;
+
+               if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0) {
+                       ram = 0;
+               } else {
+                       ram = (int64_t) pages * (int64_t) page_size;
+               }
+
+               if (getrlimit (RLIMIT_MEMLOCK, &limits)) {
+                       return;
+               }
+               
+               if (limits.rlim_cur != RLIM_INFINITY) {
+
+                       if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) {
+                       
+
+                               MessageDialog msg (_("WARNING: Your system has a limit for maximum amount of locked memory. "
+                                                    "This might cause Ardour to run out of memory before your system "
+                                                    "runs out of memory. \n\n"
+                                                    "You can view the memory limit with 'ulimit -l', "
+                                                    "and it is normally controlled by /etc/security/limits.conf"));
+                               
+                               VBox* vbox = msg.get_vbox();
+                               HBox hbox;
+                               CheckButton cb (_("Do not show this window again"));
+                               
+                               cb.signal_toggled().connect (mem_fun (*this, &ARDOUR_UI::no_memory_warning));
+                               
+                               hbox.pack_start (cb, true, false);
+                               vbox->pack_start (hbox);
+                               hbox.show_all ();
+                               
+                               editor->ensure_float (msg);
+                               msg.run ();
+                       }
+               }
+       }
+#endif // !__APPLE__

 }
 
 }
 

+

 void
 ARDOUR_UI::finish()
 {
 void
 ARDOUR_UI::finish()
 {


@@ -513,11 +679,11 @@ ARDOUR_UI::update_sample_rate (nframes_t ignored)
                nframes_t rate = engine->frame_rate();
                
                if (fmod (rate, 1000.0) != 0.0) {
                nframes_t rate = engine->frame_rate();
                
                if (fmod (rate, 1000.0) != 0.0) {

-                       snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f msecs"), 
+                       snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"), 

                                  (float) rate/1000.0f,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                } else {
                                  (float) rate/1000.0f,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                } else {

-                       snprintf (buf, sizeof (buf), _("%u kHz / %4.1f msecs"), 
+                       snprintf (buf, sizeof (buf), _("%u kHz / %4.1f ms"), 

                                  rate/1000,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                }
                                  rate/1000,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                }


@@ -530,7 +696,7 @@ void
 ARDOUR_UI::update_cpu_load ()
 {
        char buf[32];
 ARDOUR_UI::update_cpu_load ()
 {
        char buf[32];

-       snprintf (buf, sizeof (buf), _("DSP: %.1f%%"), engine->get_cpu_load());
+       snprintf (buf, sizeof (buf), _("DSP: %5.1f%%"), engine->get_cpu_load());

        cpu_load_label.set_text (buf);
 }
 
        cpu_load_label.set_text (buf);
 }
 


@@ -609,40 +775,6 @@ ARDOUR_UI::update_wall_clock ()
 
        return TRUE;
 }
 
        return TRUE;
 }

-void
-ARDOUR_UI::control_methods_adjusted ()
-
-{
-       int which_method;
-
-       which_method = (int) online_control_button->adjustment.get_value();
-       switch (which_method) {
-       case 0:
-               allow_mmc_and_local ();
-               break;
-       case 1:
-               allow_mmc_only ();
-               break;
-       case 2:
-               allow_local_only ();
-               break;
-       default:
-               fatal << _("programming error: impossible control method") << endmsg;
-       }
-}
-       
-
-void
-ARDOUR_UI::mmc_device_id_adjusted ()
-
-{
-#if 0
-       if (mmc) {
-               int dev_id = (int) mmc_id_button->adjustment.get_value();
-               mmc->set_device_id (dev_id);
-       }
-#endif
-}

 
 gint
 ARDOUR_UI::session_menu (GdkEventButton *ev)
 
 gint
 ARDOUR_UI::session_menu (GdkEventButton *ev)


@@ -819,9 +951,30 @@ ARDOUR_UI::filter_ardour_session_dirs (const FileFilter::Info& info)
        return S_ISREG (statbuf.st_mode);
 }
 
        return S_ISREG (statbuf.st_mode);
 }
 

+bool
+ARDOUR_UI::check_audioengine ()
+{
+       if (engine) {
+               if (!engine->connected()) {
+                       MessageDialog msg (_("Ardour is not connected to JACK\n"
+                                            "You cannot open or close sessions in this condition"));
+                       msg.run ();
+                       return false;
+               }
+               return true;
+       } else {
+               return false;
+       }
+}
+

 void
 ARDOUR_UI::open_session ()
 {
 void
 ARDOUR_UI::open_session ()
 {

+       if (!check_audioengine()) {
+               return;
+               
+       }
+

        /* popup selector window */
 
        if (open_session_selector == 0) {
        /* popup selector window */
 
        if (open_session_selector == 0) {


@@ -923,7 +1076,8 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
                                if (how_many == 1) {
                                        error << _("could not create a new audio track") << endmsg;
                                } else {
                                if (how_many == 1) {
                                        error << _("could not create a new audio track") << endmsg;
                                } else {

-                                       error << string_compose (_("could not create %1 new audio tracks"), how_many) << endmsg;
+                                       error << string_compose (_("could only create %1 of %2 new audio %3"), 
+                                                                tracks.size(), how_many, (track ? _("tracks") : _("busses"))) << endmsg;

                                }
                        }
 
                                }
                        }
 


@@ -954,6 +1108,7 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
        }
 
        catch (...) {
        }
 
        catch (...) {

+               cerr << "About to complain about JACK\n";

                MessageDialog msg (*editor, 
                                   _("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\
                MessageDialog msg (*editor, 
                                   _("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\


@@ -994,7 +1149,7 @@ ARDOUR_UI::transport_goto_start ()
                */
                
                if (editor) {
                */
                
                if (editor) {

-                       editor->reposition_x_origin (session->current_start_frame());
+                       editor->reset_x_origin (session->current_start_frame());

                }
        }
 }
                }
        }
 }


@@ -1011,7 +1166,7 @@ ARDOUR_UI::transport_goto_zero ()
                */
                
                if (editor) {
                */
                
                if (editor) {

-                       editor->reposition_x_origin (0);
+                       editor->reset_x_origin (0);

                }
        }
 }
                }
        }
 }


@@ -1028,7 +1183,7 @@ ARDOUR_UI::transport_goto_end ()
                */
                
                if (editor) {
                */
                
                if (editor) {

-                       editor->reposition_x_origin (frame);
+                       editor->reset_x_origin (frame);

                }
        }
 }
                }
        }
 }


@@ -1101,11 +1256,11 @@ ARDOUR_UI::transport_roll ()
 
        if (session->get_play_loop()) {
                session->request_play_loop (false);
 
        if (session->get_play_loop()) {
                session->request_play_loop (false);

-               auto_loop_button.set_active (false);
-               roll_button.set_active (true);
+               auto_loop_button.set_visual_state (1);
+               roll_button.set_visual_state (1);

        } else if (session->get_play_range ()) {
                session->request_play_range (false);
        } else if (session->get_play_range ()) {
                session->request_play_range (false);

-               play_selection_button.set_active (false);
+               play_selection_button.set_visual_state (0);

        } else if (rolling) {
                session->request_locate (session->last_transport_start(), true);
        }
        } else if (rolling) {
                session->request_locate (session->last_transport_start(), true);
        }


@@ -1243,24 +1398,6 @@ ARDOUR_UI::map_transport_state ()
        }
 }
 
        }
 }
 

-void
-ARDOUR_UI::allow_local_only ()
-{
-
-}
-
-void
-ARDOUR_UI::allow_mmc_only ()
-{
-
-}
-
-void
-ARDOUR_UI::allow_mmc_and_local ()
-{
-
-}
-

 void
 ARDOUR_UI::GlobalClickBox::printer (char buf[32], Adjustment &adj, void *arg)
 {
 void
 ARDOUR_UI::GlobalClickBox::printer (char buf[32], Adjustment &adj, void *arg)
 {


@@ -1282,6 +1419,49 @@ ARDOUR_UI::engine_running ()
        ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_running));
        ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, true);
        ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false);
        ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_running));
        ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, true);
        ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false);

+
+       Glib::RefPtr<Action> action;
+       char* action_name = 0;
+
+       switch (engine->frames_per_cycle()) {
+       case 32:
+               action_name = X_("JACKLatency32");
+               break;
+       case 64:
+               action_name = X_("JACKLatency64");
+               break;
+       case 128:
+               action_name = X_("JACKLatency128");
+               break;
+       case 512:
+               action_name = X_("JACKLatency512");
+               break;
+       case 1024:
+               action_name = X_("JACKLatency1024");
+               break;
+       case 2048:
+               action_name = X_("JACKLatency2048");
+               break;
+       case 4096:
+               action_name = X_("JACKLatency4096");
+               break;
+       case 8192:
+               action_name = X_("JACKLatency8192");
+               break;
+       default:
+               /* XXX can we do anything useful ? */
+               break;
+       }
+
+       if (action_name) {
+
+               action = ActionManager::get_action (X_("JACK"), action_name);
+               
+               if (action) {
+                       Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action);
+                       ract->set_active ();
+               }
+       }

 }
 
 void
 }
 
 void


@@ -1379,7 +1559,7 @@ ARDOUR_UI::_blink (void *arg)
 void
 ARDOUR_UI::blink ()
 {
 void
 ARDOUR_UI::blink ()
 {

-        Blink (blink_on = !blink_on); /* EMIT_SIGNAL */
+       Blink (blink_on = !blink_on); /* EMIT_SIGNAL */

 }
 
 void
 }
 
 void


@@ -1449,22 +1629,25 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine,
        }
 }
 
        }
 }
 

+/** Ask the user for the name of a new shapshot and then take it.
+ */

 void
 ARDOUR_UI::snapshot_session ()
 {
        ArdourPrompter prompter (true);
        string snapname;
 void
 ARDOUR_UI::snapshot_session ()
 {
        ArdourPrompter prompter (true);
        string snapname;

-       string now;
+       char timebuf[128];

        time_t n;
        time_t n;

+       struct tm local_time;

 
        time (&n);
 
        time (&n);

-       now = ctime (&n);
-       now = now.substr (20, 4) + now.substr (3, 16) + " (" + now.substr (0, 3) + ")";
+       localtime_r (&n, &local_time);
+       strftime (timebuf, sizeof(timebuf), "%FT%T", &local_time);

 
        prompter.set_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
        prompter.set_prompt (_("Name of New Snapshot"));
 
        prompter.set_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
        prompter.set_prompt (_("Name of New Snapshot"));

-       prompter.set_initial_text (now);
+       prompter.set_initial_text (timebuf);

        
        switch (prompter.run()) {
        case RESPONSE_ACCEPT:
        
        switch (prompter.run()) {
        case RESPONSE_ACCEPT:


@@ -1571,18 +1754,18 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
        switch (session->record_status()) {
        case Session::Enabled:
                if (onoff) {
        switch (session->record_status()) {
        case Session::Enabled:
                if (onoff) {

-                       rec_button.set_state (1);
+                       rec_button.set_visual_state (2);

                } else {
                } else {

-                       rec_button.set_state (0);
+                       rec_button.set_visual_state (0);

                }
                break;
 
        case Session::Recording:
                }
                break;
 
        case Session::Recording:

-               rec_button.set_state (2);
+               rec_button.set_visual_state (1);

                break;
 
        default:
                break;
 
        default:

-               rec_button.set_state (0);
+               rec_button.set_visual_state (0);

                break;
        }
 }
                break;
        }
 }


@@ -1595,12 +1778,6 @@ ARDOUR_UI::hide_and_quit (GdkEventAny *ev, ArdourDialog *window)
        return TRUE;
 }
 
        return TRUE;
 }
 

-void
-ARDOUR_UI::start_keyboard_prefix ()
-{
-       keyboard->start_prefix();
-}
-

 void
 ARDOUR_UI::save_template ()
 
 void
 ARDOUR_UI::save_template ()
 


@@ -1627,21 +1804,31 @@ ARDOUR_UI::save_template ()
        }
 }
 
        }
 }
 

-void
+bool

 ARDOUR_UI::new_session (std::string predetermined_path)
 {
        string session_name;
        string session_path;
 
 ARDOUR_UI::new_session (std::string predetermined_path)
 {
        string session_name;
        string session_path;
 

+       if (!check_audioengine()) {
+               return false;
+       }
+

        int response = Gtk::RESPONSE_NONE;
 
        new_session_dialog->set_modal(true);
        new_session_dialog->set_name (predetermined_path);
        new_session_dialog->reset_recent();
        new_session_dialog->show();
        int response = Gtk::RESPONSE_NONE;
 
        new_session_dialog->set_modal(true);
        new_session_dialog->set_name (predetermined_path);
        new_session_dialog->reset_recent();
        new_session_dialog->show();

+       new_session_dialog->set_current_page (0);

 
        do {
                response = new_session_dialog->run ();
 
        do {
                response = new_session_dialog->run ();

+
+               if (!check_audioengine()) {
+                       new_session_dialog->hide ();
+                       return false;
+               }

                
                _session_is_new = false;
 
                
                _session_is_new = false;
 


@@ -1651,7 +1838,7 @@ ARDOUR_UI::new_session (std::string predetermined_path)
                                quit();
                        }
                        new_session_dialog->hide ();
                                quit();
                        }
                        new_session_dialog->hide ();

-                       return;
+                       return false;

 
                } else if (response == Gtk::RESPONSE_NONE) {
 
 
                } else if (response == Gtk::RESPONSE_NONE) {
 


@@ -1802,15 +1989,20 @@ ARDOUR_UI::new_session (std::string predetermined_path)
                                        uint32_t nphysin = (uint32_t) new_session_dialog->input_limit_count();
                                        uint32_t nphysout = (uint32_t) new_session_dialog->output_limit_count();
                                                        
                                        uint32_t nphysin = (uint32_t) new_session_dialog->input_limit_count();
                                        uint32_t nphysout = (uint32_t) new_session_dialog->output_limit_count();
                                                        

-                                       build_session (session_path,
-                                                      session_name,
-                                                      cchns,
-                                                      mchns,
-                                                      iconnect,
-                                                      oconnect,
-                                                      nphysin,
-                                                      nphysout, 
-                                                      engine->frame_rate() * 60 * 5);
+                                       if (build_session (session_path,
+                                                          session_name,
+                                                          cchns,
+                                                          mchns,
+                                                          iconnect,
+                                                          oconnect,
+                                                          nphysin,
+                                                          nphysout, 
+                                                          engine->frame_rate() * 60 * 5)) {
+
+                                               response = Gtk::RESPONSE_NONE;
+                                               new_session_dialog->reset ();
+                                               continue;
+                                       }

                                }
                        }
                }
                                }
                        }
                }


@@ -1821,11 +2013,16 @@ ARDOUR_UI::new_session (std::string predetermined_path)
        show();
        new_session_dialog->get_window()->set_cursor();
        new_session_dialog->hide();
        show();
        new_session_dialog->get_window()->set_cursor();
        new_session_dialog->hide();

+       return true;

 }
 
 void
 ARDOUR_UI::close_session()
 {
 }
 
 void
 ARDOUR_UI::close_session()
 {

+       if (!check_audioengine()) {
+               return;
+       }
+

        unload_session();
        new_session ();
 }
        unload_session();
        new_session ();
 }


@@ -1837,6 +2034,10 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string*
        int x;
        session_loaded = false;
        
        int x;
        session_loaded = false;
        

+       if (!check_audioengine()) {
+               return -1;
+       }
+

        x = unload_session ();
 
        if (x < 0) {
        x = unload_session ();
 
        if (x < 0) {


@@ -1876,6 +2077,7 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string*
                session->set_clean ();
        }
 
                session->set_clean ();
        }
 

+       editor->edit_cursor_position (true);

        return 0;
 }
 
        return 0;
 }
 


@@ -1892,8 +2094,14 @@ ARDOUR_UI::build_session (const string & path, const string & snap_name,
        Session *new_session;
        int x;
 
        Session *new_session;
        int x;
 

+       if (!check_audioengine()) {
+               return -1;
+       }
+

        session_loaded = false;
        session_loaded = false;

+

        x = unload_session ();
        x = unload_session ();

+

        if (x < 0) {
                return -1;
        } else if (x > 0) {
        if (x < 0) {
                return -1;
        } else if (x > 0) {


@@ -1909,7 +2117,8 @@ ARDOUR_UI::build_session (const string & path, const string & snap_name,
 
        catch (...) {
 
 
        catch (...) {
 

-               error << string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg;
+               MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path));
+               msg.run ();

                return -1;
        }
 
                return -1;
        }
 


@@ -2095,9 +2304,17 @@ After cleanup, unused audio files will be moved to a \
 
        editor->prepare_for_cleanup ();
 
 
        editor->prepare_for_cleanup ();
 

+       /* do not allow flush until a session is reloaded */
+
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket"));
+       if (act) {
+               act->set_sensitive (false);
+       }
+

        if (session->cleanup_sources (rep)) {
                return;
        }
        if (session->cleanup_sources (rep)) {
                return;
        }

+

        checker.hide();
        display_cleanup_results (rep, 
                                 _("cleaned files"),
        checker.hide();
        display_cleanup_results (rep, 
                                 _("cleaned files"),


@@ -2109,6 +2326,9 @@ Flushing the wastebasket will \n\
 release an additional\n\
 %4 %5bytes of disk space.\n"
                                         ));
 release an additional\n\
 %4 %5bytes of disk space.\n"
                                         ));

+
+
+

 }
 
 void
 }
 
 void


@@ -2133,7 +2353,7 @@ releasing %4 %5bytes of disk space"));
 }
 
 void
 }
 
 void

-ARDOUR_UI::add_route ()
+ARDOUR_UI::add_route (Gtk::Window* float_window)

 {
        int count;
 
 {
        int count;
 


@@ -2143,7 +2363,9 @@ ARDOUR_UI::add_route ()
 
        if (add_route_dialog == 0) {
                add_route_dialog = new AddRouteDialog;
 
        if (add_route_dialog == 0) {
                add_route_dialog = new AddRouteDialog;

-               editor->ensure_float (*add_route_dialog);
+               if (float_window) {
+                       add_route_dialog->set_transient_for (*float_window);
+               }

        }
 
        if (add_route_dialog->is_visible()) {
        }
 
        if (add_route_dialog->is_visible()) {


@@ -2261,18 +2483,18 @@ ARDOUR_UI::halt_on_xrun_message ()
 void
 ARDOUR_UI::disk_overrun_handler ()
 {
 void
 ARDOUR_UI::disk_overrun_handler ()
 {

-       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
+       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));

 
 

-       if (!have_disk_overrun_displayed) {
-               have_disk_overrun_displayed = true;
-               MessageDialog msg (*editor, X_("diskrate dialog"), _("\
+       if (!have_disk_speed_dialog_displayed) {
+               have_disk_speed_dialog_displayed = true;
+               MessageDialog* msg = new MessageDialog (*editor, _("\

 The disk system on your computer\n\
 was not able to keep up with Ardour.\n\
 \n\
 Specifically, it failed to write data to disk\n\
 quickly enough to keep up with recording.\n"));
 The disk system on your computer\n\
 was not able to keep up with Ardour.\n\
 \n\
 Specifically, it failed to write data to disk\n\
 quickly enough to keep up with recording.\n"));

-               msg.run ();
-               have_disk_overrun_displayed = false;
+               msg->signal_response().connect (bind (mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
+               msg->show_all ();

        }
 }
 
        }
 }
 


@@ -2281,29 +2503,24 @@ ARDOUR_UI::disk_underrun_handler ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
 
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
 

-       if (!have_disk_underrun_displayed) {
-               have_disk_underrun_displayed = true;
-               MessageDialog msg (*editor,
-                       (_("The disk system on your computer\n\
+       if (!have_disk_speed_dialog_displayed) {
+               have_disk_speed_dialog_displayed = true;
+               MessageDialog* msg = new MessageDialog (*editor,
+                                  _("The disk system on your computer\n\

 was not able to keep up with Ardour.\n\
 \n\
 Specifically, it failed to read data from disk\n\
 was not able to keep up with Ardour.\n\
 \n\
 Specifically, it failed to read data from disk\n\

-quickly enough to keep up with playback.\n")));
-               msg.run ();
-               have_disk_underrun_displayed = false;
+quickly enough to keep up with playback.\n"));
+               msg->signal_response().connect (bind (mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
+               msg->show_all ();

        } 
 }
 
 void
        } 
 }
 
 void

-ARDOUR_UI::disk_underrun_message_gone ()
-{
-       have_disk_underrun_displayed = false;
-}
-
-void
-ARDOUR_UI::disk_overrun_message_gone ()
+ARDOUR_UI::disk_speed_dialog_gone (int ignored_response, MessageDialog* msg)

 {
 {

-       have_disk_underrun_displayed = false;
+       have_disk_speed_dialog_displayed = false;
+       delete msg;

 }
 
 int
 }
 
 int


@@ -2360,13 +2577,6 @@ ARDOUR_UI::reconnect_to_jack ()
        }
 }
 
        }
 }
 

-void
-ARDOUR_UI::set_jack_buffer_size (nframes_t nframes)
-{
-       engine->request_buffer_size (nframes);
-       update_sample_rate (0);
-}
-

 int
 ARDOUR_UI::cmdline_new_session (string path)
 {
 int
 ARDOUR_UI::cmdline_new_session (string path)
 {


@@ -2434,6 +2644,11 @@ ARDOUR_UI::use_config ()
                Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
                ract->set_active ();
        }       
                Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
                ract->set_active ();
        }       

+
+       XMLNode* node = Config->extra_xml (X_("TransportControllables"));
+       if (node) {
+               set_transport_controllable_state (*node);
+       }

 }
 
 void
 }
 
 void


@@ -2484,6 +2699,9 @@ ARDOUR_UI::save_keybindings ()
 bool
 ARDOUR_UI::first_idle ()
 {
 bool
 ARDOUR_UI::first_idle ()
 {

+       if (session) {
+               session->allow_auto_play (true);
+       }

        can_save_keybindings = true;
        return false;
 }
        can_save_keybindings = true;
        return false;
 }


@@ -2503,3 +2721,115 @@ ARDOUR_UI::store_clock_modes ()
 
 
                
 
 
                

+ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOUR_UI& u, ToggleType tp)
+       : Controllable (name), ui (u), type(tp)
+{
+       
+}
+
+void
+ARDOUR_UI::TransportControllable::set_value (float val)
+{
+       if (type == ShuttleControl) {
+               double fract;
+
+               if (val == 0.5f) {
+                       fract = 0.0;
+               } else {
+                       if (val < 0.5f) {
+                               fract = -((0.5f - val)/0.5f);
+                       } else {
+                               fract = ((val - 0.5f)/0.5f);
+                       }
+               }
+               
+               ui.set_shuttle_fract (fract);
+               return;
+       }
+
+       if (val < 0.5f) {
+               /* do nothing: these are radio-style actions */
+               return;
+       }
+
+       char *action = 0;
+
+       switch (type) {
+       case Roll:
+               action = X_("Roll");
+               break;
+       case Stop:
+               action = X_("Stop");
+               break;
+       case GotoStart:
+               action = X_("Goto Start");
+               break;
+       case GotoEnd:
+               action = X_("Goto End");
+               break;
+       case AutoLoop:
+               action = X_("Loop");
+               break;
+       case PlaySelection:
+               action = X_("Play Selection");
+               break;
+       case RecordEnable:
+               action = X_("Record");
+               break;
+       default:
+               break;
+       }
+
+       if (action == 0) {
+               return;
+       }
+
+       Glib::RefPtr<Action> act = ActionManager::get_action ("Transport", action);
+
+       if (act) {
+               act->activate ();
+       }
+}
+
+float
+ARDOUR_UI::TransportControllable::get_value (void) const
+{
+       float val = 0.0f;
+       
+       switch (type) {
+       case Roll:
+               break;
+       case Stop:
+               break;
+       case GotoStart:
+               break;
+       case GotoEnd:
+               break;
+       case AutoLoop:
+               break;
+       case PlaySelection:
+               break;
+       case RecordEnable:
+               break;
+       case ShuttleControl:
+               break;
+       default:
+               break;
+       }
+
+       return val;
+}
+
+void
+ARDOUR_UI::TransportControllable::set_id (const string& str)
+{
+       _id = str;
+}
+
+void
+ARDOUR_UI::setup_profile ()
+{
+       if (gdk_screen_width() < 1200) {
+               Profile->set_small_screen ();
+       }
+}