OSC: Changed gainVCA to gainfader as VCA is already used.

[ardour.git] / gtk2_ardour / editor_items.h

diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h
index 39b6310a67fc87f4da55f23b84564b2e8d6467da..743a93b865d1d2976c653b215f28180b51e0b4be 100644 (file)
--- a/gtk2_ardour/editor_items.h
+++ b/gtk2_ardour/editor_items.h
@@ -23,14 +23,13 @@
 enum ItemType {
        RegionItem,
        StreamItem,
+       WaveItem,
        PlayheadCursorItem,
        MarkerItem,
        MarkerBarItem,
        RangeMarkerBarItem,
        CdMarkerBarItem,
-#ifdef WITH_VIDEOTIMELINE
        VideoBarItem,
-#endif
        TransportMarkerBarItem,
        SelectionItem,
        ControlPointItem,
@@ -47,27 +46,22 @@ enum ItemType {
        AutomationTrackItem,
        FadeInItem,
        FadeInHandleItem,
+       FadeInTrimHandleItem,
        FadeOutItem,
        FadeOutHandleItem,
+       FadeOutTrimHandleItem,
        NoteItem,
        FeatureLineItem,
-        LeftFrameHandle,
-        RightFrameHandle,
+       LeftFrameHandle,
+       RightFrameHandle,
        StartCrossFadeItem,
        EndCrossFadeItem,
-
-#ifdef WITH_CMT
-       MarkerViewItem,
-       MarkerTimeAxisItem,
-       MarkerViewHandleStartItem,
-       MarkerViewHandleEndItem,
-       ImageFrameItem,
-       ImageFrameTimeAxisItem,
-       ImageFrameHandleStartItem,
-       ImageFrameHandleEndItem,
-#endif
-
        CrossfadeViewItem,
+       TimecodeRulerItem,
+       MinsecRulerItem,
+       BBTRulerItem,
+       SamplesRulerItem,
+       DropZoneItem,
 
        /* don't remove this */