From 1d2fa465d353c8143685d70717f93cecde731c5c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 4 Jan 2022 16:08:10 -0700 Subject: [PATCH] remove mistaken handling of cue marker bar events --- gtk2_ardour/editor_drag.cc | 23 ++++++----------------- gtk2_ardour/editor_drag.h | 3 +-- gtk2_ardour/editor_mouse.cc | 2 +- gtk2_ardour/editor_rulers.cc | 2 +- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index b1dd9043ae..710656d348 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -6092,7 +6092,6 @@ RangeMarkerBarDrag::start_grab (GdkEvent* event, Gdk::Cursor *) case CreateRangeMarker: case CreateTransportMarker: case CreateCDMarker: - case CreateCueMarker: if (Keyboard::modifier_state_equals (event->button.state, Keyboard::CopyModifier)) { _copy = true; } else { @@ -6127,9 +6126,6 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move) case CreateCDMarker: crect = _editor->cd_marker_bar_drag_rect; break; - case CreateCueMarker: - crect = _editor->cue_marker_bar_drag_rect; - break; default: error << string_compose (_("programming_error: %1"), "Error: unknown range marker op passed to Editor::drag_range_markerbar_op ()") << endmsg; return; @@ -6138,7 +6134,7 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move) timepos_t const pf = adjusted_current_time (event); - if (_operation == CreateSkipMarker || _operation == CreateRangeMarker || _operation == CreateTransportMarker || _operation == CreateCDMarker || _operation == CreateCueMarker) { + if (_operation == CreateSkipMarker || _operation == CreateRangeMarker || _operation == CreateTransportMarker || _operation == CreateCDMarker) { timepos_t grab (grab_time()); _editor->snap_to (grab); @@ -6187,7 +6183,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) { Location * newloc = 0; string rangename; - int flags; + Location::Flags flags; if (movement_occurred) { motion (event, false); @@ -6197,24 +6193,18 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) case CreateSkipMarker: case CreateRangeMarker: case CreateCDMarker: - case CreateCueMarker: { XMLNode &before = _editor->session()->locations()->get_state(); if (_operation == CreateSkipMarker) { _editor->begin_reversible_command (_("new skip marker")); _editor->session()->locations()->next_available_name(rangename,_("skip")); - flags = Location::IsRangeMarker | Location::IsSkip; + flags = Location::Flags (Location::IsRangeMarker | Location::IsSkip); _editor->range_bar_drag_rect->hide(); } else if (_operation == CreateCDMarker) { _editor->session()->locations()->next_available_name(rangename, _("CD")); _editor->begin_reversible_command (_("new CD marker")); - flags = Location::IsRangeMarker | Location::IsCDMarker; + flags = Location::Flags (Location::IsRangeMarker | Location::IsCDMarker); _editor->cd_marker_bar_drag_rect->hide(); - } else if (_operation == CreateCueMarker) { - _editor->session()->locations()->next_available_name(rangename, _("Cue")); - _editor->begin_reversible_command (_("new cue marker")); - flags = Location::IsRangeMarker | Location::IsCueMarker; - _editor->cue_marker_bar_drag_rect->hide(); } else { _editor->begin_reversible_command (_("new skip marker")); _editor->session()->locations()->next_available_name(rangename, _("unnamed")); @@ -6222,7 +6212,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) _editor->range_bar_drag_rect->hide(); } - newloc = new Location (*_editor->session(), _editor->temp_location->start(), _editor->temp_location->end(), rangename, (Location::Flags) flags); + newloc = new Location (*_editor->session(), _editor->temp_location->start(), _editor->temp_location->end(), rangename, flags); _editor->session()->locations()->add (newloc, true); XMLNode &after = _editor->session()->locations()->get_state(); @@ -6249,8 +6239,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) } else if (_operation == CreateCDMarker) { - /* didn't drag, but mark is already created so do - * nothing */ + /* didn't drag, but mark is already created so do nothing */ } else { /* operation == CreateRangeMarker || CreateSkipMarker */ diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 51fe5d5aca..0c51ef9d4a 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -1299,8 +1299,7 @@ public: CreateSkipMarker, CreateRangeMarker, CreateTransportMarker, - CreateCDMarker, - CreateCueMarker + CreateCDMarker }; RangeMarkerBarDrag (Editor *, ArdourCanvas::Item *, Operation); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 91aa6be3f7..2ea136b638 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -861,7 +861,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { _drags->set (new CursorDrag (this, *_playhead_cursor, false), event); } else { - _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateCueMarker), event); + /* no range dragging on this ruler/bar */ } return true; break; diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 1fc7b1aef7..2d67c9cc4b 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -245,7 +245,7 @@ Editor::popup_ruler_menu (timepos_t const & where, ItemType t) case CueMarkerBarItem: // TODO - ruler_items.push_back (MenuElem (_("New Cue track marker"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, Location::IsCueMarker))); + ruler_items.push_back (MenuElem (_("New Cue marker"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, Location::IsCueMarker))); break; case TempoBarItem: