Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty.

[ardour.git] / libs / ardour / ardour / midi_region.h

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 781f815ec551582988f91f1951faaf77fd0bcdb2..ddb3109ff66af45acca915c4701e3b2a647aabea 100644 (file)
--- 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;
@@ -48,35 +47,33 @@ template<typename T> class MidiRingBuffer;
 class MidiRegion : public Region
 {
   public:
-       typedef double TimeType;
-
        ~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<TimeType>& 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<TimeType>& 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&, std::vector< boost::shared_ptr<Region> >&) const;
 
-       int separate_by_channel (ARDOUR::Session&, vector<MidiRegion*>&) const;
-       
        /* automation */
-       
+
        boost::shared_ptr<Evoral::Control>
        control(const Evoral::Parameter& id, bool create=false) {
                return model()->data().control(id, create);
@@ -88,10 +85,8 @@ class MidiRegion : public Region
        }
 
        /* export */
-       
-       int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
 
-       UndoAction get_memento() const;
+       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(); }
@@ -108,15 +103,17 @@ class MidiRegion : public Region
        MidiRegion (const SourceList &, const XMLNode&);
 
   private:
-       nframes_t _read_at (const SourceList&, MidiRingBuffer<TimeType>& 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: