X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=b54fe9225a729c0e0003b728d3f6bfc97b9e4296;hb=71f1b360a0c0ddeb9b7eb47f01dfbd87423b314a;hp=1b16c6a7617a45ef38300c2241b11d20974995bb;hpb=66451b183698c68060db26fca8b38053ec69dbad;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 1b16c6a761..b54fe9225a 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Davis + Copyright (C) 1999 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,6 +32,7 @@ #include #include +#include "ardour/session.h" #include "ardour/audioengine.h" #include "ardour/ardour.h" #include "ardour/profile.h" @@ -55,7 +56,7 @@ using namespace Gtk; using namespace Glib; using namespace sigc; -int +int ARDOUR_UI::setup_windows () { if (create_editor ()) { @@ -80,27 +81,27 @@ ARDOUR_UI::setup_windows () #ifdef TOP_MENUBAR HBox* status_bar_packer = manage (new HBox); - + status_bar_label.set_size_request (300, -1); status_bar_packer->pack_start (status_bar_label, true, true, 6); status_bar_packer->pack_start (error_log_button, false, false); - + error_log_button.signal_clicked().connect (mem_fun (*this, &UI::toggle_errors)); editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true); editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 6); #else - top_packer.pack_start (menu_bar_base, false, false); -#endif + top_packer.pack_start (menu_bar_base, false, false); +#endif - top_packer.pack_start (transport_frame, false, false); + top_packer.pack_start (transport_frame, false, false); editor->add_toplevel_controls (top_packer); return 0; } - void +void ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr ptag, RefPtr mtag, const char *msg) { ustring text; @@ -126,71 +127,27 @@ ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtrget_play_range()) { - play_selection_button.set_visual_state (1); - roll_button.set_visual_state (0); - auto_loop_button.set_visual_state (0); - - } else if (session->get_play_loop ()) { - auto_loop_button.set_visual_state (1); - play_selection_button.set_visual_state (0); - roll_button.set_visual_state (0); - - } else { - - roll_button.set_visual_state (1); - play_selection_button.set_visual_state (0); - auto_loop_button.set_visual_state (0); - } - - /* reset shuttle controller */ - - shuttle_fract = SHUTTLE_FRACT_SPEED1; /* speed = 1.0, believe it or not */ - shuttle_box.queue_draw (); -} - -void -ARDOUR_UI::transport_rewinding () -{ - stop_button.set_visual_state (0); - roll_button.set_visual_state (1); - play_selection_button.set_visual_state (0); - auto_loop_button.set_visual_state (0); + return true; } -void -ARDOUR_UI::transport_forwarding () +static void +block_prelight (Gtk::Widget& w) { - stop_button.set_visual_state (0); - roll_button.set_visual_state (1); - play_selection_button.set_visual_state (0); - auto_loop_button.set_visual_state (0); + w.signal_enter_notify_event().connect (sigc::ptr_fun (null_crossing), false); + w.signal_leave_notify_event().connect (sigc::ptr_fun (null_crossing), false); } +#endif void ARDOUR_UI::setup_transport () { transport_tearoff = manage (new TearOff (transport_tearoff_hbox)); transport_tearoff->set_name ("TransportBase"); + transport_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false); if (Profile->get_sae()) { transport_tearoff->set_can_be_torn_off (false); @@ -205,15 +162,15 @@ ARDOUR_UI::setup_transport () transport_frame.set_name ("BaseFrame"); transport_frame.add (transport_base); - transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), + transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), static_cast(&transport_frame))); - transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), + transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), static_cast (&transport_frame), 1)); - transport_tearoff->Hidden.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), + transport_tearoff->Hidden.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), static_cast(&transport_frame))); - transport_tearoff->Visible.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), + transport_tearoff->Visible.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), static_cast (&transport_frame), 1)); - + shuttle_box.set_name ("TransportButton"); goto_start_button.set_name ("TransportButton"); goto_end_button.set_name ("TransportButton"); @@ -230,6 +187,7 @@ ARDOUR_UI::setup_transport () punch_out_button.set_name ("TransportButton"); click_button.set_name ("TransportButton"); time_master_button.set_name ("TransportButton"); + sync_button.set_name ("TransportSyncButton"); stop_button.set_size_request(29, -1); roll_button.set_size_request(29, -1); @@ -238,11 +196,11 @@ ARDOUR_UI::setup_transport () goto_start_button.set_size_request(29, -1); goto_end_button.set_size_request(29, -1); rec_button.set_size_request(29, -1); - + Widget* w; stop_button.set_visual_state (1); - + w = manage (new Image (get_icon (X_("transport_start")))); w->show(); goto_start_button.add (*w); @@ -283,6 +241,8 @@ ARDOUR_UI::setup_transport () act->connect_proxy (play_selection_button); act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster")); act->connect_proxy (time_master_button); + act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); + act->connect_proxy (sync_button); ARDOUR_UI::instance()->tooltips().set_tip (roll_button, _("Play from playhead")); ARDOUR_UI::instance()->tooltips().set_tip (stop_button, _("Stop playback")); @@ -297,12 +257,13 @@ ARDOUR_UI::setup_transport () ARDOUR_UI::instance()->tooltips().set_tip (punch_in_button, _("Start recording at auto-punch start")); ARDOUR_UI::instance()->tooltips().set_tip (punch_out_button, _("Stop recording at auto-punch end")); ARDOUR_UI::instance()->tooltips().set_tip (click_button, _("Enable/Disable audio click")); - ARDOUR_UI::instance()->tooltips().set_tip (sync_option_combo, _("Positional sync source")); + ARDOUR_UI::instance()->tooltips().set_tip (sync_button, _("Enable/Disable external positional sync")); ARDOUR_UI::instance()->tooltips().set_tip (time_master_button, _("Does Ardour control the time?")); ARDOUR_UI::instance()->tooltips().set_tip (shuttle_box, _("Shuttle speed control")); ARDOUR_UI::instance()->tooltips().set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display")); ARDOUR_UI::instance()->tooltips().set_tip (speed_display_box, _("Current transport speed")); - + + shuttle_box.set_flags (CAN_FOCUS); shuttle_box.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK); shuttle_box.set_size_request (100, 15); @@ -375,7 +336,7 @@ ARDOUR_UI::setup_transport () shuttle_units_button.set_name (X_("ShuttleButton")); shuttle_units_button.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::shuttle_unit_clicked)); - + shuttle_style_button.set_name (X_("ShuttleStyleButton")); vector shuttle_strings; @@ -389,16 +350,13 @@ ARDOUR_UI::setup_transport () sdframe->set_shadow_type (SHADOW_IN); sdframe->add (speed_display_box); - mtc_port_changed (); - sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed)); - // XXX HOW TO USE set_popdown_strings() and combo_fudge with this when we don't know - // the real strings till later? - set_size_request_to_display_given_text (sync_option_combo, X_("Igternal"), 4+COMBO_FUDGE, 10); + /* translators: Egternal is "External" with a descender character */ + set_size_request_to_display_given_text (sync_button, X_("Egternal"), 4, 10); shbox->pack_start (*sdframe, false, false); shbox->pack_start (shuttle_units_button, true, true); shbox->pack_start (shuttle_style_button, false, false); - + svbox->pack_start (*sframe, false, false); svbox->pack_start (*shbox, false, false); @@ -420,7 +378,7 @@ ARDOUR_UI::setup_transport () if (!Profile->get_sae()) { VBox* time_controls_box = manage (new VBox); - time_controls_box->pack_start (sync_option_combo, false, false); + time_controls_box->pack_start (sync_button, false, false); time_controls_box->pack_start (time_master_button, false, false); clock_box->pack_start (*time_controls_box, false, false, 1); } @@ -428,7 +386,7 @@ ARDOUR_UI::setup_transport () transport_tearoff_hbox.pack_start (*clock_box, false, false, 0); HBox* toggle_box = manage(new HBox); - + VBox* punch_box = manage (new VBox); punch_box->pack_start (punch_in_button, false, false); punch_box->pack_start (punch_out_button, false, false); @@ -438,12 +396,12 @@ ARDOUR_UI::setup_transport () auto_box->pack_start (auto_play_button, false, false); auto_box->pack_start (auto_return_button, false, false); 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); toggle_box->pack_start (*io_box, false, false); - + /* desensitize */ set_transport_sensitivity (false); @@ -456,7 +414,7 @@ ARDOUR_UI::setup_transport () transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4); 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); @@ -530,7 +488,7 @@ ARDOUR_UI::solo_blink (bool onoff) if (session == 0) { return; } - + if (session->soloing()) { if (onoff) { solo_alert_button.set_state (STATE_ACTIVE); @@ -543,13 +501,36 @@ ARDOUR_UI::solo_blink (bool onoff) } } +void +ARDOUR_UI::sync_blink (bool onoff) +{ + if (session == 0 || !session->config.get_external_sync()) { + /* internal sync */ + sync_button.set_visual_state (0); + return; + } + + if (!session->transport_locked()) { + /* not locked, so blink on and off according to the onoff argument */ + + if (onoff) { + sync_button.set_visual_state (1); // "-active" + } else { + sync_button.set_visual_state (0); // normal + } + } else { + /* locked */ + sync_button.set_visual_state (1); // "-active" + } +} + void ARDOUR_UI::audition_blink (bool onoff) { if (session == 0) { return; } - + if (session->is_auditioning()) { if (onoff) { auditioning_alert_button.set_state (STATE_ACTIVE); @@ -577,27 +558,27 @@ ARDOUR_UI::build_shuttle_context_menu () speed_items.push_back (RadioMenuElem (group, "8", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f))); if (shuttle_max_speed == 8.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } speed_items.push_back (RadioMenuElem (group, "6", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f))); if (shuttle_max_speed == 6.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } speed_items.push_back (RadioMenuElem (group, "4", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f))); if (shuttle_max_speed == 4.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } speed_items.push_back (RadioMenuElem (group, "3", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f))); if (shuttle_max_speed == 3.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } speed_items.push_back (RadioMenuElem (group, "2", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f))); if (shuttle_max_speed == 2.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } speed_items.push_back (RadioMenuElem (group, "1.5", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f))); if (shuttle_max_speed == 1.5) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } items.push_back (MenuElem (_("Maximum speed"), *speed_menu)); @@ -657,7 +638,7 @@ ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev) if (!session) { return true; } - + switch (ev->button) { case 1: mouse_shuttle (ev->x, true); @@ -665,7 +646,7 @@ ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev) shuttle_box.remove_modal_grab (); if (Config->get_shuttle_behaviour() == Sprung) { if (session->config.get_auto_play() || roll_button.get_visual_state()) { - shuttle_fract = SHUTTLE_FRACT_SPEED1; + shuttle_fract = SHUTTLE_FRACT_SPEED1; session->request_transport_speed (1.0); stop_button.set_visual_state (0); roll_button.set_visual_state (1); @@ -706,9 +687,9 @@ ARDOUR_UI::shuttle_box_scroll (GdkEventScroll* ev) if (!session) { return true; } - + switch (ev->direction) { - + case GDK_SCROLL_UP: shuttle_fract += 0.005; break; @@ -763,7 +744,7 @@ void ARDOUR_UI::use_shuttle_fract (bool force) { microseconds_t now = get_microseconds(); - + /* do not attempt to submit a motion-driven transport speed request more than once per process cycle. */ @@ -771,7 +752,7 @@ ARDOUR_UI::use_shuttle_fract (bool force) if (!force && (last_shuttle_request - now) < (microseconds_t) engine->usecs_per_cycle()) { return; } - + last_shuttle_request = now; if (Config->get_shuttle_units() == Semitones) { @@ -789,7 +770,7 @@ ARDOUR_UI::use_shuttle_fract (bool force) bool neg; double fract; - + neg = (shuttle_fract < 0.0); fract = 1 - sqrt (1 - (shuttle_fract * shuttle_fract)); // Formula A1 @@ -885,8 +866,8 @@ ARDOUR_UI::update_speed_display () last_speed_displayed = x; } -} - +} + void ARDOUR_UI::set_transport_sensitivity (bool yn) { @@ -903,17 +884,6 @@ ARDOUR_UI::editor_realized () reset_dpi (); } -void -ARDOUR_UI::sync_option_changed () -{ - if (session) { - ustring txt = sync_option_combo.get_active_text (); - if (txt.length()) { - session->request_slave_source (string_to_slave_source (txt)); - } - } -} - void ARDOUR_UI::maximise_editing_space () {