Fix insane formatting (how did this even happen? copy paste from an email diff or...

[ardour.git] / gtk2_ardour / editor_items.h

diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h
index 7f3a0d3fccc22c3bbf874e367d9065dc24e9fd8a..042fd20852fcd287c1659d79b5e6a299412e275a 100644 (file)
--- a/gtk2_ardour/editor_items.h
+++ b/gtk2_ardour/editor_items.h
@@ -1,3 +1,22 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __gtk2_ardour_editor_items_h__
 #define __gtk2_ardour_editor_items_h__
 
@@ -5,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,
@@ -33,7 +47,7 @@ enum ItemType {
        FadeOutItem,
        FadeOutHandleItem,
        
-       /* <CMT Additions> */
+#ifdef WITH_CMT
        MarkerViewItem,
        MarkerTimeAxisItem,
        MarkerViewHandleStartItem,
@@ -42,8 +56,8 @@ enum ItemType {
        ImageFrameTimeAxisItem,
        ImageFrameHandleStartItem,
        ImageFrameHandleEndItem,
-       /* </CMT Additions> */
-       
+#endif
+
        CrossfadeViewItem,
        
        /* don't remove this */