make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

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

diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index a4054e6b00aac5bc657b14c9daf0a7a90618e6d6..bc636eea832bfcfc952d14aad459315ebfcb55b7 100644 (file)
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -22,6 +22,7 @@
 
 #include "ardour/track.h"
 #include "ardour/midi_ring_buffer.h"
+#include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR
 {
@@ -35,7 +36,7 @@ class MidiTrack : public Track
 {
 public:
        MidiTrack (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
-       MidiTrack (Session&, const XMLNode&);
+       MidiTrack (Session&, const XMLNode&, int);
        ~MidiTrack ();
 
        int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
@@ -59,7 +60,7 @@ public:
        boost::shared_ptr<Region>  bounce_range (
                        nframes_t start, nframes_t end, InterThreadInfo&, bool enable_processing);
 
-       int set_state(const XMLNode& node);
+       int set_state(const XMLNode&, int version);
 
        void midi_panic(void);
        bool write_immediate_event(size_t size, const uint8_t* buf);
@@ -92,12 +93,11 @@ public:
 
 protected:
        XMLNode& state (bool full);
-
-       int _set_state (const XMLNode&, bool call_base);
+       
+       int _set_state (const XMLNode&, int, bool call_base);
 
 private:
-       void write_out_of_band_data (
-                       BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+       void write_out_of_band_data (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
 
        int set_diskstream (boost::shared_ptr<MidiDiskstream> ds);
        void use_new_diskstream ();
@@ -111,7 +111,6 @@ private:
        uint8_t                   _default_channel;
        bool                      _midi_thru;
 
-
        int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
                        bool state_changing, bool can_record, bool rec_monitors_input);
        void push_midi_input_to_step_edit_ringbuffer (nframes_t nframes);