lots of MIDI editing stuff. to be explained on the website when its done
[ardour.git] / gtk2_ardour / ardour_ui2.cc
index f21ef03c976a5288ae7fbe7fac24fbbf2c311355..0394d8be8cd012dc4d8be0c4813198a34182a8a6 100644 (file)
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <fcntl.h>
 #include <iostream>
 #include <cmath>
 
-#include <gtkmm.h>
-#include <pbd/error.h>
-#include <pbd/basename.h>
-#include <pbd/fastlog.h>
-#include <gtkmm2ext/pix.h>
+#include <sigc++/bind.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/fastlog.h"
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/tearoff.h>
 
-#include <ardour/audioengine.h>
-#include <ardour/ardour.h>
-#include <ardour/route.h>
+#include "ardour/audioengine.h"
+#include "ardour/ardour.h"
+#include "ardour/profile.h"
+#include "ardour/route.h"
 
 #include "ardour_ui.h"
+#include "keyboard.h"
 #include "public_editor.h"
 #include "audio_clock.h"
+#include "actions.h"
+#include "utils.h"
+#include "theme_manager.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
+using namespace Glib;
 using namespace sigc;
 
 int    
 ARDOUR_UI::setup_windows ()
 {
-       using namespace Menu_Helpers;
-
        if (create_editor ()) {
                error << _("UI: cannot setup editor") << endmsg;
                return -1;
@@ -65,70 +68,72 @@ ARDOUR_UI::setup_windows ()
                return -1;
        }
 
-       if (create_meter_bridge ()) {
-               error << _("UI: cannot setup meter_bridge") << endmsg;
-               return -1;
-       }
-
        /* all other dialogs are created conditionally */
 
        we_have_dependents ();
 
        setup_clock ();
        setup_transport();
-       setup_adjustables ();
        build_menu_bar ();
 
-       top_packer.pack_start (menu_bar_base, false, false);
-       top_packer.pack_start (transport_frame, false, false);
+       theme_manager->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
+
+#ifdef TOP_MENUBAR
+       HBox* status_bar_packer = manage (new HBox);
+       
+       status_bar_label.set_size_request (300, -1);
+       status_bar_packer->pack_start (status_bar_label, true, true, 6);
+       status_bar_packer->pack_start (error_log_button, false, false);
+       
+       error_log_button.signal_clicked().connect (mem_fun (*this, &UI::toggle_errors));
+
+       editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true);
+       editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 6);
+#else
+       top_packer.pack_start (menu_bar_base, false, false);
+#endif 
+
+       top_packer.pack_start (transport_frame, false, false);
 
        editor->add_toplevel_controls (top_packer);
 
        return 0;
 }
 
-
-void
-ARDOUR_UI::setup_adjustables ()
-
+ void
+ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg)
 {
-       adjuster_table.set_homogeneous (true);
+       ustring text;
 
-       online_control_strings.push_back (_("MMC + Local"));
-       online_control_strings.push_back (_("MMC"));
-       online_control_strings.push_back (_("Local"));
+       UI::display_message (prefix, prefix_len, ptag, mtag, msg);
+#ifdef TOP_MENUBAR
 
-       online_control_button = new GlobalClickBox ("CONTROL",
-                                                   online_control_strings);
-
-       online_control_button->adjustment.signal_value_changed().connect(mem_fun(*this,&ARDOUR_UI::control_methods_adjusted));
-
-       mmc_id_strings.push_back ("1");
-       mmc_id_strings.push_back ("2");
-       mmc_id_strings.push_back ("3");
-       mmc_id_strings.push_back ("4");
-       mmc_id_strings.push_back ("5");
-       mmc_id_strings.push_back ("6");
-       mmc_id_strings.push_back ("7");
-       mmc_id_strings.push_back ("8");
-       mmc_id_strings.push_back ("9");
-
-       mmc_id_button = new GlobalClickBox (_("MMC ID"), mmc_id_strings);
+       if (strcmp (prefix, _("[ERROR]: ")) == 0) {
+               text = "<span color=\"red\" weight=\"bold\">";
+       } else if (strcmp (prefix, _("[WARNING]: ")) == 0) {
+               text = "<span color=\"yellow\" weight=\"bold\">";
+       } else if (strcmp (prefix, _("[INFO]: ")) == 0) {
+               text = "<span color=\"green\" weight=\"bold\">";
+       } else {
+               text = "<span color=\"white\" weight=\"bold\">???";
+       }
 
-       mmc_id_button->adjustment.signal_value_changed().connect (mem_fun(*this,&ARDOUR_UI::mmc_device_id_adjusted));
+       text += prefix;
+       text += "</span>";
+       text += msg;
 
-       adjuster_table.attach (*online_control_button, 0, 2, 1, 2, FILL|EXPAND, FILL, 5, 5);
-       adjuster_table.attach (*mmc_id_button, 2, 3, 1, 2, FILL, FILL, 5, 5);
+       status_bar_label.set_markup (text);
+#endif
 }
 
-#include "transport_xpms"
-
 void
 ARDOUR_UI::transport_stopped ()
 {
-       roll_button.set_active (false);
-       play_selection_button.set_active (false);
-       auto_loop_button.set_active (false);
+       stop_button.set_visual_state (1);
+       
+       roll_button.set_visual_state (0);
+       play_selection_button.set_visual_state (0);
+       auto_loop_button.set_visual_state (0);
 
        shuttle_fract = 0;
        shuttle_box.queue_draw ();
@@ -136,28 +141,25 @@ ARDOUR_UI::transport_stopped ()
        update_disk_space ();
 }
 
