#include <utility>
#include <boost/shared_ptr.hpp>
#include <glibmm/threads.h>
+
+#include "evoral/visibility.h"
#include "evoral/types.hpp"
#include "evoral/Note.hpp"
-#include "evoral/Parameter.hpp"
#include "evoral/ControlSet.hpp"
#include "evoral/ControlList.hpp"
#include "evoral/PatchChange.hpp"
namespace Evoral {
+class Parameter;
class TypeMap;
template<typename Time> class EventSink;
template<typename Time> class Note;
/** An iterator over (the x axis of) a 2-d double coordinate space.
*/
-class ControlIterator {
+class /*LIBEVORAL_API*/ ControlIterator {
public:
ControlIterator(boost::shared_ptr<const ControlList> al, double ax, double ay)
: list(al)
* notes (instead of just unassociated note on/off events) and controller data.
* Controller data is represented as a list of time-stamped float values. */
template<typename Time>
-class Sequence : virtual public ControlSet {
+class LIBEVORAL_API Sequence : virtual public ControlSet {
public:
Sequence(const TypeMap& type_map);
Sequence(const Sequence<Time>& other);
public:
- typedef typename boost::shared_ptr<Evoral::Note<Time> > NotePtr;
- typedef typename boost::shared_ptr<const Evoral::Note<Time> > constNotePtr;
+ typedef typename boost::shared_ptr<Evoral::Note<Time> > NotePtr;
+ typedef typename boost::weak_ptr<Evoral::Note<Time> > WeakNotePtr;
+ typedef typename boost::shared_ptr<const Evoral::Note<Time> > constNotePtr;
typedef boost::shared_ptr<Glib::Threads::RWLock::ReaderLock> ReadLock;
- typedef boost::shared_ptr<WriteLockImpl> WriteLock;
+ typedef boost::shared_ptr<WriteLockImpl> WriteLock;
virtual ReadLock read_lock() const { return ReadLock(new Glib::Threads::RWLock::ReaderLock(_lock)); }
- virtual WriteLock write_lock() { return WriteLock(new WriteLockImpl(_lock, _control_lock)); }
+ virtual WriteLock write_lock() { return WriteLock(new WriteLockImpl(_lock, _control_lock)); }
void clear();
ResolveStuckNotes
};
- void end_write (StuckNoteOption, Time when = 0);
+ void end_write (StuckNoteOption, Time when = Time());
void append(const Event<Time>& ev, Evoral::event_id_t evid);
+ const TypeMap& type_map() const { return _type_map; }
+
inline size_t n_notes() const { return _notes.size(); }
inline bool empty() const { return _notes.empty() && _sysexes.empty() && _patch_changes.empty() && ControlSet::controls_empty(); }
struct EarlierNoteComparator {
inline bool operator()(const boost::shared_ptr< const Note<Time> > a,
const boost::shared_ptr< const Note<Time> > b) const {
- return musical_time_less_than (a->time(), b->time());
+ return a->time() < b->time();
}
};
typedef const Note<Time>* value_type;
inline bool operator()(const boost::shared_ptr< const Note<Time> > a,
const boost::shared_ptr< const Note<Time> > b) const {
- return musical_time_greater_than (a->time(), b->time());
return a->time() > b->time();
}
};
typedef const Note<Time>* value_type;
inline bool operator()(const boost::shared_ptr< const Note<Time> > a,
const boost::shared_ptr< const Note<Time> > b) const {
- return musical_time_greater_than (a->end_time(), b->end_time());
+ return a->end_time() > b->end_time();
}
};
struct EarlierSysExComparator {
inline bool operator() (constSysExPtr a, constSysExPtr b) const {
- return musical_time_less_than (a->time(), b->time());
+ return a->time() < b->time();
}
};
struct EarlierPatchChangeComparator {
inline bool operator() (constPatchChangePtr a, constPatchChangePtr b) const {
- return musical_time_less_than (a->time(), b->time());
+ return a->time() < b->time();
}
};
public:
/** Read iterator */
- class const_iterator {
+ class LIBEVORAL_API const_iterator {
public:
const_iterator();
- const_iterator(const Sequence<Time>& seq, Time t, bool, std::set<Evoral::Parameter> const &);
- ~const_iterator();
+ const_iterator(const Sequence<Time>& seq,
+ Time t,
+ bool force_discrete,
+ const std::set<Evoral::Parameter>& filtered,
+ const std::set<WeakNotePtr>* active_notes=NULL);
inline bool valid() const { return !_is_end && _event; }
- //inline bool locked() const { return _locked; }
- void invalidate();
+ void invalidate(std::set<WeakNotePtr>* notes);
const Event<Time>& operator*() const { return *_event; }
const boost::shared_ptr< Event<Time> > operator->() const { return _event; }
private:
friend class Sequence<Time>;
+ Time choose_next(Time earliest_t);
+ void set_event();
+
typedef std::vector<ControlIterator> ControlIterators;
enum MIDIMessageType { NIL, NOTE_ON, NOTE_OFF, CONTROL, SYSEX, PATCH_CHANGE };
};
const_iterator begin (
- Time t = 0,
- bool force_discrete = false,
- std::set<Evoral::Parameter> const & f = std::set<Evoral::Parameter> ()) const {
- return const_iterator (*this, t, force_discrete, f);
+ Time t = Time(),
+ bool force_discrete = false,
+ const std::set<Evoral::Parameter>& f = std::set<Evoral::Parameter>(),
+ const std::set<WeakNotePtr>* active_notes = NULL) const {
+ return const_iterator (*this, t, force_discrete, f, active_notes);
}
const const_iterator& end() const { return _end_iter; }
bool overlaps_unlocked (const NotePtr& ev, const NotePtr& ignore_this_note) const;
bool contains_unlocked (const NotePtr& ev) const;
- void append_note_on_unlocked (NotePtr, Evoral::event_id_t);
- void append_note_off_unlocked(NotePtr);
+ void append_note_on_unlocked(const MIDIEvent<Time>& event, Evoral::event_id_t);
+ void append_note_off_unlocked(const MIDIEvent<Time>& event);
void append_control_unlocked(const Parameter& param, Time time, double value, Evoral::event_id_t);
void append_sysex_unlocked(const MIDIEvent<Time>& ev, Evoral::event_id_t);
- void append_patch_change_unlocked (const PatchChange<Time>&, Evoral::event_id_t);
+ void append_patch_change_unlocked(const PatchChange<Time>&, Evoral::event_id_t);
void get_notes_by_pitch (Notes&, NoteOperator, uint8_t val, int chan_mask = 0) const;
void get_notes_by_velocity (Notes&, NoteOperator, uint8_t val, int chan_mask = 0) const;
} // namespace Evoral
-template<typename Time> std::ostream& operator<<(std::ostream& o, const Evoral::Sequence<Time>& s) { s.dump (o); return o; }
+template<typename Time> /*LIBEVORAL_API*/ std::ostream& operator<<(std::ostream& o, const Evoral::Sequence<Time>& s) { s.dump (o); return o; }
+
#endif // EVORAL_SEQUENCE_HPP