X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=27b852982ac249cf19706b8441688bb47e5e776e;hb=afa29d319007ce20bd1546c343e9277c58c80c1a;hp=cc2a990326cd70055e477445a8ae1900c4642de7;hpb=670641c3df89af73de36efa5b0a184c2430275b0;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index cc2a990326..27b852982a 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -48,6 +47,7 @@ using namespace std; using namespace ARDOUR; +using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Glib; @@ -56,8 +56,6 @@ using namespace sigc; int ARDOUR_UI::setup_windows () { - using namespace Menu_Helpers; - if (create_editor ()) { error << _("UI: cannot setup editor") << endmsg; return -1; @@ -132,20 +130,16 @@ ARDOUR_UI::transport_stopped () update_disk_space (); } -static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */ - void ARDOUR_UI::transport_rolling () { stop_button.set_active (false); if (session->get_play_range()) { - play_selection_button.set_active (true); roll_button.set_active (false); auto_loop_button.set_active (false); - } else if (session->get_auto_loop ()) { - + } else if (session->get_play_loop ()) { auto_loop_button.set_active (true); play_selection_button.set_active (false); roll_button.set_active (false); @@ -245,29 +239,37 @@ ARDOUR_UI::setup_transport () goto_start_button.set_colors (colors); goto_end_button.set_colors (colors); + stop_button.set_size_request(29, -1); + roll_button.set_size_request(29, -1); + auto_loop_button.set_size_request(29, -1); + play_selection_button.set_size_request(29, -1); + 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_active (true); - - w = manage (new Image (Stock::MEDIA_PREVIOUS, ICON_SIZE_BUTTON)); + + w = manage (new Image (get_icon (X_("transport_start")))); w->show(); goto_start_button.add (*w); - w = manage (new Image (Stock::MEDIA_NEXT, ICON_SIZE_BUTTON)); + w = manage (new Image (get_icon (X_("transport_end")))); w->show(); goto_end_button.add (*w); - w = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON)); + w = manage (new Image (get_icon (X_("transport_play")))); w->show(); roll_button.add (*w); - w = manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON)); + w = manage (new Image (get_icon (X_("transport_stop")))); w->show(); stop_button.add (*w); - w = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON)); + w = manage (new Image (get_icon (X_("transport_range")))); w->show(); play_selection_button.add (*w); - w = manage (new Image (Stock::MEDIA_RECORD, ICON_SIZE_BUTTON)); + w = manage (new Image (get_icon (X_("transport_record")))); w->show(); rec_button.add (*w); - w = manage (new Image (get_xpm("loop.xpm"))); + w = manage (new Image (get_icon (X_("transport_loop")))); w->show(); auto_loop_button.add (*w); @@ -309,11 +311,12 @@ ARDOUR_UI::setup_transport () 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); + 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); shuttle_box.signal_button_press_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press)); shuttle_box.signal_button_release_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release)); + shuttle_box.signal_scroll_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_scroll)); shuttle_box.signal_motion_notify_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion)); shuttle_box.signal_expose_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_expose)); @@ -360,10 +363,13 @@ ARDOUR_UI::setup_transport () auditioning_alert_button.set_name ("TransportAuditioningAlert"); auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle)); - alert_box.pack_start (solo_alert_button); - alert_box.pack_start (auditioning_alert_button); + tooltips().set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything")); + tooltips().set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition")); + + alert_box.pack_start (solo_alert_button, false, false); + alert_box.pack_start (auditioning_alert_button, false, false); - transport_tearoff_hbox.set_border_width (5); + transport_tearoff_hbox.set_border_width (3); transport_tearoff_hbox.pack_start (goto_start_button, false, false); transport_tearoff_hbox.pack_start (goto_end_button, false, false); @@ -397,8 +403,9 @@ ARDOUR_UI::setup_transport () sdframe->add (speed_display_box); mtc_port_changed (); - sync_option_combo.set_active_text (positional_sync_strings.front()); sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed)); + const guint32 FUDGE = 25; // Combo's are stupid - they steal space from the entry for the button + set_size_request_to_display_given_text (sync_option_combo, X_("Igternal"), 2+FUDGE, 10); shbox->pack_start (*sdframe, false, false); shbox->pack_start (shuttle_units_button, true, true); @@ -407,54 +414,52 @@ ARDOUR_UI::setup_transport () svbox->pack_start (*sframe, false, false); svbox->pack_start (*shbox, false, false); - transport_tearoff_hbox.pack_start (*svbox, false, false, 5); + transport_tearoff_hbox.pack_start (*svbox, false, false, 3); transport_tearoff_hbox.pack_start (auto_loop_button, false, false); transport_tearoff_hbox.pack_start (play_selection_button, false, false); transport_tearoff_hbox.pack_start (roll_button, false, false); transport_tearoff_hbox.pack_start (stop_button, false, false); - transport_tearoff_hbox.pack_start (rec_button, false, false, 10); - - transport_tearoff_hbox.pack_start (primary_clock, false, false, 5); - transport_tearoff_hbox.pack_start (secondary_clock, false, false, 5); - - transport_tearoff_hbox.pack_start (sync_option_combo, false, false); - transport_tearoff_hbox.pack_start (time_master_button, false, false); - transport_tearoff_hbox.pack_start (punch_in_button, false, false); - transport_tearoff_hbox.pack_start (punch_out_button, false, false); - transport_tearoff_hbox.pack_start (auto_input_button, false, false); - transport_tearoff_hbox.pack_start (auto_return_button, false, false); - transport_tearoff_hbox.pack_start (auto_play_button, false, false); - transport_tearoff_hbox.pack_start (click_button, false, false); + transport_tearoff_hbox.pack_start (rec_button, false, false, 6); + + HBox* clock_box = manage (new HBox); + clock_box->pack_start (primary_clock, false, false); + clock_box->pack_start (secondary_clock, false, false); + VBox* time_controls_box = manage (new VBox); + time_controls_box->pack_start (sync_option_combo, false, false); + time_controls_box->pack_start (time_master_button, false, false); + clock_box->pack_start (*time_controls_box, false, false, 1); + 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); + toggle_box->pack_start (*punch_box, false, false); + + VBox* auto_box = manage (new VBox); + 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); -// transport_tearoff_hbox.pack_start (preroll_button, false, false); -// transport_tearoff_hbox.pack_start (preroll_clock, false, false); +// toggle_box->pack_start (preroll_button, false, false); +// toggle_box->pack_start (preroll_clock, false, false); -// transport_tearoff_hbox.pack_start (postroll_button, false, false); -// transport_tearoff_hbox.pack_start (postroll_clock, false, false); +// toggle_box->pack_start (postroll_button, false, false); +// toggle_box->pack_start (postroll_clock, false, false); - transport_tearoff_hbox.pack_start (alert_box, false, false, 5); -} - -void -ARDOUR_UI::setup_clock () -{ - ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false)); - - big_clock_window = new Window (WINDOW_TOPLEVEL); - - big_clock_window->set_border_width (0); - big_clock_window->add (big_clock); - big_clock_window->set_title (_("ardour: clock")); - big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_MENU); - big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); - big_clock_window->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleBigClock"))); - - manage_window (*big_clock_window); + transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4); + transport_tearoff_hbox.pack_start (alert_box, false, false); } void @@ -499,7 +504,7 @@ ARDOUR_UI::_auditioning_changed (bool onoff) void ARDOUR_UI::auditioning_changed (bool onoff) { - Gtkmm2ext::UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff)); + UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff)); } void @@ -556,12 +561,73 @@ ARDOUR_UI::audition_blink (bool onoff) } } +void +ARDOUR_UI::build_shuttle_context_menu () +{ + using namespace Menu_Helpers; + + shuttle_context_menu = new Menu(); + MenuList& items = shuttle_context_menu->items(); + + Menu* speed_menu = manage (new Menu()); + MenuList& speed_items = speed_menu->items(); + + RadioMenuItem::Group group; + + 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 (); + } + 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 (); + } + 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 (); + } + 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 (); + } + 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 (); + } + 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 (); + } + + items.push_back (MenuElem (_("Maximum speed"), *speed_menu)); +} + +void +ARDOUR_UI::show_shuttle_context_menu () +{ + if (shuttle_context_menu == 0) { + build_shuttle_context_menu (); + } + + shuttle_context_menu->popup (1, gtk_get_current_event_time()); +} + +void +ARDOUR_UI::set_shuttle_max_speed (float speed) +{ + shuttle_max_speed = speed; +} gint ARDOUR_UI::shuttle_box_button_press (GdkEventButton* ev) { if (!session) { - return TRUE; + return true; + } + + if (Keyboard::is_context_menu_event (ev)) { + show_shuttle_context_menu (); + return true; } switch (ev->button) { @@ -573,44 +639,53 @@ ARDOUR_UI::shuttle_box_button_press (GdkEventButton* ev) case 2: case 3: - return TRUE; + return true; break; } - return TRUE; + return true; } gint ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev) { if (!session) { - return TRUE; + return true; } - + switch (ev->button) { case 1: mouse_shuttle (ev->x, true); shuttle_grabbed = false; shuttle_box.remove_modal_grab (); - if (shuttle_behaviour == Sprung) { - shuttle_fract = SHUTTLE_FRACT_SPEED1; - session->request_transport_speed (1.0); + if (Config->get_shuttle_behaviour() == Sprung) { + if (Config->get_auto_play() || roll_button.get_state()) { + shuttle_fract = SHUTTLE_FRACT_SPEED1; + session->request_transport_speed (1.0); + stop_button.set_active (false); + roll_button.set_active (true); + } else { + shuttle_fract = 0; + session->request_transport_speed (0.0); + } shuttle_box.queue_draw (); } - return TRUE; + return true; case 2: if (session->transport_rolling()) { shuttle_fract = SHUTTLE_FRACT_SPEED1; session->request_transport_speed (1.0); + stop_button.set_active (false); + roll_button.set_active (true); } else { shuttle_fract = 0; } shuttle_box.queue_draw (); - return TRUE; + return true; case 3: - return TRUE; + return true; case 4: shuttle_fract += 0.005; @@ -622,14 +697,39 @@ ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev) use_shuttle_fract (true); - return TRUE; + return true; +} + +gint +ARDOUR_UI::shuttle_box_scroll (GdkEventScroll* ev) +{ + if (!session) { + return true; + } + + switch (ev->direction) { + + case GDK_SCROLL_UP: + shuttle_fract += 0.005; + break; + case GDK_SCROLL_DOWN: + shuttle_fract -= 0.005; + break; + default: + /* scroll left/right */ + return false; + } + + use_shuttle_fract (true); + + return true; } gint ARDOUR_UI::shuttle_box_motion (GdkEventMotion* ev) { if (!session || !shuttle_grabbed) { - return TRUE; + return true; } return mouse_shuttle (ev->x, false); @@ -649,7 +749,7 @@ ARDOUR_UI::mouse_shuttle (double x, bool force) shuttle_fract = distance / half_width; use_shuttle_fract (force); - return TRUE; + return true; } void @@ -679,7 +779,7 @@ ARDOUR_UI::use_shuttle_fract (bool force) fract = -fract; } - session->request_transport_speed (8.0 * fract); // Formula A2 + session->request_transport_speed (shuttle_max_speed * fract); // Formula A2 shuttle_box.queue_draw (); } @@ -706,7 +806,7 @@ ARDOUR_UI::shuttle_box_expose (GdkEventExpose* event) 0, x, shuttle_box.get_height()); - return TRUE; + return true; } void @@ -715,20 +815,7 @@ ARDOUR_UI::shuttle_unit_clicked () if (shuttle_unit_menu == 0) { shuttle_unit_menu = dynamic_cast (ActionManager::get_widget ("/ShuttleUnitPopup")); } - shuttle_unit_menu->popup (1, 0); -} - -void -ARDOUR_UI::set_shuttle_units (ShuttleUnits u) -{ - switch ((shuttle_units = u)) { - case Percentage: - static_cast(shuttle_units_button.get_child())->set_text ("% "); - break; - case Semitones: - static_cast(shuttle_units_button.get_child())->set_text (_("st")); - break; - } + shuttle_unit_menu->popup (1, gtk_get_current_event_time()); } void @@ -737,31 +824,9 @@ ARDOUR_UI::shuttle_style_changed () ustring str = shuttle_style_button.get_active_text (); if (str == _("sprung")) { - set_shuttle_behaviour (Sprung); + Config->set_shuttle_behaviour (Sprung); } else if (str == _("wheel")) { - set_shuttle_behaviour (Wheel); - } -} - - -void -ARDOUR_UI::set_shuttle_behaviour (ShuttleBehaviour b) -{ - switch ((shuttle_behaviour = b)) { - case Sprung: - shuttle_style_button.set_active_text (_("sprung")); - shuttle_fract = 0.0; - shuttle_box.queue_draw (); - if (session) { - if (session->transport_rolling()) { - shuttle_fract = SHUTTLE_FRACT_SPEED1; - session->request_transport_speed (1.0); - } - } - break; - case Wheel: - shuttle_style_button.set_active_text (_("wheel")); - break; + Config->set_shuttle_behaviour (Wheel); } } @@ -770,7 +835,7 @@ ARDOUR_UI::update_speed_display () { if (!session) { if (last_speed_displayed != 0) { - speed_display_label.set_text (_("stopped")); + speed_display_label.set_text (_("stop")); last_speed_displayed = 0; } return; @@ -782,8 +847,8 @@ ARDOUR_UI::update_speed_display () if (x != last_speed_displayed) { if (x != 0) { - if (shuttle_units == Percentage) { - snprintf (buf, sizeof (buf), "%.4f", x); + if (Config->get_shuttle_units() == Percentage) { + snprintf (buf, sizeof (buf), "%.2f", x); } else { if (x < 0) { snprintf (buf, sizeof (buf), "< %.1f", 12.0 * fast_log2 (-x)); @@ -793,7 +858,7 @@ ARDOUR_UI::update_speed_display () } speed_display_label.set_text (buf); } else { - speed_display_label.set_text (_("stopped")); + speed_display_label.set_text (_("stop")); } last_speed_displayed = x; @@ -810,31 +875,19 @@ ARDOUR_UI::set_transport_sensitivity (bool yn) void ARDOUR_UI::editor_realized () { - set_size_request_to_display_given_text (speed_display_box, _("stopped"), 2, 2); - /* XXX: this should really be saved in instant.xml or something similar and restored from there */ - shuttle_style_button.set_active_text (_("sprung")); - const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button + Config->map_parameters (mem_fun (*this, &ARDOUR_UI::parameter_changed)); + + set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2); + const guint32 FUDGE = 25; // Combo's are stupid - they steal space from the entry for the button set_size_request_to_display_given_text (shuttle_style_button, _("sprung"), 2+FUDGE, 10); } void ARDOUR_UI::sync_option_changed () { - string which; - - if (session == 0) { - return; + if (session) { + session->request_slave_source (string_to_slave_source (sync_option_combo.get_active_text())); } - - which = sync_option_combo.get_active_text(); - - if (which == positional_sync_strings[Session::None]) { - session->request_slave_source (Session::None); - } else if (which == positional_sync_strings[Session::MTC]) { - session->request_slave_source (Session::MTC); - } else if (which == positional_sync_strings[Session::JACK]) { - session->request_slave_source (Session::JACK); - } } void