NO-OP; Backport changes from Mixbus branch

[ardour.git] / gtk2_ardour / editor_items.h

diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h
index 36a5a9e36fb1f796bea9710995f035c7f22056d9..79a94df340a200e32ba4b09ca8da3dc2f6a1756d 100644 (file)
--- a/gtk2_ardour/editor_items.h
+++ b/gtk2_ardour/editor_items.h
@@ -23,17 +23,20 @@
 enum ItemType {
        RegionItem,
        StreamItem,
+       WaveItem,
        PlayheadCursorItem,
        MarkerItem,
        MarkerBarItem,
        RangeMarkerBarItem,
        CdMarkerBarItem,
+       VideoBarItem,
        TransportMarkerBarItem,
        SelectionItem,
        ControlPointItem,
        GainLineItem,
        AutomationLineItem,
        MeterMarkerItem,
+       TempoCurveItem,
        TempoMarkerItem,
        MeterBarItem,
        TempoBarItem,
@@ -44,25 +47,22 @@ enum ItemType {
        AutomationTrackItem,
        FadeInItem,
        FadeInHandleItem,
+       FadeInTrimHandleItem,
        FadeOutItem,
        FadeOutHandleItem,
+       FadeOutTrimHandleItem,
        NoteItem,
        FeatureLineItem,
-        LeftFrameHandle,
-        RightFrameHandle,
-
-#ifdef WITH_CMT
-       MarkerViewItem,
-       MarkerTimeAxisItem,
-       MarkerViewHandleStartItem,
-       MarkerViewHandleEndItem,
-       ImageFrameItem,
-       ImageFrameTimeAxisItem,
-       ImageFrameHandleStartItem,
-       ImageFrameHandleEndItem,
-#endif
-
+       LeftFrameHandle,
+       RightFrameHandle,
+       StartCrossFadeItem,
+       EndCrossFadeItem,
        CrossfadeViewItem,
+       TimecodeRulerItem,
+       MinsecRulerItem,
+       BBTRulerItem,
+       SamplesRulerItem,
+       DropZoneItem,
 
        /* don't remove this */