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 ddba43350a9b6a0c392c5449472136b27e31a744..79a94df340a200e32ba4b09ca8da3dc2f6a1756d 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
@@ -23,24 +23,20 @@
 enum ItemType {
        RegionItem,
        StreamItem,
+       WaveItem,
        PlayheadCursorItem,
-       EditCursorItem,
        MarkerItem,
        MarkerBarItem,
        RangeMarkerBarItem,
+       CdMarkerBarItem,
+       VideoBarItem,
        TransportMarkerBarItem,
        SelectionItem,
-       GainControlPointItem,
+       ControlPointItem,
        GainLineItem,
-       GainAutomationControlPointItem,
-       GainAutomationLineItem,
-       PanAutomationControlPointItem,
-       PanAutomationLineItem,
-       RedirectAutomationControlPointItem,
-       RedirectAutomationLineItem,
-       MidiCCAutomationControlPointItem,
-       MidiCCAutomationLineItem,
+       AutomationLineItem,
        MeterMarkerItem,
+       TempoCurveItem,
        TempoMarkerItem,
        MeterBarItem,
        TempoBarItem,
@@ -51,24 +47,25 @@ enum ItemType {
        AutomationTrackItem,
        FadeInItem,
        FadeInHandleItem,
+       FadeInTrimHandleItem,
        FadeOutItem,
        FadeOutHandleItem,
-       
-#ifdef WITH_CMT
-       MarkerViewItem,
-       MarkerTimeAxisItem,
-       MarkerViewHandleStartItem,
-       MarkerViewHandleEndItem,
-       ImageFrameItem,
-       ImageFrameTimeAxisItem,
-       ImageFrameHandleStartItem,
-       ImageFrameHandleEndItem,
-#endif
-
+       FadeOutTrimHandleItem,
+       NoteItem,
+       FeatureLineItem,
+       LeftFrameHandle,
+       RightFrameHandle,
+       StartCrossFadeItem,
+       EndCrossFadeItem,
        CrossfadeViewItem,
-       
+       TimecodeRulerItem,
+       MinsecRulerItem,
+       BBTRulerItem,
+       SamplesRulerItem,
+       DropZoneItem,
+
        /* don't remove this */
-       
+
        NoItem
 };