-static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */
-
 void
 ARDOUR_UI::transport_rolling ()
 {
+       stop_button.set_visual_state (0);
        if (session->get_play_range()) {
+               play_selection_button.set_visual_state (1);
+               roll_button.set_visual_state (0);
+               auto_loop_button.set_visual_state (0);
 
-               play_selection_button.set_active (true);
-               roll_button.set_active (false);
-               auto_loop_button.set_active (false);
-
-       } else if (session->get_auto_loop ()) {
-
-               auto_loop_button.set_active (true);
-               play_selection_button.set_active (false);
-               roll_button.set_active (false);
+       } 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_active (true);
-               play_selection_button.set_active (false);
-               auto_loop_button.set_active (false);
+               roll_button.set_visual_state (1);
+               play_selection_button.set_visual_state (0);
+               auto_loop_button.set_visual_state (0);
        }
 
        /* reset shuttle controller */
@@ -169,17 +171,19 @@ ARDOUR_UI::transport_rolling ()
 void
 ARDOUR_UI::transport_rewinding ()
 {
-       roll_button.set_active (true);
-       play_selection_button.set_active (false);
-       auto_loop_button.set_active (false);
+       stop_button.set_visual_state (0);
+       roll_button.set_visual_state (1);
+       play_selection_button.set_visual_state (0);
+       auto_loop_button.set_visual_state (0);
 }
 
 void
 ARDOUR_UI::transport_forwarding ()
 {
-       roll_button.set_active (true);
-       play_selection_button.set_active (false);
-       auto_loop_button.set_active (false);
+       stop_button.set_visual_state (0);
+       roll_button.set_visual_state (1);
+       play_selection_button.set_visual_state (0);
+       auto_loop_button.set_visual_state (0);
 }
 
 void
@@ -187,30 +191,99 @@ ARDOUR_UI::setup_transport ()
 {
        transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
        transport_tearoff->set_name ("TransportBase");
+       transport_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false);
+
+       if (Profile->get_sae()) {
+               transport_tearoff->set_can_be_torn_off (false);
+       }
 
        transport_hbox.pack_start (*transport_tearoff, true, false);
 
        transport_base.set_name ("TransportBase");
        transport_base.add (transport_hbox);
 
-       transport_frame.set_shadow_type (Gtk::SHADOW_OUT);
+       transport_frame.set_shadow_type (SHADOW_OUT);
        transport_frame.set_name ("BaseFrame");
        transport_frame.add (transport_base);
 
-       transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Gtk::Box*>(&top_packer), 
-                                                static_cast<Gtk::Widget*>(&transport_frame)));
-       transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Gtk::Box*> (&top_packer), 
-                                                static_cast<Gtk::Widget*> (&transport_frame), 1));
+       transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer), 
+                                                static_cast<Widget*>(&transport_frame)));
+       transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer), 
+                                                static_cast<Widget*> (&transport_frame), 1));
+       transport_tearoff->Hidden.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer), 
+                                                static_cast<Widget*>(&transport_frame)));
+       transport_tearoff->Visible.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer), 
+                                                 static_cast<Widget*> (&transport_frame), 1));
+       
+       shuttle_box.set_name ("TransportButton");
+       goto_start_button.set_name ("TransportButton");
+       goto_end_button.set_name ("TransportButton");
+       roll_button.set_name ("TransportButton");
+       stop_button.set_name ("TransportButton");
+       play_selection_button.set_name ("TransportButton");
+       rec_button.set_name ("TransportRecButton");
+       auto_loop_button.set_name ("TransportButton");
 
+       auto_return_button.set_name ("TransportButton");
+       auto_play_button.set_name ("TransportButton");
+       auto_input_button.set_name ("TransportButton");
+       punch_in_button.set_name ("TransportButton");
+       punch_out_button.set_name ("TransportButton");
+       click_button.set_name ("TransportButton");
+       time_master_button.set_name ("TransportButton");
+
+       stop_button.set_size_request(29, -1);
+       roll_button.set_size_request(29, -1);
+       auto_loop_button.set_size_request(29, -1);
+       play_selection_button.set_size_request(29, -1);
+       goto_start_button.set_size_request(29, -1);
+       goto_end_button.set_size_request(29, -1);
+       rec_button.set_size_request(29, -1);
+       
+       Widget* w;
 
-       goto_start_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(start_xpm)))));
-       goto_end_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(end_xpm)))));
-       roll_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(arrow_xpm)))));
+       stop_button.set_visual_state (1);
        
