#include <cmath>
#include <sigc++/bind.h>
+#include <gtkmm/settings.h>
+
#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/click_box.h"
#include "gtkmm2ext/window_title.h"
#include "ardour/profile.h"
#include "ardour/session.h"
#include "ardour/types.h"
-#include "ardour_spacer.h"
#include "ardour_ui.h"
#include "keyboard.h"
#include "public_editor.h"
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
using namespace Gtk;
using namespace Glib;
using namespace ARDOUR_UI_UTILS;
{
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, _("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."));
}
void
-ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg)
+ARDOUR_UI::display_message (const char* prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char* msg)
{
- string text;
-
UI::display_message (prefix, prefix_len, ptag, mtag, msg);
ArdourLogLevel ll = LogLevelNone;
if (strcmp (prefix, _("[ERROR]: ")) == 0) {
- text = "<span color=\"red\" weight=\"bold\">";
ll = LogLevelError;
} else if (strcmp (prefix, _("[WARNING]: ")) == 0) {
- text = "<span color=\"yellow\" weight=\"bold\">";
ll = LogLevelWarning;
} else if (strcmp (prefix, _("[INFO]: ")) == 0) {
- text = "<span color=\"green\" weight=\"bold\">";
ll = LogLevelInfo;
- } else {
- text = "<span color=\"white\" weight=\"bold\">???";
}
_log_not_acknowledged = std::max(_log_not_acknowledged, ll);
-
-#ifdef TOP_MENUBAR
- text += prefix;
- text += "</span>";
- text += msg;
-
- status_bar_label.set_markup (text);
-#endif
}
XMLNode*
}
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();
}
}
+
+ 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
}
}
-bool
-ARDOUR_UI::transport_expose (GdkEventExpose* ev)
-{
-return false;
- int x0, y0;
- Gtk::Widget* window_parent;
- Glib::RefPtr<Gdk::Window> win = Gtkmm2ext::window_to_draw_on (transport_table, &window_parent);
- Glib::RefPtr<Gtk::Style> style = transport_table.get_style();
- if (!win || !style) {
- return false;
- }
-
- Cairo::RefPtr<Cairo::Context> 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 ()
{
RefPtr<Action> 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);
-
- 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 = global_actions.find_action ("Transport", "SessionMonitorIn");
+ monitor_in_button.set_related_action (act);
+ 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));
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");
punch_out_button.set_name ("punch button");
layered_button.set_name (("layered button"));
- click_button.set_name ("transport button");
+ monitor_in_button.set_name ("monitor button");
+ monitor_disk_button.set_name ("monitor button");
+ auto_input_button.set_name ("transport option 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:"));
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"));
- /* 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);
+ 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"));
/* transport control size-group */
- Glib::RefPtr<SizeGroup> 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<SizeGroup> 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);
+ Glib::RefPtr<SizeGroup> 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 */
transport_table.set_spacings (0);
transport_table.set_row_spacings (4);
- transport_table.set_border_width (2);
- transport_frame.add (transport_table);
- transport_frame.set_name ("BaseFrame");
- transport_frame.set_shadow_type (Gtk::SHADOW_NONE);
+ transport_table.set_border_width (0);
- 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));
-
- 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);
+ transport_frame.set_name ("TransportFrame");
+ transport_frame.set_shadow_type (Gtk::SHADOW_NONE);
- tbox->pack_start (roll_button, true, true);
- tbox->pack_start (stop_button, true, true);
- tbox->pack_start (rec_button, true, true, 3);
+ /* 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_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
+ the parent, "TransportFrame".
+ */
+ Gtk::EventBox* ebox = manage (new Gtk::EventBox);
+ transport_frame.add (*ebox);
+ ebox->add (transport_table);
/* alert box sub-group */
VBox* alert_box = manage (new VBox);
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<SizeGroup> button_height_size_group = SizeGroup::create (Gtk::SIZE_GROUP_VERTICAL);
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 (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<SizeGroup> 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<SizeGroup> 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<SizeGroup> clock2_size_group = SizeGroup::create (SIZE_GROUP_BOTH);
+ Glib::RefPtr<SizeGroup> 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());
/* and the main table layout */
-
+ int vpadding = 1;
+ int hpadding = 2;
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;
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);
++col;
}
- transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, 2, 0);
- ++col;
-
- transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
+ transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, hpadding, 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, 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 ();
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
if (ev->button == 1) {
if (_log_not_acknowledged == LogLevelError) {
// just acknowledge the error, don't hide the log if it's already visible
- RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window"));
+ RefPtr<Action> act = editor->find_action (X_("Editor"), X_("toggle-log-window"));
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact && tact->get_active()) {
do_toggle = false;
break;
}
}
-
-
-
void
ARDOUR_UI::set_transport_sensitivity (bool yn)
{
{
if (rc_option_editor) {
show_tabbable (rc_option_editor);
- rc_option_editor->set_current_page (_("GUI"));
+ rc_option_editor->set_current_page (_("Appearance"));
}
}
}
show_tabbable (rc_option_editor);
- rc_option_editor->set_current_page (_("Misc/Click"));
+ rc_option_editor->set_current_page (_("Metronome"));
return true;
}
}
show_tabbable (rc_option_editor);
- rc_option_editor->set_current_page (_("Transport/Sync"));
+ rc_option_editor->set_current_page (_("Sync"));
return true;
}
void
ARDOUR_UI::toggle_follow_edits ()
{
- RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
+ RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("ToggleFollowEdits"));
assert (act);
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
}
}
+
+void
+ARDOUR_UI::toggle_use_monitor_section ()
+{
+ if (!_session) {
+ return;
+ }
+
+ RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "UseMonitorSection");
+ assert (act); RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::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);
+}
projects / ardour.git / blobdiff