X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=cd97a876fb2d60c67fbf6c9eb576160bda4a04a3;hb=34c0e3f1c826e5e04064ec29e5670e11f8538889;hp=78b74a4cfe905ed4d36a5f5e1951b98adc4ed6bb;hpb=a5e0f1ff10cb1bdc0f910ff5c6f0e08c667aed4c;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 78b74a4cfe..cd97a876fb 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -44,7 +44,6 @@ #include "ardour/session.h" #include "ardour/types.h" -#include "ardour_spacer.h" #include "ardour_ui.h" #include "keyboard.h" #include "public_editor.h" @@ -84,8 +83,8 @@ ARDOUR_UI::setup_tooltips () 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, _("Be sensible about input monitoring")); - set_tip (click_button, _("Enable/Disable audio click")); + set_tip (auto_input_button, _("Track Input Monitoring automatically follows transport state")); + parameter_changed("click-gain"); 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 (feedback_alert_button, _("When active, there is a feedback loop.")); @@ -211,6 +210,37 @@ ARDOUR_UI::repack_transport_hbox () editor_meter_peak_display.show(); } } + + bool show_mon = UIConfiguration::instance().get_show_toolbar_monitoring (); + if (show_mon) { + monitor_in_button.show (); + monitor_disk_button.show (); + auto_input_button.show (); + monitoring_spacer.show (); + } else { + monitor_in_button.hide (); + monitor_disk_button.hide (); + auto_input_button.hide (); + monitoring_spacer.hide (); + } + + bool show_rec = UIConfiguration::instance().get_show_toolbar_recpunch (); + if (show_rec) { + punch_label.show (); + layered_label.show (); + punch_in_button.show (); + punch_out_button.show (); + layered_button.show (); + recpunch_spacer.show (); + } else { + punch_label.hide (); + layered_label.hide (); + punch_in_button.hide (); + punch_out_button.hide (); + layered_button.hide (); + recpunch_spacer.hide (); + } + } void @@ -236,59 +266,6 @@ ARDOUR_UI::update_clock_visibility () } } -bool -ARDOUR_UI::transport_expose (GdkEventExpose* ev) -{ -return false; - int x0, y0; - Gtk::Widget* window_parent; - Glib::RefPtr win = Gtkmm2ext::window_to_draw_on (transport_table, &window_parent); - Glib::RefPtr style = transport_table.get_style(); - if (!win || !style) { - return false; - } - - Cairo::RefPtr cr = transport_table.get_window()->create_cairo_context (); - - cr->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); - cr->clip (); - - transport_table.translate_coordinates (*window_parent, 0, 0, x0, y0); - - cr->rectangle (x0, y0, transport_table.get_width(), transport_table.get_height()); - Gdk::Color bg (style->get_bg (transport_table.get_state())); - cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p()); - cr->fill (); - - static const int xmargin = 2; - static const int ymargin = 1; - - /* draw box around record-options */ - int xx, ww, hh, uu; - - punch_label.translate_coordinates (transport_table, -xmargin, 0, xx, uu); // left - punch_out_button.translate_coordinates (transport_table, xmargin, 0, ww, uu); // right - ww += punch_out_button.get_width () - xx; // width - hh = transport_table.get_height() - 1; - - Gtkmm2ext::rounded_rectangle (cr->cobj(), x0 + xx - 0.5, y0 + 0.5, ww + 1, hh, 6); - cr->set_source_rgb (0, 0, 0); - cr->set_line_width (1.0); - cr->stroke (); - - /* line to rec-enable */ - int rx; - rec_button.translate_coordinates (transport_table, -xmargin, 0, rx, uu); // top - int dx = rx + rec_button.get_width() - xx; - - cr->move_to (x0 + xx, 1.5 + y0 + ymargin + round (punch_in_button.get_height () * .5)); - cr->rel_line_to (dx, 0); - cr->set_line_width (2.0); - cr->stroke (); - - return false; -} - void ARDOUR_UI::setup_transport () { @@ -298,6 +275,7 @@ ARDOUR_UI::setup_transport () 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); @@ -349,6 +327,11 @@ ARDOUR_UI::setup_transport () act = ActionManager::get_action ("Transport", "TogglePunchOut"); punch_out_button.set_related_action (act); + act = ActionManager::get_action ("Transport", "SessionMonitorIn"); + monitor_in_button.set_related_action (act); + act = ActionManager::get_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)); @@ -371,7 +354,6 @@ ARDOUR_UI::setup_transport () auto_return_button.set_name ("transport option button"); follow_edits_button.set_name ("transport option button"); - auto_input_button.set_name ("transport option button"); solo_alert_button.set_name ("rude solo"); auditioning_alert_button.set_name ("rude audition"); @@ -394,17 +376,24 @@ ARDOUR_UI::setup_transport () punch_out_button.set_name ("punch button"); layered_button.set_name (("layered button")); + monitor_in_button.set_name ("monitor button"); + 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 */ auto_return_button.set_text(_("Auto Return")); follow_edits_button.set_text(_("Follow Range")); - //auto_input_button.set_text (_("Auto Input")); punch_in_button.set_text (_("In")); punch_out_button.set_text (_("Out")); layered_button.set_text (_("Non-Layered")); + monitor_in_button.set_text (_("All In")); + monitor_disk_button.set_text (_("All Disk")); + auto_input_button.set_text (_("Auto-Input")); + punch_label.set_text (_("Punch:")); layered_label.set_text (_("Rec:")); @@ -412,19 +401,22 @@ ARDOUR_UI::setup_transport () Gtkmm2ext::UI::instance()->set_tip (editor_visibility_button, string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n" - "To put the window back, use the Window > %1 > Attach menu action"), editor->name())); + "To re-attach the window, use the Window > %1 > Attach menu action"), editor->name())); Gtkmm2ext::UI::instance()->set_tip (mixer_visibility_button, string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n" - "To put the window back, use the Window > %1 > Attach menu action"), mixer->name())); + "To re-attach the window, use the Window > %1 > Attach menu action"), mixer->name())); Gtkmm2ext::UI::instance()->set_tip (prefs_visibility_button, string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n" - "To put the window back, use the Window > %1 > Attach menu action"), rc_option_editor->name())); + "To re-attach the window, use the Window > %1 > Attach menu action"), rc_option_editor->name())); Gtkmm2ext::UI::instance()->set_tip (punch_in_button, _("Start recording at auto-punch start")); Gtkmm2ext::UI::instance()->set_tip (punch_out_button, _("Stop recording at auto-punch end")); + 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); @@ -452,6 +444,10 @@ ARDOUR_UI::setup_transport () punch_button_size_group->add_widget (punch_in_button); punch_button_size_group->add_widget (punch_out_button); + Glib::RefPtr monitor_button_size_group = SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL); + monitor_button_size_group->add_widget (monitor_in_button); + monitor_button_size_group->add_widget (monitor_disk_button); + /* and now the layout... */ /* top level packing */ @@ -467,15 +463,13 @@ ARDOUR_UI::setup_transport () nothing inside the transport_frame 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 + widget that will draw the background, using a style based on the parent, "TransportFrame". */ Gtk::EventBox* ebox = manage (new Gtk::EventBox); transport_frame.add (*ebox); ebox->add (transport_table); - transport_table.signal_expose_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::transport_expose), false); - /* transport controls sub-group */ click_button.set_size_request (PX_SCALE(20), PX_SCALE(20)); @@ -498,9 +492,9 @@ ARDOUR_UI::setup_transport () alert_box->set_homogeneous (true); alert_box->set_spacing (1); alert_box->set_border_width (0); - alert_box->pack_start (solo_alert_button, true, false, 0); - alert_box->pack_start (auditioning_alert_button, true, false, 0); - alert_box->pack_start (feedback_alert_button, true, false, 0); + 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); /* clock button size groups */ Glib::RefPtr button_height_size_group = SizeGroup::create (Gtk::SIZE_GROUP_VERTICAL); @@ -512,16 +506,27 @@ ARDOUR_UI::setup_transport () button_height_size_group->add_widget (stop_button); // button_height_size_group->add_widget (sync_button); -// button_height_size_group->add_widget (layered_button); button_height_size_group->add_widget (auto_return_button); + + //tab selections button_height_size_group->add_widget (editor_visibility_button); button_height_size_group->add_widget (mixer_visibility_button); - Glib::RefPtr clock1_size_group = SizeGroup::create (SIZE_GROUP_BOTH); + //punch section + button_height_size_group->add_widget (punch_in_button); + button_height_size_group->add_widget (punch_out_button); + button_height_size_group->add_widget (layered_button); + + //input monitoring section + button_height_size_group->add_widget (monitor_in_button); + button_height_size_group->add_widget (monitor_disk_button); + button_height_size_group->add_widget (auto_input_button); + + Glib::RefPtr clock1_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL); clock1_size_group->add_widget (*primary_clock->left_btn()); clock1_size_group->add_widget (*primary_clock->right_btn()); - Glib::RefPtr clock2_size_group = SizeGroup::create (SIZE_GROUP_BOTH); + Glib::RefPtr clock2_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL); clock2_size_group->add_widget (*secondary_clock->left_btn()); clock2_size_group->add_widget (*secondary_clock->right_btn()); @@ -534,7 +539,8 @@ ARDOUR_UI::setup_transport () /* and the main table layout */ - + int vpadding = 1; + int hpadding = 2; int col = 0; #define TCOL col, col + 1 @@ -549,34 +555,43 @@ ARDOUR_UI::setup_transport () transport_table.attach (layered_label, TCOL, 1, 2 , FILL, SHRINK, 3, 0); ++col; - transport_table.attach (punch_in_button, col, col + 1, 0, 1 , FILL, SHRINK, 0, 2); - transport_table.attach (*(manage (new Label (""))), col + 1, col + 2, 0, 1 , FILL, SHRINK, 2, 2); - transport_table.attach (punch_out_button, col + 2, col + 3, 0, 1 , FILL, SHRINK, 0, 2); - transport_table.attach (layered_button, col, col + 3, 1, 2 , FILL, SHRINK, 0, 2); + transport_table.attach (punch_in_button, col, col + 1, 0, 1 , FILL, SHRINK, hpadding, vpadding); + transport_table.attach (punch_space, col + 1, col + 2, 0, 1 , FILL, SHRINK, 0, vpadding); + transport_table.attach (punch_out_button, col + 2, col + 3, 0, 1 , FILL, SHRINK, hpadding, vpadding); + transport_table.attach (layered_button, col, col + 3, 1, 2 , FILL, SHRINK, hpadding, vpadding); col += 3; - transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + transport_table.attach (recpunch_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); ++col; - transport_table.attach (follow_edits_button, TCOL, 0, 1 , FILL, SHRINK, 2, 0); - transport_table.attach (auto_return_button, TCOL, 1, 2 , FILL, SHRINK, 2, 0); + transport_table.attach (auto_input_button, col, col + 3, 0, 1 , FILL, SHRINK, hpadding, vpadding); + transport_table.attach (monitor_in_button, col, col + 1, 1, 2 , FILL, SHRINK, hpadding, vpadding); + transport_table.attach (mon_space, col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, vpadding); + transport_table.attach (monitor_disk_button, col + 2, col + 3, 1, 2 , FILL, SHRINK, hpadding, vpadding); + col += 3; + + transport_table.attach (monitoring_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; + + transport_table.attach (follow_edits_button, TCOL, 0, 1 , FILL, SHRINK, hpadding, vpadding); + transport_table.attach (auto_return_button, TCOL, 1, 2 , FILL, SHRINK, hpadding, vpadding); ++col; transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); ++col; - transport_table.attach (*primary_clock, col, col + 2, 0, 1 , FILL, SHRINK, 2, 0); - transport_table.attach (*primary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, 2, 0); - transport_table.attach (*primary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 0); + transport_table.attach (*primary_clock, col, col + 2, 0, 1 , FILL, SHRINK, hpadding, 0); + transport_table.attach (*primary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, hpadding, 0); + transport_table.attach (*primary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, hpadding, 0); col += 2; transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); ++col; if (!ARDOUR::Profile->get_small_screen()) { - transport_table.attach (*secondary_clock, col, col + 2, 0, 1 , FILL, SHRINK, 2, 0); - transport_table.attach (*secondary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, 2, 0); - transport_table.attach (*secondary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 0); + transport_table.attach (*secondary_clock, col, col + 2, 0, 1 , FILL, SHRINK, hpadding, 0); + transport_table.attach (*secondary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, hpadding, 0); + transport_table.attach (*secondary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, hpadding, 0); secondary_clock->set_no_show_all (true); secondary_clock->left_btn()->set_no_show_all (true); secondary_clock->right_btn()->set_no_show_all (true); @@ -587,7 +602,7 @@ ARDOUR_UI::setup_transport () ++col; } - transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, 2, 0); + 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); @@ -595,15 +610,15 @@ ARDOUR_UI::setup_transport () /* 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, 2, 0); + transport_table.attach (transport_hbox, TCOL, 0, 2, EXPAND|FILL, EXPAND|FILL, hpadding, 0); ++col; /* lua script action buttons */ transport_table.attach (action_script_table, TCOL, 0, 2, SHRINK, EXPAND|FILL, 1, 0); ++col; - transport_table.attach (editor_visibility_button, TCOL, 0, 1 , FILL, SHRINK, 2, 0); - transport_table.attach (mixer_visibility_button, TCOL, 1, 2 , FILL, SHRINK, 2, 0); + transport_table.attach (editor_visibility_button, TCOL, 0, 1 , FILL, SHRINK, hpadding, vpadding); + transport_table.attach (mixer_visibility_button, TCOL, 1, 2 , FILL, SHRINK, hpadding, vpadding); ++col; repack_transport_hbox (); @@ -779,7 +794,15 @@ ARDOUR_UI::error_blink (bool onoff) } } - +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) @@ -835,6 +858,29 @@ 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) {