Trim include tree.

git-svn-id: svn://localhost/ardour2/branches/3.0@10244 d708f5d6-7413-0410-9779-e7cbd77b26cf

7 files changed, 47 insertions, 24 deletions

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 50352cc760..9e8c7441fc 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -23,14 +23,7 @@
 
 #include <vector>
 
-#include "pbd/fastlog.h"
-#include "pbd/undo.h"
-
 #include "ardour/ardour.h"
-#include "ardour/gain.h"
-#include "ardour/logcurve.h"
-#include "ardour/midi_model.h"
-#include "ardour/midi_source.h"
 #include "ardour/region.h"
 
 class XMLNode;
@@ -46,12 +39,17 @@ namespace ARDOUR {
 	}
 }
 
+namespace Evoral {
+template<typename Time> class EventSink;
+}
+
 namespace ARDOUR {
 
 class Route;
 class Playlist;
 class Session;
 class MidiFilter;
+class MidiModel;
 class MidiSource;
 class MidiStateTracker;
 template<typename T> class MidiRingBuffer;
@@ -91,22 +89,16 @@ class MidiRegion : public Region
 
 	/* automation */
 
-	boost::shared_ptr<Evoral::Control>
-	control(const Evoral::Parameter& id, bool create=false) {
-		return model()->control(id, create);
-	}
+	boost::shared_ptr<Evoral::Control> control(const Evoral::Parameter& id, bool create=false);
 
-	virtual boost::shared_ptr<const Evoral::Control>
-	control(const Evoral::Parameter& id) const {
-		return model()->control(id);
-	}
+	virtual boost::shared_ptr<const Evoral::Control> control(const Evoral::Parameter& id) const;
 
 	/* export */
 
 	int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
 
-	boost::shared_ptr<MidiModel> model()             { return midi_source()->model(); }
-	boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); }
+	boost::shared_ptr<MidiModel> model();
+	boost::shared_ptr<const MidiModel> model() const;
 
 	void fix_negative_start ();
 	void transpose (int);
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 3dc54fe862..d13f638fa4 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -46,17 +46,18 @@
 #include "ardour/debug.h"
 #include "ardour/io.h"
 #include "ardour/midi_diskstream.h"
+#include "ardour/midi_model.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_port.h"
 #include "ardour/midi_region.h"
 #include "ardour/playlist_factory.h"
 #include "ardour/region_factory.h"
+#include "ardour/route.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
+#include "ardour/session_playlists.h"
 #include "ardour/smf_source.h"
 #include "ardour/utils.h"
-#include "ardour/session_playlists.h"
-#include "ardour/route.h"
 
 #include "midi++/types.h"
 
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 5b0af9aa40..f2b8722ce3 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -28,13 +28,14 @@
 
 #include "evoral/EventList.hpp"
 
-#include "ardour/debug.h"
-#include "ardour/types.h"
 #include "ardour/configuration.h"
+#include "ardour/debug.h"
+#include "ardour/midi_model.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_region.h"
-#include "ardour/session.h"
 #include "ardour/midi_ring_buffer.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 61b1459c17..124998b5df 100644
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -33,6 +33,7 @@
 #include "ardour/automation_control.h"
 #include "ardour/dB.h"
 #include "ardour/gain.h"
+#include "ardour/midi_model.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_ring_buffer.h"
 #include "ardour/midi_source.h"
@@ -297,6 +298,30 @@ MidiRegion::separate_by_channel (ARDOUR::Session&, vector< boost::shared_ptr<Reg
 	return -1;
 }
 
+boost::shared_ptr<Evoral::Control>
+MidiRegion::control (const Evoral::Parameter& id, bool create)
+{
+	return model()->control(id, create);
+}
+
+boost::shared_ptr<const Evoral::Control>
+MidiRegion::control (const Evoral::Parameter& id) const
+{
+	return model()->control(id);
+}
+
+boost::shared_ptr<MidiModel>
+MidiRegion::model()
+{
+	return midi_source()->model();
+}
+
+boost::shared_ptr<const MidiModel>
+MidiRegion::model() const
+{
+	return midi_source()->model();
+}
+
 int
 MidiRegion::exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&)
 {
diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index fe0aca69ed..7a4164427a 100644
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -20,10 +20,12 @@
 
 #include "pbd/error.h"
 
-#include "ardour/types.h"
+#include "ardour/midi_model.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
 #include "ardour/midi_stretch.h"
 #include "ardour/session.h"
-#include "ardour/midi_region.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index fb195dba4c..2c1a451335 100644
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -36,6 +36,7 @@
 
 using namespace ARDOUR;
 using namespace PBD;
+using namespace std;
 
 PBD::Signal1<void,boost::shared_ptr<Region> > RegionFactory::CheckNewRegion;
 Glib::StaticMutex                             RegionFactory::region_map_lock;
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index d66b07c334..56a1380f91 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -90,6 +90,7 @@
 #include "ardour/io_processor.h"
 #include "ardour/location.h"
 #include "ardour/midi_diskstream.h"
+#include "ardour/midi_model.h"
 #include "ardour/midi_patch_manager.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_region.h"