{
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"));
}
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();
}
}
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);
- 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));
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 */
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<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);
/* 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);
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);
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);
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 (*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);
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_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)
{
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)
{
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 ()
+{
+ 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