smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

remove mistaken handling of cue marker bar events

Browse source
This commit is contained in:
Paul Davis 2022-01-04 16:08:10 -07:00
parent 7e65097ded
commit 1d2fa465d3
4 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gtk2_ardour/editor_drag.cc
View file

@ -6092,7 +6092,6 @@ RangeMarkerBarDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
case CreateRangeMarker: case CreateRangeMarker:
case CreateTransportMarker: case CreateTransportMarker:
case CreateCDMarker: case CreateCDMarker:
case CreateCueMarker:
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::CopyModifier)) { if (Keyboard::modifier_state_equals (event->button.state, Keyboard::CopyModifier)) {
_copy = true; _copy = true;
} else { } else {
@ -6127,9 +6126,6 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move)
case CreateCDMarker: case CreateCDMarker:
crect = _editor->cd_marker_bar_drag_rect; crect = _editor->cd_marker_bar_drag_rect;
break; break;
case CreateCueMarker:
crect = _editor->cue_marker_bar_drag_rect;
break;
default: default:
error << string_compose (_("programming_error: %1"), "Error: unknown range marker op passed to Editor::drag_range_markerbar_op ()") << endmsg; error << string_compose (_("programming_error: %1"), "Error: unknown range marker op passed to Editor::drag_range_markerbar_op ()") << endmsg;
return; return;
@ -6138,7 +6134,7 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move)
timepos_t const pf = adjusted_current_time (event); 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()); timepos_t grab (grab_time());
_editor->snap_to (grab); _editor->snap_to (grab);
@ -6187,7 +6183,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred)
{ {
Location * newloc = 0; Location * newloc = 0;
string rangename; string rangename;
int flags; Location::Flags flags;
if (movement_occurred) { if (movement_occurred) {
motion (event, false); motion (event, false);
@ -6197,24 +6193,18 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred)
case CreateSkipMarker: case CreateSkipMarker:
case CreateRangeMarker: case CreateRangeMarker:
case CreateCDMarker: case CreateCDMarker:
case CreateCueMarker:
{ {
XMLNode &before = _editor->session()->locations()->get_state(); XMLNode &before = _editor->session()->locations()->get_state();
if (_operation == CreateSkipMarker) { if (_operation == CreateSkipMarker) {
_editor->begin_reversible_command (_("new skip marker")); _editor->begin_reversible_command (_("new skip marker"));
_editor->session()->locations()->next_available_name(rangename,_("skip")); _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(); _editor->range_bar_drag_rect->hide();
} else if (_operation == CreateCDMarker) { } else if (_operation == CreateCDMarker) {
_editor->session()->locations()->next_available_name(rangename, _("CD")); _editor->session()->locations()->next_available_name(rangename, _("CD"));
_editor->begin_reversible_command (_("new CD marker")); _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(); _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 { } else {
_editor->begin_reversible_command (_("new skip marker")); _editor->begin_reversible_command (_("new skip marker"));
_editor->session()->locations()->next_available_name(rangename, _("unnamed")); _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(); _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); _editor->session()->locations()->add (newloc, true);
XMLNode &after = _editor->session()->locations()->get_state(); XMLNode &after = _editor->session()->locations()->get_state();
@ -6249,8 +6239,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred)
} else if (_operation == CreateCDMarker) { } else if (_operation == CreateCDMarker) {
/* didn't drag, but mark is already created so do /* didn't drag, but mark is already created so do nothing */
* nothing */
} else { /* operation == CreateRangeMarker || CreateSkipMarker */ } else { /* operation == CreateRangeMarker || CreateSkipMarker */

3
gtk2_ardour/editor_drag.h
View file

@ -1299,8 +1299,7 @@ public:
CreateSkipMarker, CreateSkipMarker,
CreateRangeMarker, CreateRangeMarker,
CreateTransportMarker, CreateTransportMarker,
CreateCDMarker, CreateCDMarker
CreateCueMarker
}; };
RangeMarkerBarDrag (Editor *, ArdourCanvas::Item *, Operation); RangeMarkerBarDrag (Editor *, ArdourCanvas::Item *, Operation);

2
gtk2_ardour/editor_mouse.cc
View file

@ -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)) { if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
_drags->set (new CursorDrag (this, *_playhead_cursor, false), event); _drags->set (new CursorDrag (this, *_playhead_cursor, false), event);
} else { } else {
_drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateCueMarker), event); /* no range dragging on this ruler/bar */
} }
return true; return true;
break; break;

2
gtk2_ardour/editor_rulers.cc
View file

@ -245,7 +245,7 @@ Editor::popup_ruler_menu (timepos_t const & where, ItemType t)
case CueMarkerBarItem: case CueMarkerBarItem:
// TODO // 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; break;
case TempoBarItem: case TempoBarItem: