From bd9d4be764c5bceef720779eef2b992407b2dcb6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 24 Nov 2014 12:43:33 +0200 Subject: [PATCH] part two of removing loopbar --- gtk2_ardour/editor_canvas.cc | 1 - gtk2_ardour/editor_items.h | 1 - gtk2_ardour/editor_mouse.cc | 7 ------- gtk2_ardour/editor_rulers.cc | 3 --- gtk2_ardour/enums.cc | 1 - 5 files changed, 13 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index c8a3277571..ca9f4d1726 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -1432,7 +1432,6 @@ Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType typ case RangeMarkerBarItem: case CdMarkerBarItem: case VideoBarItem: - case PunchLoopBarItem: case DropZoneItem: case SelectionItem: cursor = which_grabber_cursor(); diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h index 55b65d11d0..62ebb0a12b 100644 --- a/gtk2_ardour/editor_items.h +++ b/gtk2_ardour/editor_items.h @@ -30,7 +30,6 @@ enum ItemType { RangeMarkerBarItem, CdMarkerBarItem, VideoBarItem, - PunchLoopBarItem, SkipBarItem, SelectionItem, ControlPointItem, diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 2aa72bb569..030c13cf87 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -676,11 +676,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; break; - case PunchLoopBarItem: - _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateLoopMarker), event); - return true; - break; - case ClockRulerItem: /* XXX this is not really a CursorDrag .. a new Drag object is needed */ _drags->set (new CursorDrag (this, *playhead_cursor, false), event); @@ -1307,7 +1302,6 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp case RangeMarkerBarItem: case SkipBarItem: case CdMarkerBarItem: - case PunchLoopBarItem: case StreamItem: case TimecodeRulerItem: case SamplesRulerItem: @@ -1524,7 +1518,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case MarkerBarItem: - case PunchLoopBarItem: case SkipBarItem: case RangeMarkerBarItem: case CdMarkerBarItem: diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index aa02052fa2..ed040a7df4 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -195,9 +195,6 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t) break; - case PunchLoopBarItem: - break; - case SkipBarItem: break; diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc index 0f46469710..ecc50f3066 100644 --- a/gtk2_ardour/enums.cc +++ b/gtk2_ardour/enums.cc @@ -144,7 +144,6 @@ setup_gtk_ardour_enums () REGISTER_ENUM (RangeMarkerBarItem); REGISTER_ENUM (CdMarkerBarItem); REGISTER_ENUM (VideoBarItem); - REGISTER_ENUM (PunchLoopBarItem); REGISTER_ENUM (SkipBarItem); REGISTER_ENUM (SelectionItem); REGISTER_ENUM (ControlPointItem);