ardour/livetrax
13
0
Fork 0
Code

remove a number of canvas items that no longer exist after ruler consolidation

Browse Source
This commit is contained in:
Paul Davis 2024-05-17 09:07:00 -06:00
parent fc194237eb
commit 553e534455
4 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_canvas.cc
View File

@ -1448,12 +1448,8 @@ Editor::which_canvas_cursor(ItemType type) const
case MarkerItem: case MarkerItem:
case MarkerBarItem: case MarkerBarItem:
case RangeMarkerBarItem: case RangeMarkerBarItem:
case CdMarkerBarItem:
case SectionMarkerBarItem: case SectionMarkerBarItem:
case CueMarkerBarItem:
case SceneMarkerBarItem:
case VideoBarItem: case VideoBarItem:
case TransportMarkerBarItem:
case DropZoneItem: case DropZoneItem:
case GridZoneItem: case GridZoneItem:
case SelectionMarkerItem: case SelectionMarkerItem:

4
gtk2_ardour/editor_items.h
View File

@ -30,12 +30,8 @@ enum ItemType {
SceneMarkerItem, SceneMarkerItem,
MarkerBarItem, MarkerBarItem,
RangeMarkerBarItem, RangeMarkerBarItem,
CdMarkerBarItem,
SectionMarkerBarItem, SectionMarkerBarItem,
CueMarkerBarItem,
SceneMarkerBarItem,
VideoBarItem, VideoBarItem,
TransportMarkerBarItem,
SelectionItem, SelectionItem,
ControlPointItem, ControlPointItem,
GainLineItem, GainLineItem,

50
gtk2_ardour/editor_mouse.cc
View File

@ -859,33 +859,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
return true; return true;
break; break;
case CdMarkerBarItem:
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::CreateCDMarker), event);
}
return true;
break;
case CueMarkerBarItem:
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
_drags->set (new CursorDrag (this, *_playhead_cursor, false), event);
} else {
/* no range dragging on this ruler/bar */
}
return true;
break;
case TransportMarkerBarItem:
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::CreateTransportMarker), event);
}
return true;
break;
case VelocityItem: case VelocityItem:
_drags->set (new LollipopDrag (this, item), event); _drags->set (new LollipopDrag (this, item), event);
return true; return true;
@ -1709,8 +1682,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
case MarkerBarItem: case MarkerBarItem:
case RangeMarkerBarItem: case RangeMarkerBarItem:
case TransportMarkerBarItem:
case CdMarkerBarItem:
case SectionMarkerBarItem: case SectionMarkerBarItem:
case TempoBarItem: case TempoBarItem:
case TempoCurveItem: case TempoCurveItem:
@ -1725,11 +1696,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
popup_ruler_menu (where, item_type); popup_ruler_menu (where, item_type);
break; break;
case CueMarkerBarItem:
snap_to (where, Temporal::RoundNearest, SnapToGrid_Scaled, true);
popup_ruler_menu (where, item_type);
break;
case MarkerItem: case MarkerItem:
marker_context_menu (&event->button, item); marker_context_menu (&event->button, item);
break; break;
@ -1831,14 +1797,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
} }
return true; return true;
case CdMarkerBarItem:
if (!_dragging_playhead) {
/* if we get here then a dragged range wasn't done */
snap_to_with_modifier (where, event, Temporal::RoundNearest, SnapToGrid_Scaled);
mouse_add_new_marker (where, Location::IsCDMarker);
}
return true;
case SectionMarkerBarItem: case SectionMarkerBarItem:
if (!_dragging_playhead && Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { if (!_dragging_playhead && Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
snap_to_with_modifier (where, event, Temporal::RoundNearest, SnapToGrid_Scaled); snap_to_with_modifier (where, event, Temporal::RoundNearest, SnapToGrid_Scaled);
@ -1846,14 +1804,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
} }
return true; return true;
case CueMarkerBarItem:
if (!_dragging_playhead) {
/* if we get here then a dragged range wasn't done */
snap_to_with_modifier (where, event, Temporal::RoundNearest, SnapToGrid_Scaled); //TODO: force to-measure?
mouse_add_new_marker (where, Location::IsCueMarker);
}
return true;
case GridZoneItem: case GridZoneItem:
return true; return true;

4
gtk2_ardour/enums.cc
View File

@ -155,12 +155,8 @@ setup_gtk_ardour_enums ()
REGISTER_ENUM (SceneMarkerItem); REGISTER_ENUM (SceneMarkerItem);
REGISTER_ENUM (MarkerBarItem); REGISTER_ENUM (MarkerBarItem);
REGISTER_ENUM (RangeMarkerBarItem); REGISTER_ENUM (RangeMarkerBarItem);
REGISTER_ENUM (CdMarkerBarItem);
REGISTER_ENUM (SectionMarkerBarItem); REGISTER_ENUM (SectionMarkerBarItem);
REGISTER_ENUM (CueMarkerBarItem);
REGISTER_ENUM (SceneMarkerBarItem);
REGISTER_ENUM (VideoBarItem); REGISTER_ENUM (VideoBarItem);
REGISTER_ENUM (TransportMarkerBarItem);
REGISTER_ENUM (SelectionItem); REGISTER_ENUM (SelectionItem);
REGISTER_ENUM (ControlPointItem); REGISTER_ENUM (ControlPointItem);
REGISTER_ENUM (GainLineItem); REGISTER_ENUM (GainLineItem);