Trim the include tree.

21 files changed, 68 insertions, 37 deletions

diff --git a/gtk2_ardour/canvas_patch_change.cc b/gtk2_ardour/canvas_patch_change.cc
index e836dba7a8..68dbbe3b0d 100644
--- a/gtk2_ardour/canvas_patch_change.cc
+++ b/gtk2_ardour/canvas_patch_change.cc
@@ -28,7 +28,6 @@
 #include "midi++/midnam_patch.h"
 
 #include "ardour_ui.h"
-#include "midi_region_view.h"
 #include "canvas_patch_change.h"
 #include "editor.h"
 #include "editor_drag.h"
diff --git a/gtk2_ardour/edit_note_dialog.h b/gtk2_ardour/edit_note_dialog.h
index bc8d546057..5ef4a6b4af 100644
--- a/gtk2_ardour/edit_note_dialog.h
+++ b/gtk2_ardour/edit_note_dialog.h
@@ -18,7 +18,6 @@
 */
 
 #include <gtkmm/spinbutton.h>
-#include "ardour/midi_model.h"
 #include "ardour_dialog.h"
 #include "audio_clock.h"
 
diff --git a/gtk2_ardour/hit.cc b/gtk2_ardour/hit.cc
index 43dc8ce347..c7bfcb617f 100644
--- a/gtk2_ardour/hit.cc
+++ b/gtk2_ardour/hit.cc
@@ -22,8 +22,6 @@
 #include "canvas/polygon.h"
 #include "canvas/debug.h"
 
-#include "midi_region_view.h"
-#include "public_editor.h"
 #include "hit.h"
 
 using namespace ARDOUR;
diff --git a/gtk2_ardour/midi_automation_line.cc b/gtk2_ardour/midi_automation_line.cc
index 30bb37c5b0..c76a35a069 100644
--- a/gtk2_ardour/midi_automation_line.cc
+++ b/gtk2_ardour/midi_automation_line.cc
@@ -18,7 +18,10 @@
 */
 
 #include "ardour/midi_automation_list_binder.h"
+#include "ardour/midi_region.h"
+
 #include "midi++/midnam_patch.h"
+
 #include "midi_automation_line.h"
 #include "midi_time_axis.h"
 
diff --git a/gtk2_ardour/midi_automation_line.h b/gtk2_ardour/midi_automation_line.h
index 3748c35bd4..e0da2a00d7 100644
--- a/gtk2_ardour/midi_automation_line.h
+++ b/gtk2_ardour/midi_automation_line.h
@@ -17,9 +17,12 @@
 
 */
 
-#include "ardour/midi_region.h"
 #include "automation_line.h"
 
+namespace ARDOUR {
+	class MidiRegion;
+}
+
 /** Stub class so that lines for MIDI AutomationRegionViews can use the correct
  *  MementoCommandBinder.
  */
diff --git a/gtk2_ardour/midi_cut_buffer.cc b/gtk2_ardour/midi_cut_buffer.cc
index 21567d401f..94a21ed830 100644
--- a/gtk2_ardour/midi_cut_buffer.cc
+++ b/gtk2_ardour/midi_cut_buffer.cc
@@ -21,7 +21,7 @@
 using namespace ARDOUR;
 
 MidiCutBuffer::MidiCutBuffer (Session* s)
