diff options
-rw-r--r-- | gtk2_ardour/ardour-menus.xml | 6 | ||||
-rw-r--r-- | gtk2_ardour/ardour.bindings | 3 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 33 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 10 |
4 files changed, 15 insertions, 37 deletions
diff --git a/gtk2_ardour/ardour-menus.xml b/gtk2_ardour/ardour-menus.xml index 57be502461..9e1f7c91bf 100644 --- a/gtk2_ardour/ardour-menus.xml +++ b/gtk2_ardour/ardour-menus.xml @@ -34,9 +34,6 @@ <menuitem action='Rewind'/> <menuitem action='GotoStart'/> <menuitem action='GotoEnd'/> - <separator/> - <menuitem action='TogglePunchIn'/> - <menuitem action='TogglePunchOut'/> <separator/> <menuitem action='jump-forward-to-mark'/> <menuitem action='jump-backward-to-mark'/> @@ -58,8 +55,6 @@ <menuitem action='audition-at-mouse'/> <menuitem action='brush-at-mouse'/> <separator/> - <menuitem action='ToggleFollowPlayhead'/> - <separator/> <menu action='TransportOptions'> <menuitem action='ToggleTimeMaster'/> <menuitem action='TogglePunchIn'/> @@ -68,6 +63,7 @@ <menuitem action='ToggleAutoPlay'/> <menuitem action='ToggleAutoReturn'/> <menuitem action='ToggleClick'/> + <menuitem action='ToggleFollowPlayhead'/> </menu> </menu> <menu name='Edit' action='Edit'> diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings index 58b923fd7a..9a5c8c955e 100644 --- a/gtk2_ardour/ardour.bindings +++ b/gtk2_ardour/ardour.bindings @@ -36,6 +36,9 @@ (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "minus") (gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "equal") +(gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket") +(gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket") + (gtk_accel_path "<Actions>/Editor/align-regions-sync" "<meta>a") (gtk_accel_path "<Actions>/Editor/align-regions-end" "<meta><control>a") (gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<control>a") diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 3ce826ca82..a58b38d62b 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -323,45 +323,16 @@ 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 (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.set_events (shuttle_box.get_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); shuttle_box.set_size_request (100, 15); - goto_start_button.unset_flags (CAN_FOCUS); - goto_end_button.unset_flags (CAN_FOCUS); - roll_button.unset_flags (CAN_FOCUS); - stop_button.unset_flags (CAN_FOCUS); - play_selection_button.unset_flags (CAN_FOCUS); - rec_button.unset_flags (CAN_FOCUS); - auto_loop_button.unset_flags (CAN_FOCUS); - auto_return_button.unset_flags (CAN_FOCUS); - auto_play_button.unset_flags (CAN_FOCUS); - auto_input_button.unset_flags (CAN_FOCUS); - punch_out_button.unset_flags (CAN_FOCUS); - punch_in_button.unset_flags (CAN_FOCUS); - click_button.unset_flags (CAN_FOCUS); - time_master_button.unset_flags (CAN_FOCUS); - - goto_start_button.set_events (goto_start_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - goto_end_button.set_events (goto_end_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - roll_button.set_events (roll_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - stop_button.set_events (stop_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - play_selection_button.set_events (play_selection_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - rec_button.set_events (rec_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - auto_loop_button.set_events (auto_loop_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - auto_return_button.set_events (auto_return_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - auto_play_button.set_events (auto_play_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - auto_input_button.set_events (auto_input_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - click_button.set_events (click_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - punch_in_button.set_events (punch_in_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - punch_out_button.set_events (punch_out_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - time_master_button.set_events (punch_out_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - 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_motion_notify_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion)); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 7bc088e2df..ce60c18807 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -79,7 +79,6 @@ void Editor::undo (uint32_t n) { if (session) { - cerr << "Undo " << n << " operations\n"; session->undo (n); } } @@ -3286,12 +3285,21 @@ Editor::duplicate_some_regions (AudioRegionSelection& regions, float times) for (AudioRegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { Region& r ((*i)->region); + + TimeAxisView& tv = (*i)->get_time_axis_view(); + AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (&tv); + sigc::connection c = atv->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view)); playlist = (*i)->region.playlist(); session->add_undo (playlist->get_memento()); playlist->duplicate (r, r.last_frame(), times); session->add_redo_no_execute (playlist->get_memento()); + c.disconnect (); + } + + if (latest_regionview) { + selection->set (latest_regionview); } commit_reversible_command (); |