Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

[ardour.git] / gtk2_ardour / editor_items.h

diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h
index 15e56a331361893e3da4b2903d2de76914c96ffd..fb1995659cfc1e3c01522a51a48778c970fd1e13 100644 (file)
--- a/gtk2_ardour/editor_items.h
+++ b/gtk2_ardour/editor_items.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ enum ItemType {
        MarkerBarItem,
        RangeMarkerBarItem,
        CdMarkerBarItem,
+       VideoBarItem,
        TransportMarkerBarItem,
        SelectionItem,
        ControlPointItem,
@@ -47,22 +48,15 @@ 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 */
-       
+
        NoItem
 };