-       stop_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(stop_xpm)))));
-       play_selection_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(play_selection_xpm)))));
-       rec_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(rec_xpm)))));
-       auto_loop_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(loop_xpm)))));
+       w = manage (new Image (get_icon (X_("transport_start"))));
+       w->show();
+       goto_start_button.add (*w);
+       w = manage (new Image (get_icon (X_("transport_end"))));
+       w->show();
+       goto_end_button.add (*w);
+       w = manage (new Image (get_icon (X_("transport_play"))));
+       w->show();
+       roll_button.add (*w);
+       w = manage (new Image (get_icon (X_("transport_stop"))));
+       w->show();
+       stop_button.add (*w);
+       w = manage (new Image (get_icon (X_("transport_range"))));
+       w->show();
+       play_selection_button.add (*w);
+       w = manage (new Image (get_icon (X_("transport_record"))));
+       w->show();
+       rec_button.add (*w);
+       w = manage (new Image (get_icon (X_("transport_loop"))));
+       w->show();
+       auto_loop_button.add (*w);
+
+       RefPtr<Action> act;
+
+       act = ActionManager::get_action (X_("Transport"), X_("Stop"));
+       act->connect_proxy (stop_button);
+       act = ActionManager::get_action (X_("Transport"), X_("Roll"));
+       act->connect_proxy (roll_button);
+       act = ActionManager::get_action (X_("Transport"), X_("Record"));
+       act->connect_proxy (rec_button);
+       act = ActionManager::get_action (X_("Transport"), X_("GotoStart"));
+       act->connect_proxy (goto_start_button);
+       act = ActionManager::get_action (X_("Transport"), X_("GotoEnd"));
+       act->connect_proxy (goto_end_button);
+       act = ActionManager::get_action (X_("Transport"), X_("Loop"));
+       act->connect_proxy (auto_loop_button);
+       act = ActionManager::get_action (X_("Transport"), X_("PlaySelection"));
+       act->connect_proxy (play_selection_button);
+       act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster"));
+       act->connect_proxy (time_master_button);
 
        ARDOUR_UI::instance()->tooltips().set_tip (roll_button, _("Play from playhead"));
        ARDOUR_UI::instance()->tooltips().set_tip (stop_button, _("Stop playback"));
@@ -218,116 +291,49 @@ ARDOUR_UI::setup_transport ()
        ARDOUR_UI::instance()->tooltips().set_tip (goto_start_button, _("Go to start of session"));
        ARDOUR_UI::instance()->tooltips().set_tip (goto_end_button, _("Go to end of session"));
        ARDOUR_UI::instance()->tooltips().set_tip (auto_loop_button, _("Play loop range"));
+
        ARDOUR_UI::instance()->tooltips().set_tip (auto_return_button, _("Return to last playback start when stopped"));
        ARDOUR_UI::instance()->tooltips().set_tip (auto_play_button, _("Start playback after any locate"));
        ARDOUR_UI::instance()->tooltips().set_tip (auto_input_button, _("Be sensible about input monitoring"));
        ARDOUR_UI::instance()->tooltips().set_tip (punch_in_button, _("Start recording at auto-punch start"));
        ARDOUR_UI::instance()->tooltips().set_tip (punch_out_button, _("Stop recording at auto-punch end"));
        ARDOUR_UI::instance()->tooltips().set_tip (click_button, _("Enable/Disable audio click"));
-       ARDOUR_UI::instance()->tooltips().set_tip (follow_button, _("Enable/Disable follow playhead"));
+       ARDOUR_UI::instance()->tooltips().set_tip (sync_option_combo, _("Positional sync source"));
+       ARDOUR_UI::instance()->tooltips().set_tip (time_master_button, _("Does Ardour control the time?"));
        ARDOUR_UI::instance()->tooltips().set_tip (shuttle_box, _("Shuttle speed control"));
        ARDOUR_UI::instance()->tooltips().set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display"));
-       ARDOUR_UI::instance()->tooltips().set_tip (shuttle_style_button, _("Select sprung or wheel behaviour"));
        ARDOUR_UI::instance()->tooltips().set_tip (speed_display_box, _("Current transport speed"));
        
        shuttle_box.set_flags (CAN_FOCUS);
-       shuttle_box.set_events (shuttle_box.get_events() | Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK);
+       shuttle_box.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK);
        shuttle_box.set_size_request (100, 15);
 
-       shuttle_box.set_name ("TransportButton");
-       goto_start_button.set_name ("TransportButton");
-       goto_end_button.set_name ("TransportButton");
-       roll_button.set_name ("TransportButton");
-       stop_button.set_name ("TransportButton");
-       play_selection_button.set_name ("TransportButton");
-       rec_button.set_name ("TransportRecButton");
-       auto_loop_button.set_name ("TransportButton");
-       auto_return_button.set_name ("TransportButton");
-       auto_play_button.set_name ("TransportButton");
-       auto_input_button.set_name ("TransportButton");
-       punch_in_button.set_name ("TransportButton");
-       punch_out_button.set_name ("TransportButton");
-       click_button.set_name ("TransportButton");
-       follow_button.set_name ("TransportButton");
-       
-       goto_start_button.unset_flags (Gtk::CAN_FOCUS);
-       goto_end_button.unset_flags (Gtk::CAN_FOCUS);
-       roll_button.unset_flags (Gtk::CAN_FOCUS);
-       stop_button.unset_flags (Gtk::CAN_FOCUS);
-       play_selection_button.unset_flags (Gtk::CAN_FOCUS);
-       rec_button.unset_flags (Gtk::CAN_FOCUS);
-       auto_loop_button.unset_flags (Gtk::CAN_FOCUS);
-       auto_return_button.unset_flags (Gtk::CAN_FOCUS);
-       auto_play_button.unset_flags (Gtk::CAN_FOCUS);
-       auto_input_button.unset_flags (Gtk::CAN_FOCUS);
-       punch_out_button.unset_flags (Gtk::CAN_FOCUS);
-       punch_in_button.unset_flags (Gtk::CAN_FOCUS);
-       click_button.unset_flags (Gtk::CAN_FOCUS);
-       follow_button.unset_flags (Gtk::CAN_FOCUS);
-       
-       goto_start_button.set_events (goto_start_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       goto_end_button.set_events (goto_end_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       roll_button.set_events (roll_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       stop_button.set_events (stop_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       play_selection_button.set_events (play_selection_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       rec_button.set_events (rec_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       auto_loop_button.set_events (auto_loop_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       auto_return_button.set_events (auto_return_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       auto_play_button.set_events (auto_play_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       auto_input_button.set_events (auto_input_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       click_button.set_events (click_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       follow_button.set_events (click_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       punch_in_button.set_events (punch_in_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-       punch_out_button.set_events (punch_out_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
-
-       goto_start_button.signal_clicked().connect (mem_fun(*this,&ARDOUR_UI::transport_goto_start));
-       goto_end_button.signal_clicked().connect (mem_fun(*this,&ARDOUR_UI::transport_goto_end));
-
-       roll_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_roll));
-       play_selection_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_play_selection));
-       auto_loop_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_loop));
-
-       stop_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_stop));
-       rec_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_record));
-
        shuttle_box.signal_button_press_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press));
        shuttle_box.signal_button_release_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release));
