DummyBackend: fix midi event mux+sorting

[ardour.git] / libs / ardour / midi_playlist_source.cc

diff --git a/libs/ardour/midi_playlist_source.cc b/libs/ardour/midi_playlist_source.cc
index 957531f52007f5a1a78d0858c1cc48e406eb496b..68e0a478dff7c95f98a1052b08002a8c396136df 100644 (file)
--- a/libs/ardour/midi_playlist_source.cc
+++ b/libs/ardour/midi_playlist_source.cc
@@ -20,25 +20,10 @@
 #include "libardour-config.h"
 #endif
 
-#include <vector>
-#include <cstdio>
-
-#include <glibmm/fileutils.h>
-#include <glibmm/miscutils.h>
-
 #include "pbd/error.h"
-#include "pbd/convert.h"
-#include "pbd/enumwriter.h"
 
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_playlist_source.h"
-#include "ardour/midi_region.h"
-#include "ardour/debug.h"
-#include "ardour/filename_extensions.h"
-#include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/session_playlists.h"
-#include "ardour/source_factory.h"
 
 #include "i18n.h"
 
@@ -46,6 +31,17 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR {
+class MidiStateTracker;
+class Session;
+template <typename T> class MidiRingBuffer;
+}
+
+namespace Evoral {
+template <typename T> class EventSink;
+template <typename Time> class Event;
+}
+
 /*******************************************************************************
 As of May 2011, it appears too complex to support compound regions for MIDI
 because of the need to be able to edit the data represented by the region.  It
@@ -98,7 +94,6 @@ MidiPlaylistSource::get_state ()
        return node;
 }
 
-
 int
 MidiPlaylistSource::set_state (const XMLNode& node, int version)
 {
@@ -143,8 +138,8 @@ MidiPlaylistSource::read_unlocked (Evoral::EventSink<framepos_t>& dst,
 
 framecnt_t
 MidiPlaylistSource::write_unlocked (MidiRingBuffer<framepos_t>&,
-                                   framepos_t,
-                                   framecnt_t)
+                                    framepos_t,
+                                    framecnt_t)
 {
        fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::write_unlocked() called - should be impossible") << endmsg;
        /*NOTREACHED*/