From eb4a1fdbb8fec1f8aa5dfe33f882064e85792a84 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 Mar 2008 03:42:32 +0000 Subject: refactor JACK MIDI port to allow writing from a non-process() thread, and move ARDOUR::MidiEvent into MIDI namespace along with midi_events.h header git-svn-id: svn://localhost/ardour2/branches/3.0@3155 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/midi_model.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libs/ardour/ardour/midi_model.h') diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index de31d0505e..11ef4e0f76 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -75,7 +75,7 @@ public: size_t read (MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes_t stamp_offset) const; /** Resizes vector if necessary (NOT realtime safe) */ - void append(const MidiEvent& ev); + void append(const MIDI::Event& ev); inline const boost::shared_ptr note_at(unsigned i) const { return _notes[i]; } inline const boost::shared_ptr note_at(unsigned i) { return _notes[i]; } @@ -151,8 +151,8 @@ public: inline bool locked() const { return _locked; } - const MidiEvent& operator*() const { return _event; } - const MidiEvent* operator->() const { return &_event; } + const MIDI::Event& operator*() const { return _event; } + const MIDI::Event* operator->() const { return &_event; } const const_iterator& operator++(); // prefix only bool operator==(const const_iterator& other) const; @@ -164,7 +164,7 @@ public: friend class MidiModel; const MidiModel* _model; - MidiEvent _event; + MIDI::Event _event; typedef std::priority_queue< boost::shared_ptr, std::deque< boost::shared_ptr >, @@ -189,7 +189,7 @@ private: void remove_note_unlocked(const boost::shared_ptr note); friend class const_iterator; - bool control_to_midi_event(MidiEvent& ev, const MidiControlIterator& iter) const; + bool control_to_midi_event(MIDI::Event& ev, const MidiControlIterator& iter) const; #ifndef NDEBUG bool is_sorted() const; -- cgit v1.2.3