+       shuttle_box.signal_scroll_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_scroll));
        shuttle_box.signal_motion_notify_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion));
        shuttle_box.signal_expose_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_expose));
 
        /* clocks, etc. */
 
-       ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), false));
-       ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), false));
-
-       primary_clock.set_mode (AudioClock::SMPTE);
-       primary_clock.set_name ("TransportClockDisplay");
-       secondary_clock.set_mode (AudioClock::BBT);
-       secondary_clock.set_name ("TransportClockDisplay");
-
+       ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), 'p'));
+       ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), 's'));
 
        primary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
        secondary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
+       big_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::big_clock_value_changed));
 
        ARDOUR_UI::instance()->tooltips().set_tip (primary_clock, _("Primary clock"));
        ARDOUR_UI::instance()->tooltips().set_tip (secondary_clock, _("secondary clock"));
 
-       /* options */
+       ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button);
+       ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button);
+       ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button);
+       ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button);
+       ActionManager::get_action ("Transport", "TogglePunchIn")->connect_proxy (punch_in_button);
+       ActionManager::get_action ("Transport", "TogglePunchOut")->connect_proxy (punch_out_button);
 
-       auto_return_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_return));
-       auto_play_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_play));
-       auto_input_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_input));
-       click_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_click));
-       follow_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_follow));
-       punch_in_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_in));
-       punch_out_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_out));
-
-       preroll_button.unset_flags (Gtk::CAN_FOCUS);
-       preroll_button.set_events (preroll_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
        preroll_button.set_name ("TransportButton");
-
-       postroll_button.unset_flags (Gtk::CAN_FOCUS);
-       postroll_button.set_events (postroll_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
        postroll_button.set_name ("TransportButton");
 
        preroll_clock.set_mode (AudioClock::MinSec);
@@ -344,38 +350,52 @@ ARDOUR_UI::setup_transport ()
        auditioning_alert_button.set_name ("TransportAuditioningAlert");
        auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
 
-       alert_box.pack_start (solo_alert_button);
-       alert_box.pack_start (auditioning_alert_button);
+       tooltips().set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
+       tooltips().set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
+
+       alert_box.pack_start (solo_alert_button, false, false);
+       alert_box.pack_start (auditioning_alert_button, false, false);
 
-       transport_tearoff_hbox.set_border_width (5);
+       transport_tearoff_hbox.set_border_width (3);
 
        transport_tearoff_hbox.pack_start (goto_start_button, false, false);
        transport_tearoff_hbox.pack_start (goto_end_button, false, false);
 
-       Gtk::Frame* sframe = manage (new Frame);
-       Gtk::VBox*  svbox = manage (new VBox);
-       Gtk::HBox*  shbox = manage (new HBox);
+       Frame* sframe = manage (new Frame);
+       VBox*  svbox = manage (new VBox);
+       HBox*  shbox = manage (new HBox);
 
-       sframe->set_shadow_type (Gtk::SHADOW_IN);
+       sframe->set_shadow_type (SHADOW_IN);
        sframe->add (shuttle_box);
 
        shuttle_box.set_name (X_("ShuttleControl"));
 
        speed_display_box.add (speed_display_label);
-       set_size_request_to_display_given_text (speed_display_box, _("stopped"), 2, 2);
        speed_display_box.set_name (X_("ShuttleDisplay"));
+       set_size_request_to_display_given_text (speed_display_label, X_("> 24.0"), 2, 2);
 
        shuttle_units_button.set_name (X_("ShuttleButton"));
        shuttle_units_button.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::shuttle_unit_clicked));
        
-       shuttle_style_button.set_name (X_("ShuttleButton"));
-       shuttle_style_button.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::shuttle_style_clicked));
+       shuttle_style_button.set_name (X_("ShuttleStyleButton"));
 
-       Gtk::Frame* sdframe = manage (new Frame);
+       vector<string> shuttle_strings;
+       shuttle_strings.push_back (_("sprung"));
+       shuttle_strings.push_back (_("wheel"));
+       set_popdown_strings (shuttle_style_button, shuttle_strings, true);
+       shuttle_style_button.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::shuttle_style_changed));
 
-       sdframe->set_shadow_type (Gtk::SHADOW_IN);
+       Frame* sdframe = manage (new Frame);
+
+       sdframe->set_shadow_type (SHADOW_IN);
        sdframe->add (speed_display_box);
 