-	: AutomatableSequence<MidiModel::TimeType> (*s)
+	: AutomatableSequence<Evoral::MusicalTime> (*s)
 	, _origin (0)
 {
 
diff --git a/gtk2_ardour/midi_cut_buffer.h b/gtk2_ardour/midi_cut_buffer.h
index a52771019d..bfd31fb270 100644
--- a/gtk2_ardour/midi_cut_buffer.h
+++ b/gtk2_ardour/midi_cut_buffer.h
@@ -19,16 +19,18 @@
 #ifndef __gtk_ardour_midi_cut_buffer_h__
 #define __gtk_ardour_midi_cut_buffer_h__
 
-#include "ardour/midi_model.h"
+#include "evoral/types.hpp"
+
+#include "ardour/automatable_sequence.h"
 
 namespace ARDOUR {
 	class Session;
 }
 
-class MidiCutBuffer : public ARDOUR::AutomatableSequence<ARDOUR::MidiModel::TimeType>
+class MidiCutBuffer : public ARDOUR::AutomatableSequence<Evoral::MusicalTime>
 {
   public:
-	typedef ARDOUR::MidiModel::TimeType TimeType;
+	typedef Evoral::MusicalTime TimeType;
 
 	MidiCutBuffer (ARDOUR::Session*);
 	~MidiCutBuffer();
diff --git a/gtk2_ardour/note.cc b/gtk2_ardour/note.cc
index ddfb11fe8e..bc10d79d8b 100644
--- a/gtk2_ardour/note.cc
+++ b/gtk2_ardour/note.cc
@@ -24,7 +24,6 @@
 #include "canvas/debug.h"
 
 #include "note.h"
-#include "midi_region_view.h"
 #include "public_editor.h"
 
 using namespace ARDOUR;
diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index 5e5d83e500..b70b821ade 100644
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -21,13 +21,15 @@
 
 #include "gtkmm2ext/keyboard.h"
 
+#include "evoral/Note.hpp"
+
 #include "canvas/text.h"
 
 #include "note_base.h"
-#include "midi_region_view.h"
 #include "public_editor.h"
 #include "editing_syms.h"
 #include "keyboard.h"
+#include "midi_region_view.h"
 
 using namespace std;
 using namespace Gtkmm2ext;
diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 04de75f48f..be9f3b67ca 100644
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -21,8 +21,9 @@
 #define __gtk_ardour_note_base_h__
 
 #include <boost/shared_ptr.hpp>
+
 #include "canvas/types.h"
-#include "ardour/midi_model.h"
+#include "evoral/types.hpp"
 
 #include "rgb_macros.h"
 #include "ardour_ui.h"
@@ -54,7 +55,7 @@ namespace ArdourCanvas {
 class NoteBase : public sigc::trackable
 {
   public:
-	typedef Evoral::Note<ARDOUR::MidiModel::TimeType> NoteType;
+	typedef Evoral::Note<Evoral::MusicalTime> NoteType;
 
 	NoteBase (MidiRegionView& region, bool, const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>());
 	virtual ~NoteBase ();
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 80ee165a84..2c7499fd6d 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -51,6 +51,7 @@
 #include "ardour/auditioner.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiofilesource.h"
+#include "ardour/midi_region.h"
 #include "ardour/smf_source.h"
 #include "ardour/region_factory.h"
 #include "ardour/source_factory.h"
diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index 452f7eb246..48d889344a 100644
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -25,17 +25,16 @@
 #include <glibmm/threads.h>
 
 #include "ardour/ardour.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_region.h"
-
-#include "ardour/audio_diskstream.h"
-#include "ardour/midi_diskstream.h"
+#include "ardour/track.h"
 
 namespace ARDOUR {
 
 class Session;
+class AudioDiskstream;
 class AudioRegion;
 class AudioPlaylist;
+class MidiDiskstream;
+class MidiRegion;
 
 class LIBARDOUR_API Auditioner : public Track
 {
@@ -103,12 +102,8 @@ class LIBARDOUR_API Auditioner : public Track
 	boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &)
 		{ return boost::shared_ptr<Diskstream> (); }
 
-	boost::shared_ptr<AudioDiskstream> audio_diskstream() const
-		{ return boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream); }
-
-	boost::shared_ptr<MidiDiskstream> midi_diskstream() const
-		{ return boost::dynamic_pointer_cast<MidiDiskstream> (_diskstream); }
-
+	boost::shared_ptr<AudioDiskstream> audio_diskstream() const;
+	boost::shared_ptr<MidiDiskstream> midi_diskstream() const;
 
   private:
 	boost::shared_ptr<AudioRegion> the_region;
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index e8cc370289..fea758d622 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -37,7 +37,6 @@
 #include "ardour/ardour.h"
 #include "ardour/diskstream.h"
 #include "ardour/midi_buffer.h"
-#include "ardour/midi_playlist.h"
 #include "ardour/utils.h"
 
 struct tm;
@@ -46,6 +45,7 @@ namespace ARDOUR {
 
 class IO;
 class MidiEngine;
+class MidiPlaylist;
 class MidiPort;
 class MidiRingbuffer;
 class MidiSource;
@@ -53,6 +53,8 @@ class SMFSource;
 class Send;
 class Session;
 
+template<typename T> class MidiRingBuffer;
+
 class LIBARDOUR_API MidiDiskstream : public Diskstream
 {
   public:
@@ -70,7 +72,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 	
 	void reset_tracker ();
 
-	boost::shared_ptr<MidiPlaylist> midi_playlist () { return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist); }
+	boost::shared_ptr<MidiPlaylist> midi_playlist ();
 
 	int use_playlist (boost::shared_ptr<Playlist>);
 	int use_new_playlist ();
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index b5dc173464..4d12839625 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -29,7 +29,6 @@
 #include "pbd/command.h"
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
-#include "ardour/midi_buffer.h"
 #include "ardour/automatable_sequence.h"
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index debe29877a..f98fa803ae 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -24,10 +24,10 @@
 #include "midi++/parser.h"
 
 #include "ardour/port.h"
-#include "ardour/midi_buffer.h"
 
 namespace ARDOUR {
 
+class MidiBuffer;
 class MidiEngine;
 
 class LIBARDOUR_API MidiPort : public Port {
@@ -51,9 +51,7 @@ class LIBARDOUR_API MidiPort : public Port {
 	bool input_active() const { return _input_active; }
 	void set_input_active (bool yn);
 
-	Buffer& get_buffer (pframes_t nframes) {
-		return get_midi_buffer (nframes);
-	}
+	Buffer& get_buffer (pframes_t nframes);
 
 	MidiBuffer& get_midi_buffer (pframes_t nframes);
 
@@ -85,7 +83,7 @@ class LIBARDOUR_API MidiPort : public Port {
 
         MIDI::Parser _self_parser;
 
-	void resolve_notes (void* buffer, MidiBuffer::TimeType when);
+	void resolve_notes (void* buffer, framepos_t when);
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h
index 81a5eb07f0..e336eb8754 100644
--- a/libs/ardour/ardour/midi_scene_changer.h
+++ b/libs/ardour/ardour/midi_scene_changer.h
@@ -27,6 +27,8 @@
 namespace ARDOUR
 {
 
+class MIDISceneChange;
+
 class MIDISceneChanger : public SceneChanger
 {
     public:
diff --git a/libs/ardour/ardour/scene_changer.h b/libs/ardour/ardour/scene_changer.h
index e171a23094..d606dd13db 100644
--- a/libs/ardour/ardour/scene_changer.h
+++ b/libs/ardour/ardour/scene_changer.h
@@ -25,7 +25,6 @@
 #include "pbd/signals.h"
 
 #include "ardour/location.h"
-#include "ardour/midi_scene_change.h"
 #include "ardour/session_handle.h"
 #include "ardour/types.h"
 
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index e9d5eda02a..96304b0b3b 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -22,13 +22,16 @@
 #include "pbd/error.h"
 
 #include "ardour/amp.h"
-#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audio_port.h"
 #include "ardour/audioengine.h"
 #include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
 #include "ardour/auditioner.h"
-#include "ardour/audio_port.h"
 #include "ardour/data_type.h"
 #include "ardour/delivery.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/midi_region.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/region_factory.h"
@@ -604,3 +607,15 @@ Auditioner::monitoring_state () const
 {
 	return MonitoringDisk;
 }
+
+boost::shared_ptr<AudioDiskstream>
+Auditioner::audio_diskstream() const
+{
+	return boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream);
+}
+
+boost::shared_ptr<MidiDiskstream>
+Auditioner::midi_diskstream() const
+{
+	return boost::dynamic_pointer_cast<MidiDiskstream> (_diskstream);
+}
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 648c67886d..9bc01b9bd4 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1487,3 +1487,9 @@ MidiDiskstream::reset_tracker ()
 		mp->clear_note_trackers ();
 	}
 }
+
+boost::shared_ptr<MidiPlaylist>
+MidiDiskstream::midi_playlist ()
+{
+	return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist);
+}
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index b34ebb5187..8dcf4d42fc 100644
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -22,10 +22,11 @@
 #include "pbd/compose.h"
 #include "pbd/debug.h"
 
-#include "ardour/midi_port.h"
-#include "ardour/data_type.h"
 #include "ardour/audioengine.h"
+#include "ardour/data_type.h"
 #include "ardour/debug.h"
+#include "ardour/midi_buffer.h"
+#include "ardour/midi_port.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -80,6 +81,12 @@ MidiPort::cycle_start (pframes_t nframes)
 	}
 }
 
+Buffer&
+MidiPort::get_buffer (pframes_t nframes)
+{
+	return get_midi_buffer (nframes);
+}
+
 MidiBuffer &
 MidiPort::get_midi_buffer (pframes_t nframes)
 {
diff --git a/libs/ardour/midi_scene_changer.cc b/libs/ardour/midi_scene_changer.cc
index 285a370402..c5ea29784b 100644
--- a/libs/ardour/midi_scene_changer.cc
+++ b/libs/ardour/midi_scene_changer.cc
@@ -24,6 +24,7 @@
 
 #include "ardour/async_midi_port.h"
 #include "ardour/event_type_map.h"
+#include "ardour/midi_buffer.h"
 #include "ardour/midi_port.h"
 #include "ardour/midi_scene_change.h"
 #include "ardour/midi_scene_changer.h"