X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=3e8fde5dbb3d79c5d2e6731c958f620b93c0287d;hb=bdfddec6fc45b9570d1f3fc03182f4166187c52c;hp=5c2ca58087723c10cfc0af7fad1dbc68443cfe7a;hpb=a6517a01902370e6c6dfa3e4a153e214b68cf4a7;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 5c2ca58087..3e8fde5dbb 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -37,17 +37,16 @@ #include #include -#include "ardour/session.h" -#include "ardour/audioengine.h" -#include "ardour/ardour.h" #include "ardour/profile.h" -#include "ardour/route.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "ardour_ui.h" #include "keyboard.h" #include "public_editor.h" #include "audio_clock.h" #include "actions.h" +#include "main_clock.h" #include "utils.h" #include "theme_manager.h" #include "midi_tracer.h" @@ -65,6 +64,7 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Glib; +using namespace ARDOUR_UI_UTILS; int ARDOUR_UI::setup_windows () @@ -79,12 +79,15 @@ ARDOUR_UI::setup_windows () return -1; } + if (create_meterbridge ()) { + error << _("UI: cannot setup meterbridge") << endmsg; + return -1; + } + /* all other dialogs are created conditionally */ we_have_dependents (); - theme_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleThemeManager"))); - #ifdef TOP_MENUBAR HBox* status_bar_packer = manage (new HBox); EventBox* status_bar_event_box = manage (new EventBox); @@ -93,27 +96,25 @@ ARDOUR_UI::setup_windows () status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); status_bar_label.set_size_request (300, -1); status_bar_packer->pack_start (*status_bar_event_box, true, true, 6); - status_bar_packer->pack_start (error_log_button, false, false); status_bar_label.show (); status_bar_event_box->show (); status_bar_packer->show (); - error_log_button.show (); - error_log_button.signal_clicked().connect (mem_fun (*this, &UI::toggle_errors)); status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press)); editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true); - editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 6); + editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 2); #else top_packer.pack_start (menu_bar_base, false, false); #endif - top_packer.pack_start (transport_frame, false, false); + editor->add_toplevel_menu (top_packer); - editor->add_toplevel_controls (top_packer); + editor->add_transport_frame (transport_frame); setup_transport(); + build_menu_bar (); setup_tooltips (); @@ -128,20 +129,21 @@ ARDOUR_UI::setup_tooltips () set_tip (stop_button, _("Stop playback")); set_tip (rec_button, _("Toggle record")); set_tip (play_selection_button, _("Play range/selection")); - set_tip (join_play_range_button, _("Always play range/selection")); set_tip (goto_start_button, _("Go to start of session")); set_tip (goto_end_button, _("Go to end of session")); set_tip (auto_loop_button, _("Play loop range")); - + set_tip (midi_panic_button, _("MIDI Panic\nSend note off and reset controller messages on all MIDI channels")); set_tip (auto_return_button, _("Return to last playback start when stopped")); - set_tip (auto_play_button, _("Start playback after any locate")); + set_tip (follow_edits_button, _("Playhead follows range selections and edits")); set_tip (auto_input_button, _("Be sensible about input monitoring")); set_tip (click_button, _("Enable/Disable audio click")); - set_tip (time_master_button, string_compose (_("Does %1 control the time?"), PROGRAM_NAME)); set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything")); - set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition")); - set_tip (primary_clock, _("Primary Clock")); - set_tip (secondary_clock, _("Secondary Clock")); + set_tip (auditioning_alert_button, _("When active, auditioning is taking place.\nClick to stop the audition")); + set_tip (feedback_alert_button, _("When active, there is a feedback loop.")); + set_tip (primary_clock, _("Primary Clock right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite Esc: cancel; Enter: confirm; postfix the edit with '+' or '-' to enter delta times.\n")); + set_tip (secondary_clock, _("Secondary Clock right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite Esc: cancel; Enter: confirm; postfix the edit with '+' or '-' to enter delta times.\n")); + set_tip (editor_meter_peak_display, _("Reset All Peak Indicators")); + set_tip (error_alert_button, _("Show Error Log and acknowledge warnings")); synchronize_sync_source_and_video_pullup (); @@ -171,18 +173,25 @@ ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr"; + ll = LogLevelError; } else if (strcmp (prefix, _("[WARNING]: ")) == 0) { text = ""; + ll = LogLevelWarning; } else if (strcmp (prefix, _("[INFO]: ")) == 0) { text = ""; + ll = LogLevelInfo; } else { text = "???"; } + _log_not_acknowledged = std::max(_log_not_acknowledged, ll); + +#ifdef TOP_MENUBAR text += prefix; text += ""; text += msg; @@ -207,14 +216,21 @@ ARDOUR_UI::tearoff_settings (const char* name) const return 0; } +#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale())) + void ARDOUR_UI::setup_transport () { + RefPtr act; + + transport_tearoff_hbox.set_border_width (PX_SCALE(3)); + transport_tearoff_hbox.set_spacing (PX_SCALE(3)); + transport_tearoff = manage (new TearOff (transport_tearoff_hbox)); transport_tearoff->set_name ("TransportBase"); transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false); - if (Profile->get_sae()) { + if (Profile->get_sae() || Profile->get_mixbus()) { transport_tearoff->set_can_be_torn_off (false); } @@ -236,232 +252,230 @@ ARDOUR_UI::setup_transport () transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), static_cast (&transport_frame), 1)); - goto_start_button.set_name ("TransportButton"); - goto_end_button.set_name ("TransportButton"); - roll_button.set_name ("TransportButton"); - stop_button.set_name ("TransportButton"); - play_selection_button.set_name ("TransportButton"); - rec_button.set_name ("TransportRecButton"); - auto_loop_button.set_name ("TransportButton"); - join_play_range_button.set_name ("TransportButton"); - - auto_return_button.set_name ("TransportButton"); - auto_play_button.set_name ("TransportButton"); - auto_input_button.set_name ("TransportButton"); - click_button.set_name ("TransportButton"); - time_master_button.set_name ("TransportButton"); - sync_button.set_name ("TransportSyncButton"); - - stop_button.set_size_request(29, -1); - roll_button.set_size_request(29, -1); - auto_loop_button.set_size_request(29, -1); - play_selection_button.set_size_request(29, -1); - goto_start_button.set_size_request(29, -1); - goto_end_button.set_size_request(29, -1); - rec_button.set_size_request(29, -1); - - Widget* w; - - stop_button.set_visual_state (1); - - w = manage (new Image (get_icon (X_("transport_start")))); - w->show(); - goto_start_button.add (*w); - w = manage (new Image (get_icon (X_("transport_end")))); - w->show(); - goto_end_button.add (*w); - w = manage (new Image (get_icon (X_("transport_play")))); - w->show(); - roll_button.add (*w); - w = manage (new Image (get_icon (X_("transport_stop")))); - w->show(); - stop_button.add (*w); - w = manage (new Image (get_icon (X_("transport_range")))); - w->show(); - play_selection_button.add (*w); - w = manage (new Image (get_icon (X_("transport_record")))); - w->show(); - rec_button.add (*w); - w = manage (new Image (get_icon (X_("transport_loop")))); - w->show(); - auto_loop_button.add (*w); - w = manage (new Image (get_icon (X_("tool_object_range")))); - w->show (); - join_play_range_button.add (*w); + auto_return_button.set_text(_("Auto Return")); - RefPtr act; + follow_edits_button.set_text(_("Follow Edits")); + +// auto_input_button.set_text (_("Auto Input")); + + click_button.set_icon (ArdourIcon::TransportMetronom); + + act = ActionManager::get_action ("Transport", "ToggleClick"); + click_button.set_related_action (act); + click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false); + + auto_return_button.set_name ("transport option button"); + follow_edits_button.set_name ("transport option button"); + auto_input_button.set_name ("transport option button"); + + /* these have to provide a clear indication of active state */ + + click_button.set_name ("transport button"); + sync_button.set_name ("transport active option button"); + + stop_button.set_active (true); + + goto_start_button.set_icon (ArdourIcon::TransportStart); + goto_end_button.set_icon (ArdourIcon::TransportEnd); + roll_button.set_icon (ArdourIcon::TransportPlay); + stop_button.set_icon (ArdourIcon::TransportStop); + play_selection_button.set_icon (ArdourIcon::TransportRange); + auto_loop_button.set_icon (ArdourIcon::TransportLoop); + rec_button.set_icon (ArdourIcon::RecButton); + midi_panic_button.set_icon (ArdourIcon::TransportPanic); act = ActionManager::get_action (X_("Transport"), X_("Stop")); - act->connect_proxy (stop_button); + stop_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("Roll")); - act->connect_proxy (roll_button); + roll_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("Record")); - act->connect_proxy (rec_button); + rec_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("GotoStart")); - act->connect_proxy (goto_start_button); + goto_start_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("GotoEnd")); - act->connect_proxy (goto_end_button); + goto_end_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("Loop")); - act->connect_proxy (auto_loop_button); + auto_loop_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("PlaySelection")); - act->connect_proxy (play_selection_button); - act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster")); - act->connect_proxy (time_master_button); + play_selection_button.set_related_action (act); + act = ActionManager::get_action (X_("MIDI"), X_("panic")); + midi_panic_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); - act->connect_proxy (sync_button); - + sync_button.set_related_action (act); /* clocks, etc. */ - ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &AudioClock::set), 'p')); - ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &AudioClock::set), 's')); + ARDOUR_UI::Clock.connect (sigc::mem_fun (primary_clock, &AudioClock::set)); + ARDOUR_UI::Clock.connect (sigc::mem_fun (secondary_clock, &AudioClock::set)); primary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed)); secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); - ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button); - ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button); - ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button); - ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button); - - click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false); - - preroll_button.set_name ("TransportButton"); - postroll_button.set_name ("TransportButton"); - - preroll_clock->set_mode (AudioClock::MinSec); - preroll_clock->set_name ("TransportClockDisplay"); - postroll_clock->set_mode (AudioClock::MinSec); - postroll_clock->set_name ("TransportClockDisplay"); + act = ActionManager::get_action ("Transport", "ToggleAutoReturn"); + auto_return_button.set_related_action (act); + act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits")); + follow_edits_button.set_related_action (act); + act = ActionManager::get_action ("Transport", "ToggleAutoInput"); + auto_input_button.set_related_action (act); /* alerts */ /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */ - solo_alert_button.set_name ("TransportSoloAlert"); - solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false); - auditioning_alert_button.set_name ("TransportAuditioningAlert"); + solo_alert_button.set_name ("rude solo"); + act = ActionManager::get_action (X_("Main"), X_("cancel-solo")); + solo_alert_button.set_related_action (act); + auditioning_alert_button.set_name ("rude audition"); auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false); + feedback_alert_button.set_name ("feedback alert"); + feedback_alert_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::feedback_alert_press), false); + error_alert_button.set_name ("error alert"); + error_alert_button.signal_button_release_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::error_alert_press), false); + act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window")); + error_alert_button.set_related_action(act); + error_alert_button.set_fallthrough_to_parent(true); + + alert_box.set_homogeneous (true); + alert_box.set_spacing (PX_SCALE(2)); + alert_box.pack_start (solo_alert_button, true, true); + alert_box.pack_start (auditioning_alert_button, true, true); + alert_box.pack_start (feedback_alert_button, true, true); + + /* all transport buttons should be the same size vertically and + * horizontally + */ + + Glib::RefPtr transport_button_size_group = SizeGroup::create (SIZE_GROUP_BOTH); + transport_button_size_group->add_widget (goto_start_button); + transport_button_size_group->add_widget (goto_end_button); + transport_button_size_group->add_widget (auto_loop_button); + transport_button_size_group->add_widget (rec_button); + transport_button_size_group->add_widget (play_selection_button); + transport_button_size_group->add_widget (roll_button); + transport_button_size_group->add_widget (stop_button); + + /* the icon for this has an odd aspect ratio, so fatten up the button */ + midi_panic_button.set_size_request (PX_SCALE(25), -1); + goto_start_button.set_size_request (PX_SCALE(28), PX_SCALE(44)); + click_button.set_size_request (PX_SCALE(32), PX_SCALE(44)); + + + HBox* tbox1 = manage (new HBox); + HBox* tbox2 = manage (new HBox); + HBox* tbox = manage (new HBox); + + VBox* vbox1 = manage (new VBox); + VBox* vbox2 = manage (new VBox); + + Alignment* a1 = manage (new Alignment); + Alignment* a2 = manage (new Alignment); + + tbox1->set_spacing (PX_SCALE(2)); + tbox2->set_spacing (PX_SCALE(2)); + tbox->set_spacing (PX_SCALE(2)); + + if (!Profile->get_trx()) { + tbox1->pack_start (midi_panic_button, true, true, 5); + tbox1->pack_start (click_button, true, true, 5); + } - alert_box.pack_start (solo_alert_button, false, false); - alert_box.pack_start (auditioning_alert_button, false, false); - - HBox* transport_hbox = manage (new HBox); - - transport_tearoff_hbox.set_border_width (3); - - transport_hbox->pack_start (goto_start_button, false, false); - transport_hbox->pack_start (goto_end_button, false, false); - - /* translators: Egternal is "External" with a descender character */ - set_size_request_to_display_given_text (sync_button, X_("Egternal"), 4, 10); - - // transport_tearoff_hbox.pack_start (*svbox, false, false, 3); - - if (Profile->get_sae()) { - transport_hbox->pack_start (auto_loop_button); - transport_hbox->pack_start (roll_button); - } else { - transport_hbox->pack_start (auto_loop_button, false, false); + tbox1->pack_start (goto_start_button, true, true); + tbox1->pack_start (goto_end_button, true, true); + tbox1->pack_start (auto_loop_button, true, true); - Frame* jpframe = manage (new Frame); - HBox* jpbox = manage (new HBox); + if (!Profile->get_trx()) { + tbox2->pack_start (play_selection_button, true, true); + } + tbox2->pack_start (roll_button, true, true); + tbox2->pack_start (stop_button, true, true); + tbox2->pack_start (rec_button, true, true, 5); - jpframe->add (*jpbox); - jpframe->set_shadow_type (SHADOW_NONE); + vbox1->pack_start (*tbox1, true, true); + vbox2->pack_start (*tbox2, true, true); - jpbox->pack_start (play_selection_button, false, false); - jpbox->pack_start (join_play_range_button, false, false); - jpbox->pack_start (roll_button, false, false); + a1->add (*vbox1); + a1->set (0.5, 0.5, 0.0, 1.0); + a2->add (*vbox2); + a2->set (0.5, 0.5, 0.0, 1.0); - transport_hbox->pack_start (*jpframe, false, false); - } - transport_hbox->pack_start (stop_button, false, false); - transport_hbox->pack_start (rec_button, false, false, 6); + tbox->pack_start (*a1, false, false); + tbox->pack_start (*a2, false, false); HBox* clock_box = manage (new HBox); - clock_box->set_border_width (2); - primary_clock->set_border_width (2); + clock_box->pack_start (*primary_clock, false, false); - if (!ARDOUR::Profile->get_small_screen()) { - secondary_clock->set_border_width (2); + if (!ARDOUR::Profile->get_small_screen() && !ARDOUR::Profile->get_trx()) { clock_box->pack_start (*secondary_clock, false, false); } + clock_box->set_spacing (PX_SCALE(3)); - if (!Profile->get_sae()) { - VBox* time_controls_box = manage (new VBox); - time_controls_box->pack_start (sync_button, false, false); - time_controls_box->pack_start (time_master_button, false, false); - clock_box->pack_start (*time_controls_box, false, false, 1); - } - - shuttle_box = new ShuttleControl; + shuttle_box = manage (new ShuttleControl); shuttle_box->show (); VBox* transport_vbox = manage (new VBox); transport_vbox->set_name ("TransportBase"); - transport_vbox->set_border_width (3); - transport_vbox->set_spacing (3); - transport_vbox->pack_start (*transport_hbox, true, true, 0); - transport_vbox->pack_start (*shuttle_box, false, false, 0); + transport_vbox->set_border_width (0); + transport_vbox->set_spacing (PX_SCALE(3)); + transport_vbox->pack_start (*tbox, true, true, 0); - transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0); - transport_tearoff_hbox.pack_start (*clock_box, false, false, 0); + if (!Profile->get_trx()) { + transport_vbox->pack_start (*shuttle_box, false, false, 0); + } time_info_box = manage (new TimeInfoBox); - transport_tearoff_hbox.pack_start (*time_info_box, false, false); - HBox* toggle_box = manage(new HBox); + if (ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (*time_info_box, false, false); + } - VBox* auto_box = manage (new VBox); - auto_box->pack_start (auto_play_button, false, false); - auto_box->pack_start (auto_return_button, false, false); - if (!Profile->get_small_screen()) { - toggle_box->pack_start (*auto_box, false, false); - } - - VBox* io_box = manage (new VBox); - io_box->pack_start (auto_input_button, false, false); - io_box->pack_start (click_button, false, false); - if (!Profile->get_small_screen()) { - toggle_box->pack_start (*io_box, false, false); - } + transport_tearoff_hbox.pack_start (*transport_vbox, false, false); - /* desensitize */ + /* transport related toggle controls */ - set_transport_sensitivity (false); + VBox* auto_box = manage (new VBox); + auto_box->set_homogeneous (true); + auto_box->set_spacing (PX_SCALE(2)); + auto_box->pack_start (sync_button, true, true); + if (!ARDOUR::Profile->get_trx()) { + auto_box->pack_start (follow_edits_button, true, true); + auto_box->pack_start (auto_return_button, true, true); + } -// toggle_box->pack_start (preroll_button, false, false); -// toggle_box->pack_start (preroll_clock, false, false); + if (!ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (*auto_box, false, false); + } + transport_tearoff_hbox.pack_start (*clock_box, true, true); -// toggle_box->pack_start (postroll_button, false, false); -// toggle_box->pack_start (postroll_clock, false, false); + if (ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (*auto_box, false, false); + } - transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4); - if (Profile->get_small_screen()) { - transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4); - } - transport_tearoff_hbox.pack_start (alert_box, false, false); + if (!ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (*time_info_box, false, false); + } + + if (!ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (alert_box, false, false); + transport_tearoff_hbox.pack_start (meter_box, false, false); + transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); + } if (Profile->get_sae()) { Image* img = manage (new Image ((::get_icon (X_("sae"))))); - transport_tearoff_hbox.pack_end (*img, false, false, 6); + transport_tearoff_hbox.pack_end (*img, false, false); } + /* desensitize */ + + set_transport_sensitivity (false); + XMLNode* tnode = tearoff_settings ("transport"); if (tnode) { transport_tearoff->set_state (*tnode); } } - -void -ARDOUR_UI::manage_window (Window& win) -{ - win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win)); - win.signal_enter_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win)); - win.signal_leave_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win)); -} +#undef PX_SCALE void ARDOUR_UI::detach_tearoff (Box* b, Widget* w) @@ -477,6 +491,13 @@ ARDOUR_UI::reattach_tearoff (Box* b, Widget* w, int32_t n) b->reorder_child (*w, n); } +void +ARDOUR_UI::reattach_all_tearoffs () +{ + if (transport_tearoff) transport_tearoff->put_it_back(); + if (editor) editor->reattach_all_tearoffs (); +} + void ARDOUR_UI::soloing_changed (bool onoff) { @@ -488,10 +509,8 @@ ARDOUR_UI::soloing_changed (bool onoff) void ARDOUR_UI::_auditioning_changed (bool onoff) { - if (auditioning_alert_button.get_active() != onoff) { - auditioning_alert_button.set_active (onoff); - set_transport_sensitivity (!onoff); - } + auditioning_alert_button.set_active (onoff); + set_transport_sensitivity (!onoff); } void @@ -510,16 +529,29 @@ ARDOUR_UI::audition_alert_press (GdkEventButton*) } bool -ARDOUR_UI::solo_alert_press (GdkEventButton*) +ARDOUR_UI::feedback_alert_press (GdkEventButton *) { - if (_session) { - if (_session->soloing()) { - _session->set_solo (_session->get_routes(), false); - } else if (_session->listening()) { - _session->set_listen (_session->get_routes(), false); + return true; +} + +bool +ARDOUR_UI::error_alert_press (GdkEventButton* ev) +{ + bool do_toggle = true; + if (ev->button == 1) { + if (_log_not_acknowledged == LogLevelError) { + // just acknowledge the error, don't hide the log if it's already visible + RefPtr act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window")); + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); + if (tact && tact->get_active()) { + do_toggle = false; + } } + _log_not_acknowledged = LogLevelNone; + error_blink (false); // immediate acknowledge } - return true; + // maybe fall through to to button toggle + return !do_toggle; } void @@ -531,13 +563,12 @@ ARDOUR_UI::solo_blink (bool onoff) if (_session->soloing() || _session->listening()) { if (onoff) { - solo_alert_button.set_state (STATE_ACTIVE); + solo_alert_button.set_active (true); } else { - solo_alert_button.set_state (STATE_NORMAL); + solo_alert_button.set_active (false); } } else { solo_alert_button.set_active (false); - solo_alert_button.set_state (STATE_NORMAL); } } @@ -546,7 +577,7 @@ ARDOUR_UI::sync_blink (bool onoff) { if (_session == 0 || !_session->config.get_external_sync()) { /* internal sync */ - sync_button.set_visual_state (0); + sync_button.set_active (false); return; } @@ -554,13 +585,13 @@ ARDOUR_UI::sync_blink (bool onoff) /* not locked, so blink on and off according to the onoff argument */ if (onoff) { - sync_button.set_visual_state (1); // "-active" + sync_button.set_active (true); } else { - sync_button.set_visual_state (0); // normal + sync_button.set_active (false); } } else { /* locked */ - sync_button.set_visual_state (1); // "-active" + sync_button.set_active (true); } } @@ -573,16 +604,55 @@ ARDOUR_UI::audition_blink (bool onoff) if (_session->is_auditioning()) { if (onoff) { - auditioning_alert_button.set_state (STATE_ACTIVE); + auditioning_alert_button.set_active (true); } else { - auditioning_alert_button.set_state (STATE_NORMAL); + auditioning_alert_button.set_active (false); } } else { auditioning_alert_button.set_active (false); - auditioning_alert_button.set_state (STATE_NORMAL); } } +void +ARDOUR_UI::feedback_blink (bool onoff) +{ + if (_feedback_exists) { + if (onoff) { + feedback_alert_button.set_active (true); + } else { + feedback_alert_button.set_active (false); + } + } else { + feedback_alert_button.set_active (false); + } +} + +void +ARDOUR_UI::error_blink (bool onoff) +{ + switch (_log_not_acknowledged) { + case LogLevelError: + // blink + if (onoff) { + error_alert_button.set_custom_led_color(0xff0000ff); // bright red + } else { + error_alert_button.set_custom_led_color(0x880000ff); // dark red + } + break; + case LogLevelWarning: + error_alert_button.set_custom_led_color(0xccaa00ff); // yellow + break; + case LogLevelInfo: + error_alert_button.set_custom_led_color(0x88cc00ff); // lime green + break; + default: + error_alert_button.set_custom_led_color(0x333333ff); // gray + break; + } +} + + + void ARDOUR_UI::set_transport_sensitivity (bool yn) { @@ -596,34 +666,45 @@ ARDOUR_UI::editor_realized () boost::function pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); Config->map_parameters (pc); - reset_dpi (); + UIConfiguration::instance().reset_dpi (); } void -ARDOUR_UI::maximise_editing_space () +ARDOUR_UI::update_tearoff_visibility () { - if (!editor) { - return; + if (editor) { + editor->update_tearoff_visibility (); } +} - transport_tearoff->set_visible (false); - editor->maximise_editing_space (); - if (Config->get_keep_tearoffs()) { - transport_tearoff->set_visible (true); +void +ARDOUR_UI::maximise_editing_space () +{ + if (editor) { + editor->maximise_editing_space (); } } void ARDOUR_UI::restore_editing_space () { - if (!editor) { - return; + if (editor) { + editor->restore_editing_space (); } +} - transport_tearoff->set_visible (true); - editor->restore_editing_space (); +void +ARDOUR_UI::show_ui_prefs () +{ + RefPtr act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor")); + assert (act); + + act->activate(); + + rc_option_editor->set_current_page (_("GUI")); } + bool ARDOUR_UI::click_button_clicked (GdkEventButton* ev) { @@ -632,12 +713,25 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev) return false; } - RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleRCOptionsEditor")); + RefPtr act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor")); assert (act); - RefPtr tact = RefPtr::cast_dynamic (act); - tact->set_active (); + act->activate(); rc_option_editor->set_current_page (_("Misc")); return true; } + +void +ARDOUR_UI::toggle_follow_edits () +{ + RefPtr act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits")); + assert (act); + + RefPtr tact = RefPtr::cast_dynamic (act); + assert (tact); + + UIConfiguration::instance().set_follow_edits (tact->get_active ()); +} + +