X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_region.h;h=ddb3109ff66af45acca915c4701e3b2a647aabea;hb=79f91c7a205d981d2b8cc15e32a6da02d8423065;hp=66257372a92fb805a1cd3886728e84601e7d8912;hpb=d357eca668044badcb4bab318e2e74cfffa9a0b0;p=ardour.git

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 66257372a9..ddb3109ff6 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2006 Paul Davis 
+    Copyright (C) 2000-2006 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
@@ -23,19 +23,18 @@
 
 #include <vector>
 
-#include <pbd/fastlog.h>
-#include <pbd/undo.h>
+#include "pbd/fastlog.h"
+#include "pbd/undo.h"
 
-#include <ardour/ardour.h>
-#include <ardour/region.h>
-#include <ardour/gain.h>
-#include <ardour/logcurve.h>
-#include <ardour/midi_source.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;
 
-using std::vector;
-
 namespace ARDOUR {
 
 class Route;
@@ -43,7 +42,7 @@ class Playlist;
 class Session;
 class MidiFilter;
 class MidiSource;
-class MidiRingBuffer;
+template<typename T> class MidiRingBuffer;
 
 class MidiRegion : public Region
 {
@@ -51,43 +50,47 @@ class MidiRegion : public Region
 	~MidiRegion();
 
 	boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
-	
+
 	/* Stub Readable interface */
-	virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const { return 0; }
-	virtual nframes64_t readable_length() const { return length(); }
+	virtual nframes_t read (Sample*, sframes_t /*pos*/, nframes_t /*cnt*/, int /*channel*/) const { return 0; }
+	virtual sframes_t readable_length() const { return length(); }
 
-	nframes_t read_at (MidiRingBuffer& dst,
-			   nframes_t position,
-			   nframes_t dur, 
-			   uint32_t  chan_n = 0,
-			   NoteMode  mode = Sustained) const;
+	nframes_t read_at (MidiRingBuffer<nframes_t>& dst,
+			sframes_t position,
+			nframes_t dur,
+			uint32_t  chan_n = 0,
+			NoteMode  mode = Sustained) const;
 
-	nframes_t master_read_at (MidiRingBuffer& dst,
-			nframes_t position,
+	nframes_t master_read_at (MidiRingBuffer<nframes_t>& dst,
+			sframes_t position,
 			nframes_t dur,
 			uint32_t  chan_n = 0,
 			NoteMode  mode = Sustained) const;
 
 	XMLNode& state (bool);
-	int      set_state (const XMLNode&);
+	int      set_state (const XMLNode&, int version = 3000);
 
-	int separate_by_channel (ARDOUR::Session&, vector<MidiRegion*>&) const;
+	int separate_by_channel (ARDOUR::Session&, std::vector< boost::shared_ptr<Region> >&) const;
 
-	UndoAction get_memento() const;
+	/* automation */
 
-	// Act as a proxy for MidiModel automation stuff (for CC)
-	// Yep, this is pretty ugly...
-	Controls&       controls()       { return midi_source()->model()->controls(); }
-	const Controls& controls() const { return midi_source()->model()->controls(); }
-	
-	boost::shared_ptr<Evoral::Control> control(Evoral::Parameter id, bool create_if_missing=false)
-			{ return midi_source()->model()->control(id, create_if_missing); }
+	boost::shared_ptr<Evoral::Control>
+	control(const Evoral::Parameter& id, bool create=false) {
+		return model()->data().control(id, create);
+	}
+
+	virtual boost::shared_ptr<const Evoral::Control>
+	control(const Evoral::Parameter& id) const {
+		return model()->data().control(id);
+	}
+
+	/* export */
 
-	boost::shared_ptr<const Evoral::Control> control(Evoral::Parameter id) const
-			{ return midi_source()->model()->control(id); }
-	
 	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(); }
+
   private:
 	friend class RegionFactory;
 
@@ -100,15 +103,17 @@ class MidiRegion : public Region
 	MidiRegion (const SourceList &, const XMLNode&);
 
   private:
-	nframes_t _read_at (const SourceList&, MidiRingBuffer& dst,
-			    nframes_t position,
-			    nframes_t dur, 
-			    uint32_t chan_n = 0,
-				NoteMode mode = Sustained) const;
+	nframes_t _read_at (const SourceList&, MidiRingBuffer<nframes_t>& dst,
+			nframes_t position,
+			nframes_t dur,
+			uint32_t chan_n = 0,
+			NoteMode mode = Sustained) const;
 
 	void recompute_at_start ();
 	void recompute_at_end ();
 
+	void set_position_internal (nframes_t pos, bool allow_bbt_recompute);
+
 	void switch_source(boost::shared_ptr<Source> source);
 
   protected: