Stop crossfades disappearing on region view drags.
[ardour.git] / gtk2_ardour / ardour_ui_ed.cc
index e53e00f4ad5129c5aa557b3df9d2f22390d794f1..f8bf0a2be42b27d85d300cfab464602261630820 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 20002-2004 Paul Davis 
+    Copyright (C) 20002-2004 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
@@ -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$
 */
 
 /* This file contains any ARDOUR_UI methods that require knowledge of
    is to cut down on the nasty compile times for both these classes.
 */
 
-#include <pbd/pathscanner.h>
+#include "pbd/file_utils.h"
+#include "pbd/fpu.h"
+
+#include <glibmm/miscutils.h>
+
+#include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/window_title.h>
+#include <gtk/gtk.h>
 
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "audio_clock.h"
+#include "engine_dialog.h"
 #include "editor.h"
+#include "actions.h"
+#include "mixer_ui.h"
+#include "utils.h"
+
+#ifdef GTKOSX
+#include <gtkmm2ext/sync-menu.h>
+#endif
 
-#include <ardour/session.h>
+#include "ardour/session.h"
+#include "ardour/profile.h"
+#include "ardour/audioengine.h"
+#include "ardour/control_protocol_manager.h"
+
+#include "control_protocol/control_protocol.h"
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
-using namespace Gtk;
+using namespace PBD;
 using namespace Gtkmm2ext;
+using namespace Gtk;
+using namespace Glib;
 
 int
 ARDOUR_UI::create_editor ()
 
 {
        try {
-               editor = new Editor (*engine);
+               editor = new Editor ();
        }
 
        catch (failed_constructor& err) {
                return -1;
        }
 
-       editor->DisplayControlChanged.connect (mem_fun(*this, &ARDOUR_UI::editor_display_control_changed));
+       editor->Realized.connect (sigc::mem_fun (*this, &ARDOUR_UI::editor_realized));
+       editor->signal_window_state_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), true));
 
        return 0;
 }
 
 void
-ARDOUR_UI::build_menu_bar ()
-
+ARDOUR_UI::install_actions ()
 {
-       using namespace Menu_Helpers;
+       Glib::RefPtr<ActionGroup> main_actions = ActionGroup::create (X_("Main"));
+       Glib::RefPtr<Action> act;
+
+       /* menus + submenus that need action items */
+
+       ActionManager::register_action (main_actions, X_("Session"), _("Session"));
+       act = ActionManager::register_action (main_actions, X_("Cleanup"), _("Cleanup"));
+       ActionManager::write_sensitive_actions.push_back (act);
+       ActionManager::register_action (main_actions, X_("Sync"), _("Sync"));
+       ActionManager::register_action (main_actions, X_("TransportOptions"), _("Options"));
+       ActionManager::register_action (main_actions, X_("Help"), _("Help"));
+       ActionManager::register_action (main_actions, X_("KeyMouseActions"), _("Misc. Shortcuts"));
+       ActionManager::register_action (main_actions, X_("AudioFileFormat"), _("Audio File Format"));
+       ActionManager::register_action (main_actions, X_("AudioFileFormatHeader"), _("File Type"));
+       ActionManager::register_action (main_actions, X_("AudioFileFormatData"), _("Sample Format"));
+       ActionManager::register_action (main_actions, X_("ControlSurfaces"), _("Control Surfaces"));
+       ActionManager::register_action (main_actions, X_("Plugins"), _("Plugins"));
+       ActionManager::register_action (main_actions, X_("Metering"), _("Metering"));
+       ActionManager::register_action (main_actions, X_("MeteringFallOffRate"), _("Fall Off Rate"));
+       ActionManager::register_action (main_actions, X_("MeteringHoldTime"), _("Hold Time"));
+       ActionManager::register_action (main_actions, X_("Denormals"), _("Denormal Handling"));
+
+       /* the real actions */
+
+       act = ActionManager::register_action (main_actions, X_("New"), _("New..."),  hide_return (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::get_session_parameters), false, true)));
+
+       ActionManager::register_action (main_actions, X_("Open"), _("Open..."),  sigc::mem_fun(*this, &ARDOUR_UI::open_session));
+       ActionManager::register_action (main_actions, X_("Recent"), _("Recent..."),  sigc::mem_fun(*this, &ARDOUR_UI::open_recent_session));
+       act = ActionManager::register_action (main_actions, X_("Close"), _("Close"),  sigc::mem_fun(*this, &ARDOUR_UI::close_session));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track/Bus..."),
+                                             sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::write_sensitive_actions.push_back (act);
+
+#ifdef WITH_CMT
+
+       sys::path anicomp_file_path;
+
+       if (PBD::find_file_in_search_path (Glib::getenv("PATH"), "AniComp", anicomp_file_path)) {
+               act = ActionManager::register_action (main_actions, X_("aniConnect"), _("Connect"),  (sigc::mem_fun (*editor, &PublicEditor::connect_to_image_compositor)));
+               ActionManager::session_sensitive_actions.push_back (act);
+       }
 
-       menu_bar->set_name ("MainMenuBar");
+#endif
 
-       MenuList& items = menu_bar->items();
-
-       /* file menu */
-       
-       Menu *session_menu = manage (new Menu);
-       MenuList& session_items = session_menu->items();
-       session_menu->set_name ("ArdourContextMenu");
-
-       session_items.push_back (MenuElem (_("New"), bind (mem_fun(*this, &ARDOUR_UI::new_session), false, string ())));
-       session_items.push_back (MenuElem (_("Open"), mem_fun(*this, &ARDOUR_UI::open_session)));
-       session_items.push_back (MenuElem (_("Recent"), mem_fun(*this, &ARDOUR_UI::open_recent_session)));
-       session_items.push_back (MenuElem (_("Close"), mem_fun(*this, &ARDOUR_UI::close_session)));
-       close_item = &session_items.back();
-       close_item->set_sensitive (false);
-
-       session_items.push_back (SeparatorElem());
-
-       session_items.push_back (MenuElem (_("Add Track/Bus"), mem_fun(*this, &ARDOUR_UI::add_route)));
-       add_track_item = &session_items.back ();
-       add_track_item->set_sensitive (false);
-
-       session_items.push_back (SeparatorElem());
-       
-       /* <CMT Additions> */
-
-       PathScanner scanner;
-       vector<string*>* results = scanner (getenv ("PATH"), "AniComp", false, false);
-
-       if (results && !results->empty()) {
-               Menu* image_compositor_menu = manage(new Menu());
-               MenuList& image_compositor_items = image_compositor_menu->items();
-               image_compositor_menu->set_name ("ArdourContextMenu");
-               image_compositor_items.push_back(MenuElem (_("Connect"), (mem_fun (editor, &PublicEditor::connect_to_image_compositor)))) ;
-               session_items.push_back(MenuElem (_("Image Compositor"), *image_compositor_menu)) ;
-               image_compositor_item = &session_items.back() ;
-               image_compositor_item->set_sensitive(false) ;
-               session_items.push_back (SeparatorElem());
-       } else {
-               image_compositor_item = 0;
-       }
+       act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot..."),  sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::write_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("SaveTemplate"), _("Save Template..."),  sigc::mem_fun(*this, &ARDOUR_UI::save_template));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("Metadata"), _("Metadata"));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("EditMetadata"), _("Edit Metadata..."),  sigc::mem_fun(*this, &ARDOUR_UI::edit_metadata));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("ImportMetadata"), _("Import Metadata..."),  sigc::mem_fun(*this, &ARDOUR_UI::import_metadata));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("ExportAudio"), _("Export To Audio File(s)..."),  sigc::mem_fun (*editor, &PublicEditor::export_audio));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("Export"), _("Export"));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Cleanup Unused Sources..."),  sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::write_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (main_actions, X_("FlushWastebasket"), _("Flush Wastebasket"),  sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::flush_trash));
+       ActionManager::write_sensitive_actions.push_back (act);
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       /* JACK actions for controlling ... JACK */
+
+       Glib::RefPtr<ActionGroup> jack_actions = ActionGroup::create (X_("JACK"));
+       ActionManager::register_action (jack_actions, X_("JACK"), _("JACK"));
+       ActionManager::register_action (jack_actions, X_("Latency"), _("Latency"));
+
+       act = ActionManager::register_action (jack_actions, X_("JACKReconnect"), _("Reconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::reconnect_to_jack));
+       ActionManager::jack_opposite_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (jack_actions, X_("JACKDisconnect"), _("Disconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::disconnect_from_jack));
+       ActionManager::jack_sensitive_actions.push_back (act);
+
+       RadioAction::Group jack_latency_group;
+
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 32));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 64));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 128));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 256));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 512));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 1024));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 2048));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 4096));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 8192));
+       ActionManager::jack_sensitive_actions.push_back (act);
+
+       /* these actions are intended to be shared across all windows */
+
+       common_actions = ActionGroup::create (X_("Common"));
+       ActionManager::register_action (main_actions, X_("WindowMenu"), _("Window"));
+       ActionManager::register_action (common_actions, X_("Quit"), _("Quit"), (hide_return (sigc::mem_fun(*this, &ARDOUR_UI::finish))));
+
+        /* windows visibility actions */
+
+       ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalEditor"), _("Maximise Editor Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_editing_space));
+
+       ActionManager::register_action (common_actions, X_("goto-editor"), _("Show Editor"),  sigc::mem_fun(*this, &ARDOUR_UI::goto_editor_window));
+       ActionManager::register_action (common_actions, X_("goto-mixer"), _("Show Mixer"),  sigc::mem_fun(*this, &ARDOUR_UI::goto_mixer_window));
+       ActionManager::register_action (common_actions, X_("toggle-editor-mixer-on-top"), _("Toggle Editor Mixer on Top"),  sigc::mem_fun(*this, &ARDOUR_UI::toggle_editor_mixer_on_top));
+       ActionManager::register_toggle_action (common_actions, X_("ToggleRCOptionsEditor"), _("Preferences"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_rc_options_window));
+       ActionManager::register_toggle_action (common_actions, X_("ToggleSessionOptionsEditor"), _("Preferences"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_options_window));
+       act = ActionManager::register_toggle_action (common_actions, X_("ToggleInspector"), _("Track/Bus Inspector"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_route_params_window));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (common_actions, X_("ToggleLocations"), _("Locations"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_location_window));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (common_actions, X_("ToggleBigClock"), _("Big Clock"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_big_clock_window));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::register_action (common_actions, X_("About"), _("About"),  sigc::mem_fun(*this, &ARDOUR_UI::show_about));
+       ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_theme_manager));
+       ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Key Bindings"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
+       ActionManager::register_toggle_action (common_actions, X_("ToggleBundleManager"), _("Bundle Manager"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_bundle_manager));
 
