X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_ed.cc;h=1b2bfcc895ade99e97401cb4d67b182ffb3adf38;hb=602839ffea8963c8683298bc13a13ac371a1d4b7;hp=6eb88ae9401d9dc35cfeef650969d6aa74069028;hpb=8b68ed57ec5c075261639435be3290c3ba8177eb;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 6eb88ae940..1b2bfcc895 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -35,6 +35,7 @@ #include "gtkmm2ext/utils.h" #include "gtkmm2ext/window_title.h" #include "gtkmm2ext/tearoff.h" +#include "gtkmm2ext/cairo_packer.h" #include "pbd/file_utils.h" #include "pbd/fpu.h" @@ -48,18 +49,19 @@ #include "engine_dialog.h" #include "editor.h" #include "actions.h" +#include "meterbridge.h" #include "mixer_ui.h" #include "startup.h" -#include "utils.h" -#include "window_proxy.h" +#include "window_manager.h" #include "global_port_matrix.h" +#include "location_ui.h" +#include "main_clock.h" #include #include "ardour/session.h" #include "ardour/profile.h" #include "ardour/audioengine.h" -#include "ardour/control_protocol_manager.h" #include "control_protocol/control_protocol.h" @@ -93,26 +95,28 @@ void ARDOUR_UI::install_actions () { Glib::RefPtr main_actions = ActionGroup::create (X_("Main")); + Glib::RefPtr main_menu_actions = ActionGroup::create (X_("Main_menu")); Glib::RefPtr 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::register_action (main_menu_actions, X_("Session"), _("Session")); + act = ActionManager::register_action (main_menu_actions, X_("Cleanup"), _("Clean-up")); 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")); + ActionManager::register_action (main_menu_actions, X_("Sync"), _("Sync")); + ActionManager::register_action (main_menu_actions, X_("TransportOptions"), _("Options")); + ActionManager::register_action (main_menu_actions, X_("WindowMenu"), _("Window")); + ActionManager::register_action (main_menu_actions, X_("Help"), _("Help")); + ActionManager::register_action (main_menu_actions, X_("KeyMouseActions"), _("Misc. Shortcuts")); + ActionManager::register_action (main_menu_actions, X_("AudioFileFormat"), _("Audio File Format")); + ActionManager::register_action (main_menu_actions, X_("AudioFileFormatHeader"), _("File Type")); + ActionManager::register_action (main_menu_actions, X_("AudioFileFormatData"), _("Sample Format")); + ActionManager::register_action (main_menu_actions, X_("ControlSurfaces"), _("Control Surfaces")); + ActionManager::register_action (main_menu_actions, X_("Plugins"), _("Plugins")); + ActionManager::register_action (main_menu_actions, X_("Metering"), _("Metering")); + ActionManager::register_action (main_menu_actions, X_("MeteringFallOffRate"), _("Fall Off Rate")); + ActionManager::register_action (main_menu_actions, X_("MeteringHoldTime"), _("Hold Time")); + ActionManager::register_action (main_menu_actions, X_("Denormals"), _("Denormal Handling")); /* the real actions */ @@ -128,22 +132,40 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); -#ifdef WITH_CMT + act = ActionManager::register_action (main_actions, X_("duplicate-routes"), _("Duplicate Tracks/Busses"), + sigc::mem_fun(*this, &ARDOUR_UI::start_duplicate_routes)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::write_sensitive_actions.push_back (act); + ActionManager::track_selection_sensitive_actions.push_back (act); - sys::path anicomp_file_path; + act = ActionManager::register_action (main_actions, X_("cancel-solo"), _("Cancel Solo"), sigc::mem_fun(*this, &ARDOUR_UI::cancel_solo)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::write_sensitive_actions.push_back (act); - 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); - } -#endif + act = ActionManager::register_action (main_actions, X_("OpenVideo"), _("Open Video"), + sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_video), (Gtk::Window*) 0)); + ActionManager::session_sensitive_actions.push_back (act); + act = ActionManager::register_action (main_actions, X_("CloseVideo"), _("Remove Video"), + sigc::mem_fun (*this, &ARDOUR_UI::remove_video)); + act->set_sensitive (false); + act = ActionManager::register_action (main_actions, X_("ExportVideo"), _("Export To Video File"), + hide_return (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::export_video), false))); + ActionManager::session_sensitive_actions.push_back (act); + + act = ActionManager::register_action (main_actions, X_("SnapshotStay"), _("Snapshot (& keep working on current version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), false)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::write_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), false)); + act = ActionManager::register_action (main_actions, X_("SnapshotSwitch"), _("Snapshot (& switch to new version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), true)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("SaveAs"), _("Save As..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), true)); + act = ActionManager::register_action (main_actions, X_("SaveAs"), _("Save As..."), sigc::mem_fun(*this, &ARDOUR_UI::save_session_as)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::write_sensitive_actions.push_back (act); + + act = ActionManager::register_action (main_actions, X_("Rename"), _("Rename..."), sigc::mem_fun(*this, &ARDOUR_UI::rename_session)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); @@ -162,10 +184,17 @@ ARDOUR_UI::install_actions () 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_("StemExport"), _("Stem export..."), sigc::mem_fun (*editor, &PublicEditor::stem_export)); + 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)); + act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Clean-up 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_("CleanupPeakFiles"), _("Reset Peak Files"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup_peakfiles)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); @@ -173,91 +202,44 @@ ARDOUR_UI::install_actions () ActionManager::write_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act); - /* JACK actions for controlling ... JACK */ - - Glib::RefPtr 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)))); + ActionManager::register_action (common_actions, X_("Hide"), _("Hide"), sigc::mem_fun (*this, &ARDOUR_UI::hide_application)); /* windows visibility actions */ ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalEditor"), _("Maximise Editor Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_editing_space)); - act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Toolbars when Maximised"), mem_fun (*this, &ARDOUR_UI::toggle_keep_tearoffs)); + ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalMixer"), _("Maximise Mixer Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_mixer_space)); + act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Show Toolbars"), mem_fun (*this, &ARDOUR_UI::toggle_keep_tearoffs)); ActionManager::session_sensitive_actions.push_back (act); - ActionManager::register_toggle_action (common_actions, X_("toggle-mixer"), _("Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_window)); - ActionManager::register_toggle_action (common_actions, X_("toggle-mixer-on-top"), _("Mixer on Top"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_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"), _("Properties"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_options_window)); - act = ActionManager::register_toggle_action (common_actions, X_("ToggleInspector"), _("Tracks and Busses"), 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); - act = ActionManager::register_toggle_action (common_actions, X_("toggle-audio-connection-manager"), _("Audio Connection Manager"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_global_port_matrix), ARDOUR::DataType::AUDIO)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (common_actions, X_("toggle-midi-connection-manager"), _("MIDI Connection Manager"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_global_port_matrix), ARDOUR::DataType::MIDI)); - ActionManager::session_sensitive_actions.push_back (act); +if (Profile->get_mixbus()) + ActionManager::register_action (common_actions, X_("show-ui-prefs"), _("Show more UI preferences"), sigc::mem_fun (*this, &ARDOUR_UI::show_ui_prefs)); + + ActionManager::register_action (common_actions, X_("toggle-mixer"), S_("Window|Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_window)); + ActionManager::register_action (common_actions, X_("toggle-editor-mixer"), _("Toggle Editor+Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_editor_mixer)); + ActionManager::register_action (common_actions, X_("toggle-meterbridge"), S_("Window|Meterbridge"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_meterbridge)); + + ActionManager::register_action (common_actions, X_("reattach-all-tearoffs"), _("Reattach All Tearoffs"), sigc::mem_fun (*this, &ARDOUR_UI::reattach_all_tearoffs)); + act = ActionManager::register_action (common_actions, X_("NewMIDITracer"), _("MIDI Tracer"), sigc::mem_fun(*this, &ARDOUR_UI::new_midi_tracer_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_action (common_actions, X_("Chat"), _("Chat"), sigc::mem_fun(*this, &ARDOUR_UI::launch_chat)); - ActionManager::register_action (common_actions, X_("Manual"), _("Manual"), mem_fun(*this, &ARDOUR_UI::launch_manual)); + /** TRANSLATORS: This is `Manual' in the sense of an instruction book that tells a user how to use Ardour */ + ActionManager::register_action (common_actions, X_("Manual"), S_("Help|Manual"), mem_fun(*this, &ARDOUR_UI::launch_manual)); ActionManager::register_action (common_actions, X_("Reference"), _("Reference"), mem_fun(*this, &ARDOUR_UI::launch_reference)); - 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)); + ActionManager::register_action (common_actions, X_("Tracker"), _("Report A Bug"), mem_fun(*this, &ARDOUR_UI::launch_tracker)); + ActionManager::register_action (common_actions, X_("Cheat_Sheet"), _("Cheat Sheet"), mem_fun(*this, &ARDOUR_UI::launch_cheat_sheet)); + ActionManager::register_action (common_actions, X_("Website"), _("Ardour Website"), mem_fun(*this, &ARDOUR_UI::launch_website)); + ActionManager::register_action (common_actions, X_("Website_Dev"), _("Ardour Development"), mem_fun(*this, &ARDOUR_UI::launch_website_dev)); + ActionManager::register_action (common_actions, X_("Forums"), _("User Forums"), mem_fun(*this, &ARDOUR_UI::launch_forums)); + ActionManager::register_action (common_actions, X_("Howto_Report"), _("How to report a bug"), mem_fun(*this, &ARDOUR_UI::launch_howto_report)); -#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(""), false)); + act = ActionManager::register_action (common_actions, X_("Save"), _("Save"), sigc::hide_return (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::save_state), string(""), false))); 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 transport_actions = ActionGroup::create (X_("Transport")); @@ -279,6 +261,9 @@ ARDOUR_UI::install_actions () 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_("alternate-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); @@ -306,6 +291,9 @@ ARDOUR_UI::install_actions () 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_("PlayPreroll"), _("Play Selection w/Preroll"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_preroll)); + 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); @@ -314,6 +302,10 @@ ARDOUR_UI::install_actions () 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_("alternate-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); @@ -332,48 +324,92 @@ ARDOUR_UI::install_actions () 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)); + act = ActionManager::register_action (transport_actions, X_("GotoZero"), _("Go to 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"), _("Go to 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_("alternate-GotoStart"), _("Go to 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"), _("Go to 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"), _("Go to 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); + + //these actions handle the numpad events, ProTools style + act = ActionManager::register_action (transport_actions, X_("numpad-decimal"), _("Numpad Decimal"), mem_fun(*this, &ARDOUR_UI::transport_numpad_decimal)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("alternate-numpad-decimal"), _("Numpad Decimal"), mem_fun(*this, &ARDOUR_UI::transport_numpad_decimal)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("numpad-0"), _("Numpad 0"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 0)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("numpad-1"), _("Numpad 1"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 1)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("numpad-2"), _("Numpad 2"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 2)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("numpad-3"), _("Numpad 3"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 3)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("numpad-4"), _("Numpad 4"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 4)); 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)); + act = ActionManager::register_action (transport_actions, X_("numpad-5"), _("Numpad 5"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 5)); 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)); + act = ActionManager::register_action (transport_actions, X_("numpad-6"), _("Numpad 6"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 6)); 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)); + act = ActionManager::register_action (transport_actions, X_("numpad-7"), _("Numpad 7"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 7)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("numpad-8"), _("Numpad 8"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 8)); + ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("numpad-9"), _("Numpad 9"), bind (mem_fun(*this, &ARDOUR_UI::transport_numpad_event), 9)); 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)); + act = ActionManager::register_action (transport_actions, X_("focus-on-clock"), _("Focus On Clock"), sigc::mem_fun(*this, &ARDOUR_UI::focus_on_clock)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("primary-clock-timecode"), _("Timecode"), sigc::bind (sigc::mem_fun(primary_clock, &AudioClock::set_mode), AudioClock::Timecode)); + ActionManager::session_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-timecode"), _("Timecode"), sigc::bind (sigc::mem_fun(secondary_clock, &AudioClock::set_mode), AudioClock::Timecode)); + 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)); + act->set_short_label (_("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)); + act->set_short_label (_("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)); + act->set_short_label (_("In/Out")); 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)); @@ -388,12 +424,16 @@ ARDOUR_UI::install_actions () 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_("ToggleFollowEdits"), _("Follow Edits"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_follow_edits)); + 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)); + act = ActionManager::register_toggle_action (transport_actions, X_("ToggleExternalSync"), _("Use External Positional Sync Source"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_external_sync)); ActionManager::session_sensitive_actions.push_back (act); for (int i = 1; i <= 32; ++i) { @@ -421,77 +461,18 @@ ARDOUR_UI::install_actions () 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); + /* MIDI */ - if (getenv ("ARDOUR_BUNDLED")) { - act = ActionManager::register_toggle_action (main_actions, X_("EnableTranslation"), _("Enable Translations"), mem_fun (*this, &ARDOUR_UI::toggle_translations)); - if (act) { - RefPtr ract = RefPtr::cast_dynamic (act); - if (ract) { - ract->set_active (!ARDOUR::translations_are_disabled()); - } - } - } + Glib::RefPtr midi_actions = ActionGroup::create (X_("MIDI")); + ActionManager::register_action (midi_actions, X_("panic"), _("Panic"), sigc::mem_fun(*this, &ARDOUR_UI::midi_panic)); 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 (main_menu_actions); ActionManager::add_action_group (common_actions); -} - -void -ARDOUR_UI::set_jack_buffer_size (nframes_t nframes) -{ - Glib::RefPtr action; - const char* action_name = 0; - - switch (nframes) { - case 32: - action_name = X_("JACKLatency32"); - break; - case 64: - action_name = X_("JACKLatency64"); - break; - case 128: - action_name = X_("JACKLatency128"); - break; - case 256: - action_name = X_("JACKLatency256"); - break; - case 512: - action_name = X_("JACKLatency512"); - break; - case 1024: - action_name = X_("JACKLatency1024"); - break; - case 2048: - action_name = X_("JACKLatency2048"); - break; - case 4096: - action_name = X_("JACKLatency4096"); - break; - case 8192: - action_name = X_("JACKLatency8192"); - break; - default: - /* XXX can we do anything useful ? */ - break; - } - - if (action_name) { - - action = ActionManager::get_action (X_("JACK"), action_name); - - if (action) { - Glib::RefPtr ract = Glib::RefPtr::cast_dynamic (action); - - if (ract && ract->get_active()) { - engine->request_buffer_size (nframes); - update_sample_rate (0); - } - } - } + ActionManager::add_action_group (midi_actions); } void @@ -510,32 +491,37 @@ ARDOUR_UI::build_menu_bar () // so use this instead ... gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers"); - /* Set up some size requests here to stop the menu-bar clock jumping around in full-screen mode */ + EventBox* ev = manage (new EventBox); + ev->show (); + CairoHPacker* hbox = manage (new CairoHPacker); + hbox->set_name (X_("StatusBarBox")); + hbox->show (); + hbox->set_border_width (3); - set_size_request_to_display_given_text (wall_clock_label, _("99:99"), 2, 0); - wall_clock_box.add (wall_clock_label); - wall_clock_box.set_name ("WallClock"); - wall_clock_label.set_name ("WallClock"); + VBox* vbox = manage (new VBox); + vbox->pack_start (*hbox, true, false); + vbox->show(); - set_size_request_to_display_given_text (disk_space_label, _("9999h:999999m:99999999s"), 2, 0); - disk_space_box.add (disk_space_label); - disk_space_box.set_name ("WallClock"); - disk_space_label.set_name ("WallClock"); + ev->add (*vbox); - set_size_request_to_display_given_text (cpu_load_label, _("DSP: 100%"), 2, 0); - cpu_load_box.add (cpu_load_label); - cpu_load_box.set_name ("CPULoad"); + wall_clock_label.set_name ("WallClock"); + wall_clock_label.set_use_markup (); + disk_space_label.set_name ("WallClock"); + disk_space_label.set_use_markup (); + timecode_format_label.set_name ("WallClock"); + timecode_format_label.set_use_markup (); cpu_load_label.set_name ("CPULoad"); - - set_size_request_to_display_given_text (buffer_load_label, _("Buffers p:100% c:100%"), 2, 0); - buffer_load_box.add (buffer_load_label); - buffer_load_box.set_name ("BufferLoad"); + cpu_load_label.set_use_markup (); + xrun_label.set_name ("XrunLabel"); + xrun_label.set_use_markup (); + peak_thread_work_label.set_name ("PeakThreadWork"); + peak_thread_work_label.set_use_markup (); buffer_load_label.set_name ("BufferLoad"); - - set_size_request_to_display_given_text (sample_rate_label, X_("384 kHz / 1000 ms"), 2, 0); - sample_rate_box.add (sample_rate_label); - sample_rate_box.set_name ("SampleRate"); + buffer_load_label.set_use_markup (); sample_rate_label.set_name ("SampleRate"); + sample_rate_label.set_use_markup (); + format_label.set_name ("Format"); + format_label.set_use_markup (); #ifndef TOP_MENUBAR menu_hbox.pack_start (*menu_bar, false, false); @@ -543,23 +529,48 @@ ARDOUR_UI::build_menu_bar () use_menubar_as_top_menubar (); #endif - _menu_bar_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::menu_bar_clock_value_changed)); - menu_hbox.pack_start (_menu_bar_clock, true, false); + bool wall_clock = false; + bool disk_space = false; 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); + wall_clock = true; #endif - menu_hbox.pack_end (disk_space_box, false, false, 4); + disk_space = true; } - 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); + hbox->pack_end (error_alert_button, false, false, 2); + + hbox->pack_end (wall_clock_label, false, false, 2); + hbox->pack_end (disk_space_label, false, false, 4); + hbox->pack_end (xrun_label, false, false, 4); + hbox->pack_end (peak_thread_work_label, false, false, 4); + hbox->pack_end (cpu_load_label, false, false, 4); + hbox->pack_end (buffer_load_label, false, false, 4); + hbox->pack_end (sample_rate_label, false, false, 4); + hbox->pack_end (timecode_format_label, false, false, 4); + hbox->pack_end (format_label, false, false, 4); + + menu_hbox.pack_end (*ev, false, false, 2); menu_bar_base.set_name ("MainMenuBar"); menu_bar_base.add (menu_hbox); + +#ifndef GTKOSX + _status_bar_visibility.add (&wall_clock_label, X_("WallClock"), _("Wall Clock"), wall_clock); +#endif + _status_bar_visibility.add (&disk_space_label, X_("Disk"), _("Disk Space"), disk_space); + _status_bar_visibility.add (&cpu_load_label, X_("DSP"), _("DSP"), true); + _status_bar_visibility.add (&xrun_label, X_("XRun"), _("X-run"), false); + _status_bar_visibility.add (&peak_thread_work_label,X_("Peakfile"), _("Active Peak-file Work"), false); + _status_bar_visibility.add (&buffer_load_label, X_("Buffers"), _("Buffers"), true); + _status_bar_visibility.add (&sample_rate_label, X_("Audio"), _("Audio"), true); + _status_bar_visibility.add (&timecode_format_label, X_("TCFormat"), _("Timecode Format"), true); + _status_bar_visibility.add (&format_label, X_("Format"), _("File Format"), true); + + ev->signal_button_press_event().connect (sigc::mem_fun (_status_bar_visibility, &VisibilityGroup::button_press_event)); + ev->signal_button_release_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::xrun_button_release)); } void @@ -568,134 +579,36 @@ ARDOUR_UI::use_menubar_as_top_menubar () Gtk::Widget* widget; Application* app = Application::instance (); - /* Quit will be taken of separately */ + /* the addresses ("/ui/Main...") used below are based on the menu definitions in the menus file + */ + + /* Quit will be taken care of separately */ if ((widget = ActionManager::get_widget ("/ui/Main/Session/Quit"))) { widget->hide (); } + /* Put items for About and Preferences into App menu (the + * ardour.menus.in file does not list them for OS X) + */ + GtkApplicationMenuGroup* group = app->add_app_menu_group (); - if ((widget = ActionManager::get_widget ("/ui/Main/Help/About"))) { + if ((widget = ActionManager::get_widget ("/ui/Main/Session/toggle-about"))) { app->add_app_menu_item (group, dynamic_cast(widget)); - } + } - if ((widget = ActionManager::get_widget ("/ui/Main/WindowMenu/ToggleOptionsEditor"))) { + if ((widget = ActionManager::get_widget ("/ui/Main/Session/toggle-rc-options-editor"))) { app->add_app_menu_item (group, dynamic_cast(widget)); - } + } app->set_menu_bar (*menu_bar); } -void -ARDOUR_UI::setup_clock () -{ - ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (big_clock, &AudioClock::set), false)); - - big_clock_window->set (new Window (WINDOW_TOPLEVEL), false); - - big_clock_window->get()->set_keep_above (true); - big_clock_window->get()->set_border_width (0); - big_clock_window->get()->add (big_clock); - - big_clock_window->get()->set_title (_("Big Clock")); - big_clock_window->get()->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY); - big_clock_window->get()->signal_realize().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_realized)); - big_clock_window->get()->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleBigClock"))); - big_clock_window->get()->signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), big_clock_window->get()), false); - big_clock_window->get()->signal_size_allocate().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_size_allocate)); - - manage_window (*big_clock_window->get()); -} - -void -ARDOUR_UI::big_clock_realized () -{ - int x, y, w, d; - - set_decoration (big_clock_window->get(), (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)); - big_clock_window->get()->get_window()->get_geometry (x, y, w, big_clock_height, d); - - original_big_clock_height = big_clock_height; - original_big_clock_width = w; - - Pango::FontDescription fd (big_clock.get_style()->get_font()); - original_big_clock_font_size = fd.get_size (); - - if (!fd.get_size_is_absolute ()) { - original_big_clock_font_size /= PANGO_SCALE; - } - - big_clock_window->setup (); -} - -void -ARDOUR_UI::float_big_clock (Gtk::Window* parent) -{ - if (big_clock_window->get()) { - if (parent) { - big_clock_window->get()->set_transient_for (*parent); - } else { - gtk_window_set_transient_for (big_clock_window->get()->gobj(), (GtkWindow*) 0); - } - } -} - -void -ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation&) -{ - if (!big_clock_resize_in_progress) { - Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0)); - big_clock_resize_in_progress = true; - } -} - -bool -ARDOUR_UI::idle_big_clock_text_resizer (int, int) -{ - big_clock_resize_in_progress = false; - - Glib::RefPtr win = big_clock_window->get()->get_window(); - Pango::FontDescription fd (big_clock.get_style()->get_font()); - int current_size = fd.get_size (); - int x, y, w, h, d; - - if (!fd.get_size_is_absolute ()) { - current_size /= PANGO_SCALE; - } - - win->get_geometry (x, y, w, h, d); - - double scale = min (((double) w / (double) original_big_clock_width), - ((double) h / (double) original_big_clock_height)); - - int size = (int) lrintf (original_big_clock_font_size * scale); - - if (size != current_size) { - - string family = fd.get_family(); - char buf[family.length()+16]; - snprintf (buf, family.length()+16, "%s %d", family.c_str(), size); - - try { - Pango::FontDescription fd (buf); - Glib::RefPtr rcstyle = big_clock.get_modifier_style (); - rcstyle->set_font (fd); - big_clock.modify_style (rcstyle); - } - - catch (...) { - /* oh well, do nothing */ - } - } - - return false; -} - void ARDOUR_UI::save_ardour_state () { - if (!keyboard || !mixer || !editor) { + if (!keyboard || !mixer || !editor || !meterbridge) { return; } @@ -708,13 +621,12 @@ ARDOUR_UI::save_ardour_state () Config->add_extra_xml (get_transport_controllable_state()); XMLNode* window_node = new XMLNode (X_("UI")); + window_node->add_property (_status_bar_visibility.get_state_name().c_str(), _status_bar_visibility.get_state_value ()); + + /* Windows */ + + WM::Manager::instance().add_state (*window_node); - for (list::iterator i = _window_proxies.begin(); i != _window_proxies.end(); ++i) { - if ((*i)->rc_configured()) { - window_node->add_child_nocopy (*((*i)->get_state ())); - } - } - /* tearoffs */ XMLNode* tearoff_node = new XMLNode (X_("Tearoffs")); @@ -723,85 +635,79 @@ ARDOUR_UI::save_ardour_state () XMLNode* t = new XMLNode (X_("transport")); transport_tearoff->add_state (*t); tearoff_node->add_child_nocopy (*t); - } + } - if (mixer && mixer->monitor_section()) { + if (mixer->monitor_section()) { XMLNode* t = new XMLNode (X_("monitor-section")); mixer->monitor_section()->tearoff().add_state (*t); tearoff_node->add_child_nocopy (*t); - } + } - if (editor && editor->mouse_mode_tearoff()) { + if (editor->mouse_mode_tearoff()) { XMLNode* t = new XMLNode (X_("mouse-mode")); editor->mouse_mode_tearoff ()->add_state (*t); tearoff_node->add_child_nocopy (*t); - } - + } + window_node->add_child_nocopy (*tearoff_node); Config->add_extra_xml (*window_node); + Config->add_extra_xml (audio_midi_setup->get_state()); - if (_startup && _startup->engine_control() && _startup->engine_control()->was_used()) { - Config->add_extra_xml (_startup->engine_control()->get_state()); - } Config->save_state(); - ui_config->save_state (); - XMLNode enode(static_cast(editor)->get_state()); - XMLNode mnode(mixer->get_state()); + UIConfiguration::instance().save_state (); + + XMLNode& enode (static_cast(editor)->get_state()); + XMLNode& mnode (mixer->get_state()); + XMLNode& bnode (meterbridge->get_state()); if (_session) { _session->add_instant_xml (enode); _session->add_instant_xml (mnode); + _session->add_instant_xml (bnode); + if (location_ui) { + _session->add_instant_xml (location_ui->ui().get_state ()); + } } else { Config->add_instant_xml (enode); Config->add_instant_xml (mnode); + if (location_ui) { + Config->add_instant_xml (location_ui->ui().get_state ()); + } } + delete &enode; Keyboard::save_keybindings (); } void -ARDOUR_UI::toggle_global_port_matrix (ARDOUR::DataType t) +ARDOUR_UI::resize_text_widgets () { - std::string const action = string_compose ("toggle-%1-connection-manager", t.to_string ()); - - if (_global_port_matrix[t]->get() == 0) { - _global_port_matrix[t]->set (new GlobalPortMatrixWindow (_session, t)); - _global_port_matrix[t]->get()->signal_unmap().connect(sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), string_compose (X_("/Common/%1"), action))); - } - - RefPtr act = ActionManager::get_action (X_("Common"), action.c_str()); - if (act) { - RefPtr tact = RefPtr::cast_dynamic (act); - - if (tact->get_active()) { - _global_port_matrix[t]->get()->present (); - } else { - _global_port_matrix[t]->get()->hide (); - } - } + set_size_request_to_display_given_text (cpu_load_label, "DSP: 100.0%", 2, 2); + set_size_request_to_display_given_text (buffer_load_label, "Buffers: p:100% c:100%", 2, 2); + set_size_request_to_display_given_text (xrun_label, "X: 9999", 2, 2); } void -ARDOUR_UI::show_menu_bar_clock () +ARDOUR_UI::focus_on_clock () { - _menu_bar_clock.show (); - _menu_bar_clock.set (_session->audible_frame (), true); - _menu_bar_clock_connection = ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (_menu_bar_clock, &AudioClock::set), 'p')); + if (editor && primary_clock) { + editor->present (); + primary_clock->focus (); + } } -void -ARDOUR_UI::hide_menu_bar_clock () +bool +ARDOUR_UI::xrun_button_release (GdkEventButton* ev) { - _menu_bar_clock.hide (); - _menu_bar_clock_connection.disconnect (); -} + if (ev->button != 1 || !Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { + return false; + } -void -ARDOUR_UI::menu_bar_clock_value_changed () -{ if (_session) { - _session->request_locate (_menu_bar_clock.current_time ()); + _session->reset_xrun_count (); + update_xrun_count (); } + return true; }