X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=97d639fc1bb5990d995811b6aa4b6b867d79a89f;hb=d314a510f67c2b072f856914d2a94b9748fb7e4e;hp=3b633b297da4efe2f8b380b64de6e818c6900d6e;hpb=f6e182b937efda6ed0ba50dbc02af98524beb61c;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 3b633b297d..97d639fc1b 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -29,13 +29,14 @@ #include #include +#include + #include "canvas/canvas.h" #include "pbd/error.h" #include "pbd/basename.h" #include "pbd/fastlog.h" -#include "gtkmm2ext/cairocell.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/window_title.h" @@ -73,14 +74,6 @@ ARDOUR_UI::setup_tooltips () { ArdourCanvas::Canvas::set_tooltip_timeout (Gtk::Settings::get_default()->property_gtk_tooltip_timeout ()); - set_tip (roll_button, _("Play from playhead")); - set_tip (stop_button, _("Stop playback")); - set_tip (rec_button, _("Toggle record")); - set_tip (play_selection_button, _("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 (follow_edits_button, _("Playhead follows Range tool clicks, and Range selections")); set_tip (auto_input_button, _("Track Input Monitoring automatically follows transport state")); @@ -116,36 +109,21 @@ ARDOUR_UI::status_bar_button_press (GdkEventButton* ev) } void -ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr ptag, RefPtr mtag, const char *msg) +ARDOUR_UI::display_message (const char* prefix, gint prefix_len, RefPtr ptag, RefPtr mtag, const char* msg) { - string text; - UI::display_message (prefix, prefix_len, ptag, mtag, msg); ArdourLogLevel ll = LogLevelNone; if (strcmp (prefix, _("[ERROR]: ")) == 0) { - text = ""; 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; - - status_bar_label.set_markup (text); -#endif } XMLNode* @@ -198,16 +176,21 @@ ARDOUR_UI::repack_transport_hbox () } if (editor_meter) { - if (meter_box.get_parent()) { - transport_hbox.remove (meter_box); - transport_hbox.remove (editor_meter_peak_display); + if (editor_meter_table.get_parent()) { + transport_hbox.remove (editor_meter_table); + } + if (meterbox_spacer.get_parent()) { + transport_hbox.remove (meterbox_spacer); + transport_hbox.remove (meterbox_spacer2); } if (UIConfiguration::instance().get_show_editor_meter()) { - transport_hbox.pack_end (editor_meter_peak_display, false, false); - transport_hbox.pack_end (meter_box, false, false); - meter_box.show(); - editor_meter_peak_display.show(); + transport_hbox.pack_end (meterbox_spacer, false, false, 3); + transport_hbox.pack_end (editor_meter_table, false, false); + transport_hbox.pack_end (meterbox_spacer2, false, false, 3); + editor_meter_table.show(); + meterbox_spacer.show(); + meterbox_spacer2.show(); } } @@ -272,69 +255,47 @@ ARDOUR_UI::setup_transport () RefPtr act; /* setup actions */ - 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); - click_button.signal_scroll_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_scroll), false); - - act = ActionManager::get_action (X_("Transport"), X_("Stop")); - stop_button.set_related_action (act); - act = ActionManager::get_action (X_("Transport"), X_("Roll")); - roll_button.set_related_action (act); - act = ActionManager::get_action (X_("Transport"), X_("Record")); - rec_button.set_related_action (act); - act = ActionManager::get_action (X_("Transport"), X_("GotoStart")); - goto_start_button.set_related_action (act); - act = ActionManager::get_action (X_("Transport"), X_("GotoEnd")); - goto_end_button.set_related_action (act); - act = ActionManager::get_action (X_("Transport"), X_("Loop")); - auto_loop_button.set_related_action (act); - act = ActionManager::get_action (X_("Transport"), X_("PlaySelection")); - 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 = global_actions.find_action (X_("Transport"), X_("ToggleExternalSync")); sync_button.set_related_action (act); sync_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::sync_button_clicked), false); sync_button.set_sizing_text (S_("LogestSync|M-Clk")); /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */ - act = ActionManager::get_action (X_("Main"), X_("cancel-solo")); + act = global_actions.find_action (X_("Main"), X_("cancel-solo")); solo_alert_button.set_related_action (act); auditioning_alert_button.signal_clicked.connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_clicked)); 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")); + act = editor->find_action (X_("Editor"), X_("toggle-log-window")); error_alert_button.set_related_action(act); error_alert_button.set_fallthrough_to_parent(true); layered_button.signal_clicked.connect (sigc::mem_fun(*this,&ARDOUR_UI::layered_button_clicked)); - editor_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-editor-visibility"))); - mixer_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-mixer-visibility"))); - prefs_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-preferences-visibility"))); + editor_visibility_button.set_related_action (global_actions.find_action (X_("Common"), X_("change-editor-visibility"))); + mixer_visibility_button.set_related_action (global_actions.find_action (X_("Common"), X_("change-mixer-visibility"))); + prefs_visibility_button.set_related_action (global_actions.find_action (X_("Common"), X_("change-preferences-visibility"))); - act = ActionManager::get_action ("Transport", "ToggleAutoReturn"); + act = global_actions.find_action ("Transport", "ToggleAutoReturn"); auto_return_button.set_related_action (act); - act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits")); + act = global_actions.find_action (X_("Transport"), X_("ToggleFollowEdits")); follow_edits_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "ToggleAutoInput"); + act = global_actions.find_action ("Transport", "ToggleAutoInput"); auto_input_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "TogglePunchIn"); + act = global_actions.find_action ("Transport", "TogglePunchIn"); punch_in_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "TogglePunchOut"); + act = global_actions.find_action ("Transport", "TogglePunchOut"); punch_out_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "SessionMonitorIn"); + act = global_actions.find_action ("Transport", "SessionMonitorIn"); monitor_in_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "SessionMonitorDisk"); + act = global_actions.find_action ("Transport", "SessionMonitorDisk"); monitor_disk_button.set_related_action (act); /* connect signals */ - ARDOUR_UI::Clock.connect (sigc::mem_fun (primary_clock, &AudioClock::set)); - ARDOUR_UI::Clock.connect (sigc::mem_fun (secondary_clock, &AudioClock::set)); + ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &MainClock::set), false, 0)); + ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &MainClock::set), false, 0)); 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)); @@ -380,7 +341,6 @@ ARDOUR_UI::setup_transport () monitor_disk_button.set_name ("monitor button"); auto_input_button.set_name ("transport option button"); - click_button.set_name ("transport button"); sync_button.set_name ("transport active option button"); /* and widget text */ @@ -417,29 +377,8 @@ ARDOUR_UI::setup_transport () Gtkmm2ext::UI::instance()->set_tip (monitor_in_button, _("Force all tracks to monitor Input, unless they are explicitly set to monitor Disk")); Gtkmm2ext::UI::instance()->set_tip (monitor_disk_button, _("Force all tracks to monitor Disk playback, unless they are explicitly set to Input")); - /* setup icons */ - - click_button.set_icon (ArdourIcon::TransportMetronom); - 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); - /* transport control size-group */ - 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); - Glib::RefPtr punch_button_size_group = SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL); punch_button_size_group->add_widget (punch_in_button); punch_button_size_group->add_widget (punch_out_button); @@ -453,14 +392,14 @@ ARDOUR_UI::setup_transport () /* top level packing */ transport_table.set_spacings (0); transport_table.set_row_spacings (4); - transport_table.set_border_width (2); + transport_table.set_border_width (0); transport_frame.set_name ("TransportFrame"); transport_frame.set_shadow_type (Gtk::SHADOW_NONE); /* An event box to hold the table. We use this because we want specific control over the background color, and without this event box, - nothing inside the transport_frame actually draws a background. We + nothing inside the transport_sample actually draws a background. We would therefore end up seeing the background of the parent widget, which is probably some default color. Adding the EventBox adds a widget that will draw the background, using a style based on @@ -470,23 +409,6 @@ ARDOUR_UI::setup_transport () transport_frame.add (*ebox); ebox->add (transport_table); - /* transport controls sub-group */ - click_button.set_size_request (PX_SCALE(20), PX_SCALE(20)); - - HBox* tbox = manage (new HBox); - tbox->set_spacing (PX_SCALE(2)); - - tbox->pack_start (midi_panic_button, true, true, 0); - tbox->pack_start (click_button, true, true, 0); - tbox->pack_start (goto_start_button, true, true); - tbox->pack_start (goto_end_button, true, true); - tbox->pack_start (auto_loop_button, true, true); - tbox->pack_start (play_selection_button, true, true); - - tbox->pack_start (roll_button, true, true); - tbox->pack_start (stop_button, true, true); - tbox->pack_start (rec_button, true, true, 3); - /* alert box sub-group */ VBox* alert_box = manage (new VBox); alert_box->set_homogeneous (true); @@ -504,7 +426,7 @@ ARDOUR_UI::setup_transport () button_height_size_group->add_widget (*secondary_clock->left_btn()); button_height_size_group->add_widget (*secondary_clock->right_btn()); - button_height_size_group->add_widget (stop_button); + button_height_size_group->add_widget (transport_ctrl.size_button ()); // button_height_size_group->add_widget (sync_button); button_height_size_group->add_widget (auto_return_button); @@ -544,7 +466,7 @@ ARDOUR_UI::setup_transport () int col = 0; #define TCOL col, col + 1 - transport_table.attach (*tbox, TCOL, 0, 1 , SHRINK, SHRINK, 0, 0); + transport_table.attach (transport_ctrl, TCOL, 0, 1 , SHRINK, SHRINK, 0, 0); transport_table.attach (*ssbox, TCOL, 1, 2 , FILL, SHRINK, 0, 0); ++col; @@ -605,9 +527,6 @@ ARDOUR_UI::setup_transport () transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, hpadding, 0); ++col; - transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); - ++col; - /* editor-meter, mini-timeline and selection clock are options in the transport_hbox */ transport_hbox.set_spacing (3); transport_table.attach (transport_hbox, TCOL, 0, 2, EXPAND|FILL, EXPAND|FILL, hpadding, 0); @@ -630,7 +549,6 @@ ARDOUR_UI::setup_transport () auditioning_alert_button.set_sensitive (false); auditioning_alert_button.set_visual_state (Gtkmm2ext::NoVisualState); - stop_button.set_active (true); set_transport_sensitivity (false); } #undef PX_SCALE @@ -676,7 +594,7 @@ ARDOUR_UI::error_alert_press (GdkEventButton* ev) 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")); + RefPtr act = editor->find_action (X_("Editor"), X_("toggle-log-window")); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); if (tact && tact->get_active()) { do_toggle = false; @@ -793,17 +711,6 @@ ARDOUR_UI::error_blink (bool onoff) break; } } - -void -ARDOUR_UI::set_loop_sensitivity () -{ - if (!_session || _session->config.get_external_sync()) { - auto_loop_button.set_sensitive (false); - } else { - auto_loop_button.set_sensitive (_session && _session->locations()->auto_loop_location()); - } -} - void ARDOUR_UI::set_transport_sensitivity (bool yn) { @@ -858,29 +765,6 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev) return true; } -bool -ARDOUR_UI::click_button_scroll (GdkEventScroll* ev) -{ - gain_t gain = Config->get_click_gain(); - float gain_db = accurate_coefficient_to_dB (gain); - - switch (ev->direction) { - case GDK_SCROLL_UP: - case GDK_SCROLL_LEFT: - gain_db += 1; - break; - case GDK_SCROLL_DOWN: - case GDK_SCROLL_RIGHT: - gain_db -= 1; - break; - } - gain_db = std::max (-60.f, gain_db); - gain = dB_to_coefficient (gain_db); - gain = std::min (gain, Config->get_max_gain()); - Config->set_click_gain (gain); - return true; -} - bool ARDOUR_UI::sync_button_clicked (GdkEventButton* ev) { @@ -897,7 +781,7 @@ ARDOUR_UI::sync_button_clicked (GdkEventButton* ev) void ARDOUR_UI::toggle_follow_edits () { - RefPtr act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits")); + RefPtr act = global_actions.find_action (X_("Transport"), X_("ToggleFollowEdits")); assert (act); RefPtr tact = RefPtr::cast_dynamic (act); @@ -933,3 +817,21 @@ ARDOUR_UI::update_title () } } + +void +ARDOUR_UI::toggle_use_monitor_section () +{ + RefPtr act = ActionManager::get_action (X_("Monitor"), "UseMonitorSection"); + assert (act); RefPtr tact = Glib::RefPtr::cast_dynamic (act); + assert (tact); + + bool yn = tact->get_active (); + + if (yn) { + _session->add_monitor_section (); + } else { + _session->remove_monitor_section (); + } + + Config->set_use_monitor_bus (yn); +}