-       if (results) {
-               delete results;
-       }
+#if 0
+       act = ActionManager::register_action (common_actions, X_("AddAudioTrack"), _("Add Audio Track"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, (ARDOUR::RouteGroup *) 0, 1));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("AddAudioBus"), _("Add Audio Bus"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::session_add_audio_bus), 1, 1, (ARDOUR::RouteGroup *) 0, 1));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("AddMIDITrack"), _("Add MIDI Track"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::session_add_midi_track), (ARDOUR::RouteGroup *) 0, 1));
+       ActionManager::session_sensitive_actions.push_back (act);
+       //act = ActionManager::register_action (common_actions, X_("AddMidiBus"), _("Add Midi Bus"), sigc::mem_fun(*this, &ARDOUR_UI::session_add_midi_bus));
+       //ActionManager::session_sensitive_actions.push_back (act);
+#endif
+       act = ActionManager::register_action (common_actions, X_("Save"), _("Save"),  sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::save_state), string("")));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::write_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("RemoveLastCapture"), _("Remove Last Capture"), sigc::mem_fun(*this, &ARDOUR_UI::remove_last_capture));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       Glib::RefPtr<ActionGroup> transport_actions = ActionGroup::create (X_("Transport"));
+
+       /* do-nothing action for the "transport" menu bar item */
+
+       ActionManager::register_action (transport_actions, X_("Transport"), _("Transport"));
+
+       /* these two are not used by key bindings, instead use ToggleRoll for that. these two do show up in
+          menus and via button proxies.
+       */
+
+       act = ActionManager::register_action (transport_actions, X_("Stop"), _("Stop"), sigc::mem_fun(*this, &ARDOUR_UI::transport_stop));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("Roll"), _("Roll"), sigc::mem_fun(*this, &ARDOUR_UI::transport_roll));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("ToggleRollMaybe"), _("Start/Continue/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_roll), false, true));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("ToggleRollForgetCapture"), _("Stop + Forget Capture"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+
+       /* these two behave as follows:
+
+          - if transport speed != 1.0 or != -1.0, change speed to 1.0 or -1.0 (respectively)
+          - otherwise do nothing
+       */
+
+       act = ActionManager::register_action (transport_actions, X_("TransitionToRoll"), _("Transition To Roll"), sigc::bind (sigc::mem_fun (*editor, &PublicEditor::transition_to_rolling), true));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (transport_actions, X_("TransitionToReverse"), _("Transition To Reverse"), sigc::bind (sigc::mem_fun (*editor, &PublicEditor::transition_to_rolling), false));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (transport_actions, X_("Loop"), _("Play Loop Range"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_auto_loop));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("PlaySelection"), _("Play Selection"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_selection));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (transport_actions, X_("Record"), _("Enable Record"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_record), false));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::write_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("record-roll"), _("Start Recording"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_record), true));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::write_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("Rewind"), _("Rewind"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_rewind), 0));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("RewindSlow"), _("Rewind (Slow)"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_rewind), -1));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("RewindFast"), _("Rewind (Fast)"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_rewind), 1));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("Forward"), _("Forward"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_forward), 0));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("ForwardSlow"), _("Forward (Slow)"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_forward), -1));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("ForwardFast"), _("Forward (Fast)"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_forward), 1));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("GotoZero"), _("Goto Zero"), sigc::mem_fun(*this, &ARDOUR_UI::transport_goto_zero));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("GotoStart"), _("Goto Start"), sigc::mem_fun(*this, &ARDOUR_UI::transport_goto_start));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("GotoEnd"), _("Goto End"), sigc::mem_fun(*this, &ARDOUR_UI::transport_goto_end));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("GotoWallClock"), _("Goto Wall Clock"), sigc::mem_fun(*this, &ARDOUR_UI::transport_goto_wallclock));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (transport_actions, X_("focus-on-clock"), _("Focus On Clock"), sigc::mem_fun(primary_clock, &AudioClock::focus));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (transport_actions, X_("primary-clock-bbt"), _("Bars & Beats"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::BBT));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("primary-clock-minsec"), _("Minutes & Seconds"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::MinSec));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("primary-clock-samples"), _("Samples"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Frames));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("primary-clock-off"), _("Off"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Off));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (transport_actions, X_("secondary-clock-bbt"), _("Bars & Beats"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::BBT));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("secondary-clock-minsec"), _("Minutes & Seconds"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::MinSec));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("secondary-clock-samples"), _("Samples"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Frames));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (transport_actions, X_("secondary-clock-off"), _("Off"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Off));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchIn"), _("Punch In"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch_in));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchOut"), _("Punch Out"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch_out));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunch"), _("Punch In/Out"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleClick"), _("Click"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_click));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoInput"), _("Auto Input"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_auto_input));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoPlay"), _("Auto Play"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_auto_play));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoReturn"), _("Auto Return"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_auto_return));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::transport_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleVideoSync"), _("Sync startup to video"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_video_sync));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time Master"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_time_master));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleExternalSync"), _(""), sigc::mem_fun(*this, &ARDOUR_UI::toggle_external_sync));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  0U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack2"), _("Toggle Record Enable Track2"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  1U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack3"), _("Toggle Record Enable Track3"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  2U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack4"), _("Toggle Record Enable Track4"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  3U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack5"), _("Toggle Record Enable Track5"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  4U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack6"), _("Toggle Record Enable Track6"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  5U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack7"), _("Toggle Record Enable Track7"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  6U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack8"), _("Toggle Record Enable Track8"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  7U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack9"), _("Toggle Record Enable Track9"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  8U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack10"), _("Toggle Record Enable Track10"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 9U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack11"), _("Toggle Record Enable Track11"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 10U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack12"), _("Toggle Record Enable Track12"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 11U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack13"), _("Toggle Record Enable Track13"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 12U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack14"), _("Toggle Record Enable Track14"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 13U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack15"), _("Toggle Record Enable Track15"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 14U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack16"), _("Toggle Record Enable Track16"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 15U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack17"), _("Toggle Record Enable Track17"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 16U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack18"), _("Toggle Record Enable Track18"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 17U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack19"), _("Toggle Record Enable Track19"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 18U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack20"), _("Toggle Record Enable Track20"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 19U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack21"), _("Toggle Record Enable Track21"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 20U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack22"), _("Toggle Record Enable Track22"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 21U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack23"), _("Toggle Record Enable Track23"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 22U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack24"), _("Toggle Record Enable Track24"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 23U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack25"), _("Toggle Record Enable Track25"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 24U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack26"), _("Toggle Record Enable Track26"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 25U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack27"), _("Toggle Record Enable Track27"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 26U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack28"), _("Toggle Record Enable Track28"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 27U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack29"), _("Toggle Record Enable Track29"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 28U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack30"), _("Toggle Record Enable Track30"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 29U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack31"), _("Toggle Record Enable Track31"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 30U));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack32"), _("Toggle Record Enable Track32"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 31U));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       Glib::RefPtr<ActionGroup> shuttle_actions = ActionGroup::create ("ShuttleActions");
+
+       shuttle_actions->add (Action::create (X_("SetShuttleUnitsPercentage"), _("Percentage")), hide_return (sigc::bind (sigc::mem_fun (*Config, &RCConfiguration::set_shuttle_units), Percentage)));
+       shuttle_actions->add (Action::create (X_("SetShuttleUnitsSemitones"), _("Semitones")), hide_return (sigc::bind (sigc::mem_fun (*Config, &RCConfiguration::set_shuttle_units), Semitones)));
+
+       Glib::RefPtr<ActionGroup> option_actions = ActionGroup::create ("options");
+
+       act = ActionManager::register_toggle_action (option_actions, X_("SendMTC"), _("Send MTC"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_send_mtc));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (option_actions, X_("SendMMC"), _("Send MMC"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_send_mmc));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (option_actions, X_("UseMMC"), _("Use MMC"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_use_mmc));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (option_actions, X_("SendMidiClock"), _("Send MIDI Clock"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_send_midi_clock));
+       ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (option_actions, X_("SendMIDIfeedback"), _("Send MIDI Feedback"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_send_midi_feedback));
+       ActionManager::session_sensitive_actions.push_back (act);
+
+       ActionManager::add_action_group (shuttle_actions);
+       ActionManager::add_action_group (option_actions);
+       ActionManager::add_action_group (jack_actions);
+       ActionManager::add_action_group (transport_actions);
+       ActionManager::add_action_group (main_actions);
+       ActionManager::add_action_group (common_actions);
+}
 
