X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=19e8a8ce6f02c79e0fe60a5d5de3e4435841bee7;hb=98f44aa20cef3c59506c2b15af92c6499d8b1c57;hp=076f9f2f5225019dc11423b5066d5f5ed70c638c;hpb=121860f9d40a9e7ce39d49cecebc538d6a5ec17e;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 076f9f2f52..19e8a8ce6f 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -37,17 +37,17 @@ #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 "button_joiner.h" +#include "main_clock.h" #include "utils.h" #include "theme_manager.h" #include "midi_tracer.h" @@ -114,6 +114,7 @@ ARDOUR_UI::setup_windows () editor->add_toplevel_controls (top_packer); setup_transport(); + build_menu_bar (); setup_tooltips (); @@ -128,18 +129,18 @@ 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 (*transport_joiner, _("Always Play Range Selection (if any)")); set_tip (auto_return_button, _("Return to last playback start when stopped")); set_tip (auto_play_button, _("Start playback after any locate")); 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 (feedback_alert_button, _("When active, there is a feedback loop.")); set_tip (primary_clock, _("Primary Clock")); set_tip (secondary_clock, _("Secondary Clock")); @@ -212,6 +213,9 @@ ARDOUR_UI::setup_transport () { RefPtr act; + transport_tearoff_hbox.set_border_width (3); + transport_tearoff_hbox.set_spacing (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); @@ -250,12 +254,13 @@ ARDOUR_UI::setup_transport () auto_return_button.set_name ("transport option button"); auto_play_button.set_name ("transport option button"); auto_input_button.set_name ("transport option button"); - click_button.set_name ("transport option button"); - time_master_button.set_name ("TransportButton"); - sync_button.set_name ("TransportSyncButton"); + /* these have to provide a clear indication of active state */ + + click_button.set_name ("transport active option button"); + sync_button.set_name ("transport active option button"); - stop_button.set_active_state (Active); + stop_button.set_active (true); goto_start_button.set_image (get_icon (X_("transport_start"))); goto_end_button.set_image (get_icon (X_("transport_end"))); @@ -264,8 +269,11 @@ ARDOUR_UI::setup_transport () play_selection_button.set_image (get_icon (X_("transport_range"))); rec_button.set_image (get_icon (X_("transport_record"))); auto_loop_button.set_image (get_icon (X_("transport_loop"))); - join_play_range_button.set_image (get_icon (X_("tool_object_range"))); + midi_panic_button.set_image (get_icon (X_("midi_panic"))); + /* the icon for this has an odd aspect ratio, so fatten up the button */ + midi_panic_button.set_size_request (25, -1); + act = ActionManager::get_action (X_("Transport"), X_("Stop")); stop_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("Roll")); @@ -280,18 +288,20 @@ ARDOUR_UI::setup_transport () 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_("Transport"), X_("ToggleTimeMaster")); - act->connect_proxy (time_master_button); + 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); + transport_joiner = manage (new ButtonJoiner ("transport button", play_selection_button, roll_button)); + + act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange")); + transport_joiner->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)); @@ -308,66 +318,78 @@ ARDOUR_UI::setup_transport () /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */ - solo_alert_button.set_name ("TransportSoloAlert"); + solo_alert_button.set_name ("rude solo"); solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false); - auditioning_alert_button.set_name ("TransportAuditioningAlert"); + 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); - - alert_box.pack_start (solo_alert_button, false, false); - alert_box.pack_start (auditioning_alert_button, false, 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); + + alert_box.pack_start (solo_alert_button, true, false); + alert_box.pack_start (auditioning_alert_button, true, false); + alert_box.pack_start (feedback_alert_button, true, false); + + /* 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); + + HBox* tbox1 = manage (new HBox); + HBox* tbox2 = manage (new HBox); + HBox* tbox3 = manage (new HBox); HBox* tbox = manage (new HBox); - tbox->set_spacing (2); - transport_tearoff_hbox.set_border_width (3); + VBox* vbox1 = manage (new VBox); + VBox* vbox2 = manage (new VBox); + VBox* vbox3 = manage (new VBox); - tbox->pack_start (goto_start_button, false, false); - tbox->pack_start (goto_end_button, false, false); + Alignment* a1 = manage (new Alignment); + Alignment* a2 = manage (new Alignment); + Alignment* a3 = manage (new Alignment); - /* 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); - - Glib::RefPtr transport_button_size_group1 = SizeGroup::create (SIZE_GROUP_HORIZONTAL); - transport_button_size_group1->add_widget (goto_start_button); - transport_button_size_group1->add_widget (goto_end_button); - transport_button_size_group1->add_widget (auto_loop_button); - transport_button_size_group1->add_widget (rec_button); - - if (Profile->get_sae()) { - tbox->pack_start (auto_loop_button); - tbox->pack_start (roll_button); - transport_button_size_group1->add_widget (play_selection_button); - transport_button_size_group1->add_widget (roll_button); + tbox1->set_spacing (2); + tbox2->set_spacing (2); + tbox3->set_spacing (2); + tbox->set_spacing (2); - } else { + tbox1->pack_start (midi_panic_button, false, false); + tbox1->pack_start (goto_start_button, false, false); + tbox1->pack_start (goto_end_button, false, false); + tbox1->pack_start (auto_loop_button, false, false); - tbox->pack_start (auto_loop_button, false, false); + play_selection_button.set_rounded_corner_mask (0x1); /* upper left only */ + roll_button.set_rounded_corner_mask (0x2); /* upper right only */ - Frame* jpframe = manage (new Frame); - HBox* jpbox = manage (new HBox); + tbox2->pack_start (*transport_joiner, false, false); - jpframe->add (*jpbox); - jpframe->set_shadow_type (SHADOW_NONE); - - jpbox->pack_start (play_selection_button, false, false); - jpbox->pack_start (join_play_range_button, false, false); - jpbox->pack_start (roll_button, false, false); + tbox3->pack_start (stop_button, false, false); + tbox3->pack_start (rec_button, false, false, 6); - tbox->pack_start (*jpframe, false, false); + vbox1->pack_start (*tbox1, false, false); + vbox2->pack_start (*tbox2, false, false); + vbox3->pack_start (*tbox3, false, false); - Glib::RefPtr transport_button_size_group2 = SizeGroup::create (SIZE_GROUP_HORIZONTAL); - transport_button_size_group2->add_widget (play_selection_button); - transport_button_size_group2->add_widget (join_play_range_button); - transport_button_size_group2->add_widget (roll_button); - } + a1->add (*vbox1); + a1->set (0.5, 1.0, 0.0, 0.0); + a2->add (*vbox2); + a2->set (0.5, 1.0, 0.0, 0.0); + a3->add (*vbox3); + a3->set (0.5, 1.0, 0.0, 0.0); - tbox->pack_start (stop_button, false, false); - tbox->pack_start (rec_button, false, false, 6); + tbox->pack_start (*a1, false, false); + tbox->pack_start (*a2, false, false); + tbox->pack_start (*a3, 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()) { @@ -375,7 +397,6 @@ ARDOUR_UI::setup_transport () clock_box->pack_start (*secondary_clock, false, false); } - shuttle_box = new ShuttleControl; shuttle_box->show (); @@ -386,52 +407,38 @@ ARDOUR_UI::setup_transport () transport_vbox->pack_start (*tbox, true, true, 0); transport_vbox->pack_start (*shuttle_box, false, false, 0); - transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0); - - Table* time_controls_table = manage (new Table (2, 2)); - time_controls_table->set_col_spacings (6); - time_controls_table->attach (sync_button, 0, 1, 0, 1, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0)); - time_controls_table->attach (time_master_button, 0, 1, 1, 2, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0)); - - time_controls_table->attach (click_button, 1, 2, 0, 2, Gtk::AttachOptions(FILL|EXPAND), FILL); - - transport_tearoff_hbox.pack_start (*clock_box, false, false); - transport_tearoff_hbox.pack_start (*time_controls_table, false, false, 4); - - time_info_box = manage (new TimeInfoBox); - transport_tearoff_hbox.pack_start (*time_info_box, false, false); + transport_tearoff_hbox.pack_start (*transport_vbox, false, false); - HBox* toggle_box = manage(new HBox); + /* transport related toggle controls */ VBox* auto_box = manage (new VBox); + auto_box->set_homogeneous (true); + auto_box->set_spacing (2); + auto_box->pack_start (sync_button, false, false); 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); - } - - /* desensitize */ + transport_tearoff_hbox.pack_start (*auto_box, false, false); + transport_tearoff_hbox.pack_start (*clock_box, false, false); + transport_tearoff_hbox.pack_start (click_button, false, false); - set_transport_sensitivity (false); + time_info_box = manage (new TimeInfoBox); + transport_tearoff_hbox.pack_start (*time_info_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 (_editor_transport_box, false, false); } transport_tearoff_hbox.pack_start (alert_box, 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); @@ -471,10 +478,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 @@ -505,6 +510,12 @@ ARDOUR_UI::solo_alert_press (GdkEventButton*) return true; } +bool +ARDOUR_UI::feedback_alert_press (GdkEventButton *) +{ + return true; +} + void ARDOUR_UI::solo_blink (bool onoff) { @@ -514,13 +525,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); } } @@ -529,7 +539,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; } @@ -537,13 +547,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); } } @@ -556,13 +566,26 @@ 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); } } @@ -585,26 +608,17 @@ ARDOUR_UI::editor_realized () void ARDOUR_UI::maximise_editing_space () { - if (!editor) { - return; - } - - transport_tearoff->set_visible (false); - editor->maximise_editing_space (); - if (Config->get_keep_tearoffs()) { - transport_tearoff->set_visible (true); + 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 (); } bool @@ -624,3 +638,17 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev) rc_option_editor->set_current_page (_("Misc")); return true; } + +void +ARDOUR_UI::toggle_always_play_range () +{ + RefPtr act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange")); + assert (act); + + RefPtr tact = RefPtr::cast_dynamic (act); + assert (tact); + + Config->set_always_play_range (tact->get_active ()); +} + +