diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 87fc775cd6..7685dc38df 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -1448,12 +1448,8 @@ Editor::which_canvas_cursor(ItemType type) const case MarkerItem: case MarkerBarItem: case RangeMarkerBarItem: - case CdMarkerBarItem: case SectionMarkerBarItem: - case CueMarkerBarItem: - case SceneMarkerBarItem: case VideoBarItem: - case TransportMarkerBarItem: case DropZoneItem: case GridZoneItem: case SelectionMarkerItem: diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h index 492b669398..81d90d7764 100644 --- a/gtk2_ardour/editor_items.h +++ b/gtk2_ardour/editor_items.h @@ -30,12 +30,8 @@ enum ItemType { SceneMarkerItem, MarkerBarItem, RangeMarkerBarItem, - CdMarkerBarItem, SectionMarkerBarItem, - CueMarkerBarItem, - SceneMarkerBarItem, VideoBarItem, - TransportMarkerBarItem, SelectionItem, ControlPointItem, GainLineItem, diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 9be55817b7..d397185b00 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -859,33 +859,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; 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: _drags->set (new LollipopDrag (this, item), event); return true; @@ -1709,8 +1682,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MarkerBarItem: case RangeMarkerBarItem: - case TransportMarkerBarItem: - case CdMarkerBarItem: case SectionMarkerBarItem: case TempoBarItem: case TempoCurveItem: @@ -1725,11 +1696,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT popup_ruler_menu (where, item_type); break; - case CueMarkerBarItem: - snap_to (where, Temporal::RoundNearest, SnapToGrid_Scaled, true); - popup_ruler_menu (where, item_type); - break; - case MarkerItem: marker_context_menu (&event->button, item); break; @@ -1831,14 +1797,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT } 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: if (!_dragging_playhead && Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { 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; - 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: return true; diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc index 30f1158cc4..fd63d5160b 100644 --- a/gtk2_ardour/enums.cc +++ b/gtk2_ardour/enums.cc @@ -155,12 +155,8 @@ setup_gtk_ardour_enums () REGISTER_ENUM (SceneMarkerItem); REGISTER_ENUM (MarkerBarItem); REGISTER_ENUM (RangeMarkerBarItem); - REGISTER_ENUM (CdMarkerBarItem); REGISTER_ENUM (SectionMarkerBarItem); - REGISTER_ENUM (CueMarkerBarItem); - REGISTER_ENUM (SceneMarkerBarItem); REGISTER_ENUM (VideoBarItem); - REGISTER_ENUM (TransportMarkerBarItem); REGISTER_ENUM (SelectionItem); REGISTER_ENUM (ControlPointItem); REGISTER_ENUM (GainLineItem);