a) basic prototype of OSC control

b) various changes to ControlProtocol model/implementation
c) more attempts to get autoscroll to work nicely (unfinished)
d) move editor item types into their own header


git-svn-id: svn://localhost/trunk/ardour2@506 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 2 insertions, 51 deletions

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 8770c6c93f..91f2bc9810 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -53,6 +53,7 @@
 #include "public_editor.h"
 #include "editing.h"
 #include "enums.h"
+#include "editor_items.h"
 #include "region_selection.h"
 #include "canvas.h"
 #include "draginfo.h"
@@ -347,56 +348,6 @@ class Editor : public PublicEditor
 
 	PlaylistSelector* _playlist_selector;
 
-	enum ItemType {
-		RegionItem,
-		StreamItem,
-		PlayheadCursorItem,
-		EditCursorItem,
-		MarkerItem,
-		MarkerBarItem,
-		RangeMarkerBarItem,
-		TransportMarkerBarItem,
-		SelectionItem,
-		GainControlPointItem,
-		GainLineItem,
-		GainAutomationControlPointItem,
-		GainAutomationLineItem,
-		PanAutomationControlPointItem,
-		PanAutomationLineItem,
-		RedirectAutomationControlPointItem,
-		RedirectAutomationLineItem,
-		MeterMarkerItem,
-		TempoMarkerItem,
-		MeterBarItem,
-		TempoBarItem,
-		AudioRegionViewNameHighlight,
-		AudioRegionViewName,
-		StartSelectionTrimItem,
-		EndSelectionTrimItem,
-		AutomationTrackItem,
-		FadeInItem,
-		FadeInHandleItem,
-		FadeOutItem,
-		FadeOutHandleItem,
-
-		/* <CMT Additions> */
-		MarkerViewItem,
-		MarkerTimeAxisItem,
-		MarkerViewHandleStartItem,
-		MarkerViewHandleEndItem,
-		ImageFrameItem,
-		ImageFrameTimeAxisItem,
-		ImageFrameHandleStartItem,
-		ImageFrameHandleEndItem,
-		/* </CMT Additions> */
-
-		CrossfadeViewItem,
-		
-		/* don't remove this */
-
-		NoItem
-	};
-
 	void          set_frames_per_unit (double);
 	void          frames_per_unit_modified ();
 
@@ -861,7 +812,7 @@ class Editor : public PublicEditor
 	bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType);
 	bool button_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
 	bool button_release_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
-	bool motion_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
+	bool motion_handler (ArdourCanvas::Item*, GdkEvent*, ItemType, bool from_autoscroll = false);
 	bool enter_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
 	bool leave_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);