Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / editor_items.h

diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h
index 44765ffe914ceaa1fe7727cba4c7676229e0e5e2..fb1995659cfc1e3c01522a51a48778c970fd1e13 100644 (file)
--- a/gtk2_ardour/editor_items.h
+++ b/gtk2_ardour/editor_items.h
@@ -28,6 +28,7 @@ enum ItemType {
        MarkerBarItem,
        RangeMarkerBarItem,
        CdMarkerBarItem,
+       VideoBarItem,
        TransportMarkerBarItem,
        SelectionItem,
        ControlPointItem,
@@ -47,18 +48,11 @@ enum ItemType {
        FadeOutItem,
        FadeOutHandleItem,
        NoteItem,
-
-#ifdef WITH_CMT
-       MarkerViewItem,
-       MarkerTimeAxisItem,
-       MarkerViewHandleStartItem,
-       MarkerViewHandleEndItem,
-       ImageFrameItem,
-       ImageFrameTimeAxisItem,
-       ImageFrameHandleStartItem,
-       ImageFrameHandleEndItem,
-#endif
-
+       FeatureLineItem,
+        LeftFrameHandle,
+        RightFrameHandle,
+       StartCrossFadeItem,
+       EndCrossFadeItem,
        CrossfadeViewItem,
 
        /* don't remove this */