Time unit translation for AutomationLine (correctly display MIDI controller data).

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

diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 323fc8b5a1ec7d0fb4ec5b163465aee857655373..e19956ad7a2b6077e1e6515148e85abc517fa48b 100644 (file)
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -21,31 +21,29 @@
 #define __ardour_midi_source_h__
 
 #include <string>
-
 #include <time.h>
-
-#include <glibmm/thread.h>
-
 #include <sigc++/signal.h>
-
-#include <ardour/source.h>
-#include <ardour/ardour.h>
-#include <ardour/buffer.h>
-#include <ardour/midi_model.h>
+#include <glibmm/thread.h>
 #include <pbd/stateful.h>
 #include <pbd/xml++.h>
-
-using std::string;
+#include <evoral/Sequence.hpp>
+#include <ardour/ardour.h>
+#include <ardour/buffer.h>
+#include <ardour/source.h>
+#include <ardour/beats_frames_converter.h>
 
 namespace ARDOUR {
 
-class MidiRingBuffer;
+class MidiModel;
+template<typename T> class MidiRingBuffer;
 
 /** Source for MIDI data */
 class MidiSource : public Source
 {
   public:
-       MidiSource (Session& session, string name);
+       typedef double TimeType;
+
+       MidiSource (Session& session, std::string name);
        MidiSource (Session& session, const XMLNode&);
        virtual ~MidiSource ();
        
@@ -55,23 +53,25 @@ class MidiSource : public Source
        virtual uint32_t    n_channels () const { return 1; }
        
        // FIXME: integrate this with the Readable::read interface somehow
-       virtual nframes_t midi_read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const;
-       virtual nframes_t midi_write (MidiRingBuffer& src, nframes_t cnt);
+       virtual nframes_t midi_read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t cnt,
+                       nframes_t stamp_offset, nframes_t negative_stamp_offset) const;
+       virtual nframes_t midi_write (MidiRingBuffer<nframes_t>& src, nframes_t cnt);
 
-       virtual void append_event_unlocked(const MidiEvent& ev) = 0;
+       virtual void append_event_unlocked_beats(const Evoral::Event<double>& ev) = 0;
+       virtual void append_event_unlocked_frames(const Evoral::Event<nframes_t>& ev) = 0;
 
        virtual void mark_for_remove() = 0;
        virtual void mark_streaming_midi_write_started (NoteMode mode, nframes_t start_time);
        virtual void mark_streaming_write_started ();
        virtual void mark_streaming_write_completed ();
        
-       uint64_t timeline_position ()                   { return _timeline_position; }
-       void     set_timeline_position (nframes_t when) { _timeline_position = when; }
+       uint64_t timeline_position () { return _timeline_position; }
+       void     set_timeline_position (nframes_t when);
        
        virtual void session_saved();
 
-       string captured_for() const { return _captured_for; }
-       void   set_captured_for (string str) { _captured_for = str; }
+       std::string captured_for() const               { return _captured_for; }
+       void        set_captured_for (std::string str) { _captured_for = str; }
 
        uint32_t read_data_count()  const { return _read_data_count; }
        uint32_t write_data_count() const { return _write_data_count; }
@@ -89,29 +89,39 @@ class MidiSource : public Source
        virtual void load_model(bool lock=true, bool force_reload=false) = 0;
        virtual void destroy_model() = 0;
 
-       void set_note_mode(NoteMode mode) { if (_model) _model->set_note_mode(mode); }
+       void set_note_mode(NoteMode mode);
 
        boost::shared_ptr<MidiModel> model() { return _model; }
        void set_model(boost::shared_ptr<MidiModel> m) { _model = m; }
+       void drop_model() { _model.reset(); }
+
+       const Evoral::TimeConverter<double, nframes_t>& time_converter() const {
+               return _converter;
+       }
 
   protected:
-       virtual int flush_header() = 0;
-       virtual int flush_footer() = 0;
+       virtual void flush_midi() = 0;
        
-       virtual nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const = 0;
-       virtual nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt) = 0;
+       virtual nframes_t read_unlocked (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t cnt,
+                       nframes_t stamp_offset, nframes_t negative_stamp_offset) const = 0;
+       virtual nframes_t write_unlocked (MidiRingBuffer<nframes_t>& dst, nframes_t cnt) = 0;
        
        mutable Glib::Mutex _lock;
-       string              _captured_for;
+       std::string         _captured_for;
        uint64_t            _timeline_position;
        mutable uint32_t    _read_data_count;  ///< modified in read()
        mutable uint32_t    _write_data_count; ///< modified in write()
+       
+       BeatsFramesConverter _converter;
 
        boost::shared_ptr<MidiModel> _model;
        bool                         _writing;
+       
+       mutable Evoral::Sequence<double>::const_iterator _model_iter;
+       mutable nframes_t                                _last_read_end;
 
   private:
-       bool file_changed (string path);
+       bool file_changed (std::string path);
 };
 
 }