+       mtc_port_changed ();
+       sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed));
+       // XXX HOW TO USE set_popdown_strings() and combo_fudge with this when we don't know
+       // the real strings till later?
+       set_size_request_to_display_given_text (sync_option_combo, X_("Igternal"), 4+COMBO_FUDGE, 10);
+
        shbox->pack_start (*sdframe, false, false);
        shbox->pack_start (shuttle_units_button, true, true);
        shbox->pack_start (shuttle_style_button, false, false);
@@ -383,81 +403,84 @@ ARDOUR_UI::setup_transport ()
        svbox->pack_start (*sframe, false, false);
        svbox->pack_start (*shbox, false, false);
 
-       transport_tearoff_hbox.pack_start (*svbox, false, false, 5);
+       transport_tearoff_hbox.pack_start (*svbox, false, false, 3);
 
        transport_tearoff_hbox.pack_start (auto_loop_button, false, false);
-       transport_tearoff_hbox.pack_start (play_selection_button, false, false);
+       if (!Profile->get_sae()) {
+               transport_tearoff_hbox.pack_start (play_selection_button, false, false);
+       }
        transport_tearoff_hbox.pack_start (roll_button, false, false);
        transport_tearoff_hbox.pack_start (stop_button, false, false);
-       transport_tearoff_hbox.pack_start (rec_button, false, false, 10);
-
-       transport_tearoff_hbox.pack_start (primary_clock, false, false, 5);
-       transport_tearoff_hbox.pack_start (secondary_clock, false, false, 5);
-
-       transport_tearoff_hbox.pack_start (punch_in_button, false, false);
-       transport_tearoff_hbox.pack_start (punch_out_button, false, false);
-       transport_tearoff_hbox.pack_start (auto_input_button, false, false);
-       transport_tearoff_hbox.pack_start (auto_return_button, false, false);
-       transport_tearoff_hbox.pack_start (auto_play_button, false, false);
-       transport_tearoff_hbox.pack_start (click_button, false, false);
-       transport_tearoff_hbox.pack_start (follow_button, false, false);
-       
-       /* desensitize */
-
-       set_transport_sensitivity (false);
-
-       /* catch up with editor state */
-
-       follow_changed ();
+       transport_tearoff_hbox.pack_start (rec_button, false, false, 6);
 
-//     transport_tearoff_hbox.pack_start (preroll_button, false, false);
-//     transport_tearoff_hbox.pack_start (preroll_clock, false, false);
+       HBox* clock_box = manage (new HBox);
+       clock_box->pack_start (primary_clock, false, false);
+       if (!ARDOUR::Profile->get_small_screen()) {
+               clock_box->pack_start (secondary_clock, false, false);
+       }
 
-//     transport_tearoff_hbox.pack_start (postroll_button, false, false);
-//     transport_tearoff_hbox.pack_start (postroll_clock, false, false);
+       if (!Profile->get_sae()) {
+               VBox* time_controls_box = manage (new VBox);
+               time_controls_box->pack_start (sync_option_combo, false, false);
+               time_controls_box->pack_start (time_master_button, false, false);
+               clock_box->pack_start (*time_controls_box, false, false, 1);
+       }
 
-       transport_tearoff_hbox.pack_start (alert_box, false, false, 5);
-}
+       transport_tearoff_hbox.pack_start (*clock_box, false, false, 0);
 
-void
-ARDOUR_UI::setup_clock ()
-{
-       ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false));
+       HBox* toggle_box = manage(new HBox);
        
-       big_clock_window = new BigClockWindow;
+       VBox* punch_box = manage (new VBox);
+       punch_box->pack_start (punch_in_button, false, false);
+       punch_box->pack_start (punch_out_button, false, false);
+       toggle_box->pack_start (*punch_box, false, false);
+
+       VBox* auto_box = manage (new VBox);
+       auto_box->pack_start (auto_play_button, false, false);
+       auto_box->pack_start (auto_return_button, false, false);
+       toggle_box->pack_start (*auto_box, false, false);
        
-       big_clock_window->set_border_width (0);
-       big_clock_window->add  (big_clock);
-       big_clock_window->set_title (_("ardour: clock"));
+       VBox* io_box = manage (new VBox);
+       io_box->pack_start (auto_input_button, false, false);
+       io_box->pack_start (click_button, false, false);
+       toggle_box->pack_start (*io_box, false, false);
        
-       big_clock_window->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Gtk::Window*>(big_clock_window)));
-       big_clock_window->signal_realize().connect (mem_fun(*this, &ARDOUR_UI::big_clock_realize));
-       big_clock_window->size_allocate.connect (mem_fun(*this, &ARDOUR_UI::big_clock_size_event));
+       /* desensitize */
 
-       big_clock_window->Hiding.connect (mem_fun(*this, &ARDOUR_UI::big_clock_hiding));
-}
+       set_transport_sensitivity (false);
 
-void
-ARDOUR_UI::big_clock_size_event (GtkAllocation *alloc)
-{
-       return;
+//     toggle_box->pack_start (preroll_button, false, false);
+//     toggle_box->pack_start (preroll_clock, false, false);
+
+//     toggle_box->pack_start (postroll_button, false, false);
+//     toggle_box->pack_start (postroll_clock, false, false);
+
+       transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
+       transport_tearoff_hbox.pack_start (alert_box, false, false);
+       
+       if (Profile->get_sae()) {
+               Image* img = manage (new Image ((::get_icon (X_("sae")))));
+               transport_tearoff_hbox.pack_end (*img, false, false, 6);
+       }
 }
 
 void
