fix deadlock in protocol manager startup; fix some other ::set_session() SNAFUs;...

[ardour.git] / gtk2_ardour / editor_items.h

diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h
index ddba43350a9b6a0c392c5449472136b27e31a744..44765ffe914ceaa1fe7727cba4c7676229e0e5e2 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
@@ -24,22 +24,15 @@ enum ItemType {
        RegionItem,
        StreamItem,
        PlayheadCursorItem,
-       EditCursorItem,
        MarkerItem,
        MarkerBarItem,
        RangeMarkerBarItem,
+       CdMarkerBarItem,
        TransportMarkerBarItem,
        SelectionItem,
-       GainControlPointItem,
+       ControlPointItem,
        GainLineItem,
-       GainAutomationControlPointItem,
-       GainAutomationLineItem,
-       PanAutomationControlPointItem,
-       PanAutomationLineItem,
-       RedirectAutomationControlPointItem,
-       RedirectAutomationLineItem,
-       MidiCCAutomationControlPointItem,
-       MidiCCAutomationLineItem,
+       AutomationLineItem,
        MeterMarkerItem,
        TempoMarkerItem,
        MeterBarItem,
@@ -53,7 +46,8 @@ enum ItemType {
        FadeInHandleItem,
        FadeOutItem,
        FadeOutHandleItem,
-       
+       NoteItem,
+
 #ifdef WITH_CMT
        MarkerViewItem,
        MarkerTimeAxisItem,
@@ -66,9 +60,9 @@ enum ItemType {
 #endif
 
        CrossfadeViewItem,
-       
+
        /* don't remove this */
-       
+
        NoItem
 };