-       /* </CMT Additions> */
+void
+ARDOUR_UI::set_jack_buffer_size (nframes_t nframes)
+{
+       Glib::RefPtr<Action> action;
+       const char* action_name = 0;
 
-       session_items.push_back (MenuElem (_("Save"), bind (mem_fun(*this, &ARDOUR_UI::save_state), string(""))));
-       save_item = &session_items.back();
-       save_item->set_sensitive (false);
+       switch (nframes) {
+       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;
+       }
 
-       session_items.push_back (MenuElem (_("Snapshot"), mem_fun(*this, &ARDOUR_UI::snapshot_session)));
-       snapshot_item = &session_items.back();
-       snapshot_item->set_sensitive (false);
-/*
-       session_items.push_back (MenuElem (_("Save as...")));
-       save_as_item = session_items.back();
-       save_as_item->set_sensitive (false);
-*/
-       session_items.push_back (MenuElem (_("Save Template..."), mem_fun(*this, &ARDOUR_UI::save_template)));
-       save_template_item = &session_items.back();
-       save_template_item->set_sensitive (false);
-
-       Menu *export_menu = manage (new Menu);
-       MenuList& export_items = export_menu->items();
-       export_menu->set_name ("ArdourContextMenu");
-       export_items.push_back (MenuElem (_("Export session to audiofile..."), mem_fun (*editor, &PublicEditor::export_session)));
-       export_items.push_back (MenuElem (_("Export range to audiofile..."), mem_fun (*editor, &PublicEditor::export_selection)));
-       // export_items.back()->set_sensitive (false);
-
-       session_items.push_back (MenuElem (_("Export"), *export_menu));
-       export_item = &session_items.back();
-       export_item->set_sensitive (false);
-
-       session_items.push_back (SeparatorElem());
-
-       Menu *cleanup_menu = manage (new Menu);
-       MenuList& cleanup_items = cleanup_menu->items();
-       cleanup_menu->set_name ("ArdourContextMenu");
-       cleanup_items.push_back (MenuElem (_("Cleanup unused sources"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup)));
-       cleanup_items.push_back (MenuElem (_("Flush wastebasket"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::flush_trash)));
-
-       session_items.push_back (MenuElem (_("Cleanup"), *cleanup_menu));
-       cleanup_item = &session_items.back ();
-       cleanup_item->set_sensitive (false);
-
-       session_items.push_back (SeparatorElem());
-
-       session_items.push_back (MenuElem (_("Quit"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::finish)));
-
-       items.push_back (MenuElem (_("Session"), *session_menu));
-
-       /* edit menu; the editor is responsible for the contents */
-
-       Menu *edit_menu = manage (new Menu);
-       editor->set_edit_menu (*edit_menu);
-       items.push_back (MenuElem (_("Edit"), *edit_menu));
-       edit_menu->set_name ("ArdourContextMenu");
-       
-       /* JACK menu for controlling ... JACK */
-
-       Menu* jack_menu = manage (new Menu);
-       MenuList& jack_items = jack_menu->items();
-       jack_menu->set_name ("ArdourContextMenu");
-       
-       jack_items.push_back (MenuElem (_("Disconnect"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::disconnect_from_jack)));
-       jack_disconnect_item = &jack_items.back();
-       jack_disconnect_item->set_sensitive (false);
-       jack_items.push_back (MenuElem (_("Reconnect"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::reconnect_to_jack)));
-       jack_reconnect_item = &jack_items.back();
-       jack_reconnect_item->set_sensitive (false);
-
-       jack_bufsize_menu = manage (new Menu);
-       MenuList& jack_bufsize_items = jack_bufsize_menu->items();
-       jack_bufsize_menu->set_name ("ArdourContextMenu");
-
-       jack_bufsize_items.push_back (MenuElem (X_("32"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 32)));
-       jack_bufsize_items.push_back (MenuElem (X_("64"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 64)));
-       jack_bufsize_items.push_back (MenuElem (X_("128"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 128)));
-       jack_bufsize_items.push_back (MenuElem (X_("256"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 256)));
-       jack_bufsize_items.push_back (MenuElem (X_("512"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 512)));
-       jack_bufsize_items.push_back (MenuElem (X_("1024"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 1024)));
-       jack_bufsize_items.push_back (MenuElem (X_("2048"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 2048)));
-       jack_bufsize_items.push_back (MenuElem (X_("4096"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 4096)));
-       jack_bufsize_items.push_back (MenuElem (X_("8192"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 8192)));
-
-       jack_items.push_back (MenuElem (_("Latency"), *jack_bufsize_menu));
-       jack_bufsize_menu->set_sensitive (false);
-
-       items.push_back (MenuElem (_("JACK"), *jack_menu));
-       
-       /* windows menu */
-
-       Menu *window_menu = new Menu();
-       MenuList& window_items = window_menu->items();
-       window_menu->set_name ("ArdourContextMenu");
-       
-       window_items.push_back (TearoffMenuElem());
-
-       window_items.push_back (MenuElem (_("Editor"), mem_fun(*this, &ARDOUR_UI::goto_editor_window)));
-       window_items.push_back (MenuElem (_("Mixer"), mem_fun(*this, &ARDOUR_UI::goto_mixer_window)));
-
-       window_items.push_back (SeparatorElem());
-
-       window_items.push_back 
-               (CheckMenuElem 
-                (_("Options Editor"),
-                 mem_fun(*this, &ARDOUR_UI::toggle_options_window)));
-        options_window_check = dynamic_cast<CheckMenuItem*>(&window_items.back());
-       // options_window_check->set_sensitive (false);
-
-       window_items.push_back
-               (CheckMenuElem
-                (_("Audio Library"),
-                 mem_fun(*this, &ARDOUR_UI::toggle_sfdb_window)));
-       sfdb_check = dynamic_cast<CheckMenuItem*>(&window_items.back());
-
-       window_items.push_back 
-               (CheckMenuElem 
-                (_("Track/Bus Inspector"),
-                 mem_fun(*this, &ARDOUR_UI::toggle_route_params_window)));
-       route_params_check = dynamic_cast<CheckMenuItem*>(&window_items.back());
-       route_params_check->set_sensitive (false);
-
-       window_items.push_back 
-               (CheckMenuElem 
-                (_("Connections"),
-                 mem_fun(*this, &ARDOUR_UI::toggle_connection_editor)));
-       connection_editor_check = dynamic_cast<CheckMenuItem*>(&window_items.back());
-       connection_editor_check->set_sensitive (false);
+       if (action_name) {
 
-#if 0
-       window_items.push_back 
-               (CheckMenuElem 
-                (_("Meter Bridge"),
-                 mem_fun(*this, &ARDOUR_UI::toggle_meter_bridge_window)));
-       meter_bridge_dialog_check = dynamic_cast<CheckMenuItem*>(&window_items.back());
-       meter_bridge_dialog_check->set_sensitive (false);
-#endif
+               action = ActionManager::get_action (X_("JACK"), action_name);
 
-       window_items.push_back 
-               (CheckMenuElem 
-                (_("Locations"),
-                 mem_fun(*this, &ARDOUR_UI::toggle_location_window)));
-       locations_dialog_check = dynamic_cast<CheckMenuItem*>(&window_items.back());
-       locations_dialog_check->set_sensitive (false);
+               if (action) {
+                       Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action);
 
-       window_items.push_back 
-               (CheckMenuElem 
-                (_("Big Clock"),
-                 mem_fun(*this, &ARDOUR_UI::toggle_big_clock_window)));
-       big_clock_check = dynamic_cast<CheckMenuItem*>(&window_items.back());
+                       if (ract && ract->get_active()) {
+                               engine->request_buffer_size (nframes);
+                               update_sample_rate (0);
+                       }
+               }
+       }
+}
 
