diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-28 17:44:04 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-28 17:44:04 -0400 |
| commit | 621fd845e6351f01dd328e38d90916abaf437dc1 (patch) | |
| tree | 52018ed8c076a16b87c388858d05dae734073bfa /gtk2_ardour/editor_markers.cc | |
| parent | 34f088576cff12d7bfe1b21a0cebd3e194371a64 (diff) | |
Revert "add new action and loop marker menu item for setting up loop record"
This reverts commit ebb43508f1ab75b7d7467e0e95cdd1c816cf3183.
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 8eac1ddcc3..a8663edf6f 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -834,7 +834,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) { if (transport_marker_menu == 0) { - build_range_marker_menu (loc == transport_loop_location(), loc == transport_punch_location(), loc->is_session_range()); + build_range_marker_menu (loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range()); } marker_menu_item = item; @@ -864,7 +864,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) } else if (loc->is_range_marker()) { if (range_marker_menu == 0) { - build_range_marker_menu (false, false, false); + build_range_marker_menu (false, false); } marker_menu_item = item; range_marker_menu->popup (1, ev->time); @@ -922,11 +922,11 @@ Editor::build_marker_menu (Location* loc) } void -Editor::build_range_marker_menu (bool loop, bool punch, bool session) +Editor::build_range_marker_menu (bool loop_or_punch, bool session) { using namespace Menu_Helpers; - bool const loop_or_punch_or_session = loop | punch | session; + bool const loop_or_punch_or_session = loop_or_punch | session; Menu *markerMenu = new Menu; if (loop_or_punch_or_session) { @@ -940,12 +940,7 @@ Editor::build_range_marker_menu (bool loop, bool punch, bool session) items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range))); items.push_back (MenuElem (_("Locate to Marker"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead))); items.push_back (MenuElem (_("Play from Marker"), sigc::mem_fun(*this, &Editor::marker_menu_play_from))); - - if (!loop) { - items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range))); - } else { - items.push_back (MenuElem (_("Setup Loop Record"), sigc::mem_fun(*this, &Editor::setup_loop_record))); - } + items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range))); items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead))); if (!Profile->get_sae()) { |