-ARDOUR_UI::big_clock_realize ()
+ARDOUR_UI::manage_window (Window& win)
 {
-  big_clock_window->get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH|Gdk::DECOR_MAXIMIZE|Gdk::DECOR_MINIMIZE));
+       win.signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), &win));
+       win.signal_enter_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
+       win.signal_leave_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
 }
 
 void
-ARDOUR_UI::detach_tearoff (Gtk::Box* b, Gtk::Widget* w)
+ARDOUR_UI::detach_tearoff (Box* b, Widget* w)
 {
-       editor->ensure_float (*transport_tearoff->tearoff_window());
+//     editor->ensure_float (transport_tearoff->tearoff_window());
        b->remove (*w);
 }
 
 void
-ARDOUR_UI::reattach_tearoff (Gtk::Box* b, Gtk::Widget* w, int32_t n)
+ARDOUR_UI::reattach_tearoff (Box* b, Widget* w, int32_t n)
 {
        b->pack_start (*w);
        b->reorder_child (*w, n);
@@ -483,7 +506,7 @@ ARDOUR_UI::_auditioning_changed (bool onoff)
 void
 ARDOUR_UI::auditioning_changed (bool onoff)
 {
-       Gtkmm2ext::UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
+       UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
 }
 
 void
@@ -511,13 +534,13 @@ ARDOUR_UI::solo_blink (bool onoff)
        
        if (session->soloing()) {
                if (onoff) {
-                       solo_alert_button.set_state (Gtk::STATE_ACTIVE);
+                       solo_alert_button.set_state (STATE_ACTIVE);
                } else {
-                       solo_alert_button.set_state (Gtk::STATE_NORMAL);
+                       solo_alert_button.set_state (STATE_NORMAL);
                }
        } else {
                solo_alert_button.set_active (false);
-               solo_alert_button.set_state (Gtk::STATE_NORMAL);
+               solo_alert_button.set_state (STATE_NORMAL);
        }
 }
 
@@ -530,95 +553,184 @@ ARDOUR_UI::audition_blink (bool onoff)
        
        if (session->is_auditioning()) {
                if (onoff) {
-                       auditioning_alert_button.set_state (Gtk::STATE_ACTIVE);
+                       auditioning_alert_button.set_state (STATE_ACTIVE);
                } else {
-                       auditioning_alert_button.set_state (Gtk::STATE_NORMAL);
+                       auditioning_alert_button.set_state (STATE_NORMAL);
                }
        } else {
                auditioning_alert_button.set_active (false);
-               auditioning_alert_button.set_state (Gtk::STATE_NORMAL);
+               auditioning_alert_button.set_state (STATE_NORMAL);
+       }
+}
+
+void
+ARDOUR_UI::build_shuttle_context_menu ()
+{
+       using namespace Menu_Helpers;
+
+       shuttle_context_menu = new Menu();
+       MenuList& items = shuttle_context_menu->items();
+
+       Menu* speed_menu = manage (new Menu());
+       MenuList& speed_items = speed_menu->items();
+
+       RadioMenuItem::Group group;
+
+       speed_items.push_back (RadioMenuElem (group, "8", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f)));
+       if (shuttle_max_speed == 8.0) {
+               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();        
+       }
+       speed_items.push_back (RadioMenuElem (group, "6", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f)));
+       if (shuttle_max_speed == 6.0) {
+               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();        
+       }
+       speed_items.push_back (RadioMenuElem (group, "4", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f)));
+       if (shuttle_max_speed == 4.0) {
+               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();        
+       }
+       speed_items.push_back (RadioMenuElem (group, "3", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f)));
+       if (shuttle_max_speed == 3.0) {
+               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();        
+       }
+       speed_items.push_back (RadioMenuElem (group, "2", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f)));
+       if (shuttle_max_speed == 2.0) {
+               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();        
        }
+       speed_items.push_back (RadioMenuElem (group, "1.5", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f)));
+       if (shuttle_max_speed == 1.5) {
+               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();        
+       }
+
+       items.push_back (MenuElem (_("Maximum speed"), *speed_menu));
 }
 
