i/o button naming patch and imported file BWF timecode retention patch from nickm...

[ardour.git] / gtk2_ardour / editor_items.h

diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h
index 921c1a51ebb5a8ea39cb2be7efb4c37fcf2a1ae0..15e56a331361893e3da4b2903d2de76914c96ffd 100644 (file)
--- a/gtk2_ardour/editor_items.h
+++ b/gtk2_ardour/editor_items.h
@@ -24,20 +24,15 @@ enum ItemType {
        RegionItem,
        StreamItem,
        PlayheadCursorItem,
-       EditCursorItem,
        MarkerItem,
        MarkerBarItem,
        RangeMarkerBarItem,
+       CdMarkerBarItem,
        TransportMarkerBarItem,
        SelectionItem,
-       GainControlPointItem,
+       ControlPointItem,
        GainLineItem,
-       GainAutomationControlPointItem,
-       GainAutomationLineItem,
-       PanAutomationControlPointItem,
-       PanAutomationLineItem,
-       RedirectAutomationControlPointItem,
-       RedirectAutomationLineItem,
+       AutomationLineItem,
        MeterMarkerItem,
        TempoMarkerItem,
        MeterBarItem,
@@ -51,8 +46,9 @@ enum ItemType {
        FadeInHandleItem,
        FadeOutItem,
        FadeOutHandleItem,
-       
-       /* <CMT Additions> */
+       NoteItem,
+
+#ifdef WITH_CMT
        MarkerViewItem,
        MarkerTimeAxisItem,
        MarkerViewHandleStartItem,
@@ -61,8 +57,8 @@ enum ItemType {
        ImageFrameTimeAxisItem,
        ImageFrameHandleStartItem,
        ImageFrameHandleEndItem,
-       /* </CMT Additions> */
-       
+#endif
+
        CrossfadeViewItem,
        
        /* don't remove this */