-       window_items.push_back (SeparatorElem());
+void
+ARDOUR_UI::build_menu_bar ()
+{
+       menu_bar = dynamic_cast<MenuBar*> (ActionManager::get_widget (X_("/Main")));
+       menu_bar->set_name ("MainMenuBar");
 
-       window_items.push_back (MenuElem (_("About"), mem_fun(*this, &ARDOUR_UI::show_splash)));
-       
-       
-       items.push_back (MenuElem (_("Windows"), *window_menu));
+       /*
+        * This is needed because this property does not get installed
+        * until the Menu GObject class is registered, which happens
+        * when the first menu instance is created.
+        */
+       // XXX bug in gtkmm causes this to popup an error message
+       // Gtk::Settings::get_default()->property_gtk_can_change_accels() = true;
+       // so use this instead ...
+       gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers");
 
        wall_clock_box.add (wall_clock_label);
        wall_clock_box.set_name ("WallClock");
@@ -280,36 +546,70 @@ ARDOUR_UI::build_menu_bar ()
        buffer_load_box.set_name ("BufferLoad");
        buffer_load_label.set_name ("BufferLoad");
 
-//     disk_rate_box.add (disk_rate_label);
-//     disk_rate_box.set_name ("DiskRate");
-//     disk_rate_label.set_name ("DiskRate");
-
        sample_rate_box.add (sample_rate_label);
        sample_rate_box.set_name ("SampleRate");
        sample_rate_label.set_name ("SampleRate");
 
-       menu_hbox.pack_start (*menu_bar, true, true);
-       menu_hbox.pack_end (wall_clock_box, false, false, 10);
-       menu_hbox.pack_end (disk_space_box, false, false, 10);
-       menu_hbox.pack_end (cpu_load_box, false, false, 10);
-//     menu_hbox.pack_end (disk_rate_box, false, false, 10);
-       menu_hbox.pack_end (buffer_load_box, false, false, 10);
-       menu_hbox.pack_end (sample_rate_box, false, false, 10);
+#ifndef TOP_MENUBAR
+       menu_hbox.pack_start (*menu_bar, true, true);
+#else
+       use_menubar_as_top_menubar ();
+#endif
+
+       if (!Profile->get_small_screen()) {
+#ifndef GTKOSX
+               // OSX provides its own wallclock, thank you very much
+               menu_hbox.pack_end (wall_clock_box, false, false, 2);
+#endif
+               menu_hbox.pack_end (disk_space_box, false, false, 4);
+       }
+
+       menu_hbox.pack_end (cpu_load_box, false, false, 4);
+       menu_hbox.pack_end (buffer_load_box, false, false, 4);
+       menu_hbox.pack_end (sample_rate_box, false, false, 4);
 
        menu_bar_base.set_name ("MainMenuBar");
        menu_bar_base.add (menu_hbox);
 }
 