+void
+ARDOUR_UI::show_shuttle_context_menu ()
+{
+       if (shuttle_context_menu == 0) {
+               build_shuttle_context_menu ();
+       }
+
+       shuttle_context_menu->popup (1, gtk_get_current_event_time());
+}
+
+void
+ARDOUR_UI::set_shuttle_max_speed (float speed)
+{
+       shuttle_max_speed = speed;
+}
 
 gint
 ARDOUR_UI::shuttle_box_button_press (GdkEventButton* ev)
 {
        if (!session) {
-               return TRUE;
+               return true;
+       }
+
+       if (shuttle_controller_binding_proxy.button_press_handler (ev)) {
+               return true;
+       }
+
+       if (Keyboard::is_context_menu_event (ev)) {
+               show_shuttle_context_menu ();
+               return true;
        }
 
        switch (ev->button) {
        case 1:
-               Gtk::Main::grab_add (shuttle_box);
+               shuttle_box.add_modal_grab ();
                shuttle_grabbed = true;
                mouse_shuttle (ev->x, true);
                break;
 
        case 2:
        case 3:
-               return TRUE;
-               break;
-
-       case 4:
-               break;
-       case 5:
+               return true;
                break;
        }
 
-       return TRUE;
+       return true;
 }
 
 gint
 ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev)
 {
        if (!session) {
-               return TRUE;
+               return true;
        }
-
+       
        switch (ev->button) {
        case 1:
                mouse_shuttle (ev->x, true);
                shuttle_grabbed = false;
-               Gtk::Main::grab_remove (shuttle_box);
-               if (shuttle_behaviour == Sprung) {
-                       shuttle_fract = SHUTTLE_FRACT_SPEED1;
-                       session->request_transport_speed (1.0);
+               shuttle_box.remove_modal_grab ();
+               if (Config->get_shuttle_behaviour() == Sprung) {
+                       if (session->config.get_auto_play() || roll_button.get_visual_state()) {
+                               shuttle_fract = SHUTTLE_FRACT_SPEED1;                           
+                               session->request_transport_speed (1.0);
+                               stop_button.set_visual_state (0);
+                               roll_button.set_visual_state (1);
+                       } else {
+                               shuttle_fract = 0;
+                               session->request_transport_speed (0.0);
+                       }
                        shuttle_box.queue_draw ();
                }
-               return TRUE;
+               return true;
 
        case 2:
                if (session->transport_rolling()) {
                        shuttle_fract = SHUTTLE_FRACT_SPEED1;
                        session->request_transport_speed (1.0);
+                       stop_button.set_visual_state (0);
+                       roll_button.set_visual_state (1);
                } else {
                        shuttle_fract = 0;
                }
                shuttle_box.queue_draw ();
-               return TRUE;
+               return true;
 
        case 3:
-               return TRUE;
+       default:
+               return true;
+
+       }
+
+       use_shuttle_fract (true);
+
+       return true;
+}
+
+gint
+ARDOUR_UI::shuttle_box_scroll (GdkEventScroll* ev)
+{
+       if (!session) {
+               return true;
+       }
+       
+       switch (ev->direction) {
                
-       case 4:
+       case GDK_SCROLL_UP:
                shuttle_fract += 0.005;
                break;
-       case 5:
+       case GDK_SCROLL_DOWN:
                shuttle_fract -= 0.005;
                break;
+       default:
+               /* scroll left/right */
+               return false;
        }
 
        use_shuttle_fract (true);
 
-       return TRUE;
+       return true;
 }
 
 gint
 ARDOUR_UI::shuttle_box_motion (GdkEventMotion* ev)
 {
        if (!session || !shuttle_grabbed) {
-               return TRUE;
+               return true;
        }
 
        return mouse_shuttle (ev->x, false);
@@ -638,37 +750,58 @@ ARDOUR_UI::mouse_shuttle (double x, bool force)
 
        shuttle_fract = distance / half_width;
        use_shuttle_fract (force);
-       return TRUE;
+       return true;
+}
+
+void
+ARDOUR_UI::set_shuttle_fract (double f)
+{
+       shuttle_fract = f;
+       use_shuttle_fract (false);
 }
 
 void
 ARDOUR_UI::use_shuttle_fract (bool force)
 {
-       struct timeval now;
-       struct timeval diff;
+       microseconds_t now = get_microseconds();
        
        /* do not attempt to submit a motion-driven transport speed request
           more than once per process cycle.
         */
 
-       gettimeofday (&now, 0);
-       timersub (&now, &last_shuttle_request, &diff);
-
-       if (!force && (diff.tv_usec + (diff.tv_sec * 1000000)) < engine->usecs_per_cycle()) {
+       if (!force && (last_shuttle_request - now) < (microseconds_t) engine->usecs_per_cycle()) {
                return;
        }
        
        last_shuttle_request = now;
 
-       bool neg = (shuttle_fract < 0.0);
+       if (Config->get_shuttle_units() == Semitones) {
+
+               const double step = 1.0 / 24.0; // range is 24 semitones up & down
+               double semitones;
+               double speed;
+
+               semitones = round (shuttle_fract / step);
+               speed = pow (2.0, (semitones / 12.0));
+
+               session->request_transport_speed (speed);
 
-       double fract = 1 - sqrt (1 - (shuttle_fract * shuttle_fract)); // Formula A1
+       } else {
+
+               bool neg;
+               double fract;
+               
+               neg = (shuttle_fract < 0.0);
+
+               fract = 1 - sqrt (1 - (shuttle_fract * shuttle_fract)); // Formula A1
+
+               if (neg) {
+                       fract = -fract;
+               }
 
-       if (neg) {
-               fract = -fract;
+               session->request_transport_speed (shuttle_max_speed * fract);
        }
 
-       session->request_transport_speed (8.0 * fract); // Formula A2
        shuttle_box.queue_draw ();
 }
 
@@ -676,71 +809,46 @@ gint
 ARDOUR_UI::shuttle_box_expose (GdkEventExpose* event)
 {
        gint x;
-       Gdk::Window win (shuttle_box.get_window());
+       Glib::RefPtr<Gdk::Window> win (shuttle_box.get_window());
 
        /* redraw the background */
 
-       win.draw_rectangle (shuttle_box.get_style()->get_bg_gc (shuttle_box.get_state()),
-                           true,
-                           event->area.x, event->area.y,
-                           event->area.width, event->area.height);
+       win->draw_rectangle (shuttle_box.get_style()->get_bg_gc (shuttle_box.get_state()),
+                            true,
+                            event->area.x, event->area.y,
+                            event->area.width, event->area.height);
 
 
        x = (gint) floor ((shuttle_box.get_width() / 2.0) + (0.5 * (shuttle_box.get_width() * shuttle_fract)));
 
        /* draw line */
 
-       win.draw_line (shuttle_box.get_style()->get_fg_gc (shuttle_box.get_state()),
-                      x,
-                      0,
-                      x,
-                      shuttle_box.get_height());
-       return TRUE;
-}
-
-void
-ARDOUR_UI::shuttle_style_clicked ()
-{
-       shuttle_style_menu.popup (1, 0);
+       win->draw_line (shuttle_box.get_style()->get_fg_gc (shuttle_box.get_state()),
+                       x,
+                       0,
+                       x,
+                       shuttle_box.get_height());
+       return true;
 }
 
 void
 ARDOUR_UI::shuttle_unit_clicked ()
 {
-       shuttle_unit_menu.popup (1, 0);
-}
-
-void
-ARDOUR_UI::set_shuttle_units (ShuttleUnits u)
-{
-       switch ((shuttle_units = u)) {
-       case Percentage:
-               static_cast<Gtk::Label*>(shuttle_units_button.get_child())->set_text ("% ");
-               break;
-       case Semitones:
-               static_cast<Gtk::Label*>(shuttle_units_button.get_child())->set_text (_("st"));
-               break;
+       if (shuttle_unit_menu == 0) {
+               shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
        }
+       shuttle_unit_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
-ARDOUR_UI::set_shuttle_behaviour (ShuttleBehaviour b)
+ARDOUR_UI::shuttle_style_changed ()
 {
-       switch ((shuttle_behaviour = b)) {
-       case Sprung:
-               static_cast<Gtk::Label*>(shuttle_style_button.get_child())->set_text (_("sprung"));
-               shuttle_fract = 0.0;
-               shuttle_box.queue_draw ();
-               if (session) {
-                       if (session->transport_rolling()) {
-                               shuttle_fract = SHUTTLE_FRACT_SPEED1;
-                               session->request_transport_speed (1.0);
-                       }
-               }
-               break;
-       case Wheel:
-               static_cast<Gtk::Label*>(shuttle_style_button.get_child())->set_text (_("wheel"));
-               break;
+       ustring str = shuttle_style_button.get_active_text ();
+
+       if (str == _("sprung")) {
+               Config->set_shuttle_behaviour (Sprung);
+       } else if (str == _("wheel")) {
+               Config->set_shuttle_behaviour (Wheel);
        }
 }
 
@@ -748,38 +856,83 @@ void
 ARDOUR_UI::update_speed_display ()
 {
        if (!session) {
-               speed_display_label.set_text (_("stopped"));
+               if (last_speed_displayed != 0) {
+                       speed_display_label.set_text (_("stop"));
+                       last_speed_displayed = 0;
+               }
                return;
        }
 
        char buf[32];
        float x = session->transport_speed ();
 
-       if (x != 0) {
-               if (shuttle_units == Percentage) {
-                       snprintf (buf, sizeof (buf), "%.4f", x);
-               } else {
-                       if (x < 0) {
-                               snprintf (buf, sizeof (buf), "< %.1f", 12.0 * fast_log2 (-x));
+       if (x != last_speed_displayed) {
+
+               if (x != 0) {
+                       if (Config->get_shuttle_units() == Percentage) {
+                               snprintf (buf, sizeof (buf), "%.2f", x);
                        } else {
-                               snprintf (buf, sizeof (buf), "> %.1f", 12.0 * fast_log2 (x));
+
+                               if (x < 0) {
+                                       snprintf (buf, sizeof (buf), "< %d", (int) round (12.0 * fast_log2 (-x)));
+                               } else {
+                                       snprintf (buf, sizeof (buf), "> %d", (int) round (12.0 * fast_log2 (x)));
+                               }
                        }
+                       speed_display_label.set_text (buf);
+               } else {
+                       speed_display_label.set_text (_("stop"));
                }
-               speed_display_label.set_text (buf);
-       } else {
-               speed_display_label.set_text (_("stopped"));
+
+               last_speed_displayed = x;
        }
 }      
        
 void
 ARDOUR_UI::set_transport_sensitivity (bool yn)
 {
-       goto_start_button.set_sensitive (yn);
-       goto_end_button.set_sensitive (yn);
-       roll_button.set_sensitive (yn);
-       stop_button.set_sensitive (yn);
-       play_selection_button.set_sensitive (yn);
-       rec_button.set_sensitive (yn);
-       auto_loop_button.set_sensitive (yn);
+       ActionManager::set_sensitive (ActionManager::transport_sensitive_actions, yn);
        shuttle_box.set_sensitive (yn);
 }
+
+void
+ARDOUR_UI::editor_realized ()
+{
+       Config->map_parameters (mem_fun (*this, &ARDOUR_UI::parameter_changed));
+
+       set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2);
+       reset_dpi ();
+}
+
+void
+ARDOUR_UI::sync_option_changed ()
+{
+       if (session) {
+               ustring txt = sync_option_combo.get_active_text ();
+               if (txt.length()) {
+                       session->request_slave_source (string_to_slave_source (txt));
+               }
+       }
+}
+
+void
+ARDOUR_UI::maximise_editing_space ()
+{
+       if (!editor) {
+               return;
+       }
+
+       transport_tearoff->set_visible (false);
+       editor->maximise_editing_space ();
+}
+
+void
+ARDOUR_UI::restore_editing_space ()
+{
+       if (!editor) {
+               return;
+       }
+
+       transport_tearoff->set_visible (true);
+       editor->restore_editing_space ();
+}