+void
+ARDOUR_UI::use_menubar_as_top_menubar ()
+{
+#ifdef GTKOSX
+       ige_mac_menu_set_menu_bar ((GtkMenuShell*) menu_bar->gobj());
+       // ige_mac_menu_set_quit_menu_item (some_item->gobj());
+#endif
+}
 
 void
-ARDOUR_UI::editor_display_control_changed (Editing::DisplayControl c)
+ARDOUR_UI::setup_clock ()
 {
-       switch (c) {
-       case Editing::FollowPlayhead:
-               follow_button.set_active (editor->follow_playhead ());
-               break;
-       default:
-               break;
+       ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (big_clock, &AudioClock::set), false));
+
+       big_clock_window = new Window (WINDOW_TOPLEVEL);
+
+       big_clock_window->set_keep_above (true);
+       big_clock_window->set_border_width (0);
+       big_clock_window->add  (big_clock);
+
+       big_clock_window->set_title (_("Big Clock"));
+       big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
+       big_clock_window->signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), big_clock_window,  (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
+       big_clock_window->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
+       big_clock_window->signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), big_clock_window), false);
+
+       manage_window (*big_clock_window);
+}
+
+void
+ARDOUR_UI::float_big_clock (Gtk::Window* parent)
+{
+       if (big_clock_window) {
+               if (parent) {
+                       big_clock_window->set_transient_for (*parent);
+               } else {
+                       gtk_window_set_transient_for (big_clock_window->gobj(), (GtkWindow*) 0);
+               }
        }
 }