remove Evoral::Sequence::overlaps{_unlocked} (). Not used anywhere
This commit is contained in:
parent
f295b59439
commit
c0c9d79325
@ -1210,45 +1210,6 @@ Sequence<Time>::contains_unlocked (const NotePtr& note) const
|
||||
return false;
|
||||
}
|
||||
|
||||
template<typename Time>
|
||||
bool
|
||||
Sequence<Time>::overlaps (const NotePtr& note, const NotePtr& without) const
|
||||
{
|
||||
ReadLock lock (read_lock());
|
||||
return overlaps_unlocked (note, without);
|
||||
}
|
||||
|
||||
template<typename Time>
|
||||
bool
|
||||
Sequence<Time>::overlaps_unlocked (const NotePtr& note, const NotePtr& without) const
|
||||
{
|
||||
Time sa = note->time();
|
||||
Time ea = note->end_time();
|
||||
|
||||
const Pitches& p (pitches (note->channel()));
|
||||
NotePtr search_note(new Note<Time>(0, Time(), Time(), note->note()));
|
||||
|
||||
for (typename Pitches::const_iterator i = p.lower_bound (search_note);
|
||||
i != p.end() && (*i)->note() == note->note(); ++i) {
|
||||
|
||||
if (without && (**i) == *without) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Time sb = (*i)->time();
|
||||
Time eb = (*i)->end_time();
|
||||
|
||||
if (((sb > sa) && (eb <= ea)) ||
|
||||
((eb >= sa) && (eb <= ea)) ||
|
||||
((sb > sa) && (sb <= ea)) ||
|
||||
((sa >= sb) && (sa <= eb) && (ea <= eb))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
template<typename Time>
|
||||
void
|
||||
Sequence<Time>::set_notes (const typename Sequence<Time>::Notes& n)
|
||||
|
@ -300,8 +300,6 @@ public:
|
||||
bool edited() const { return _edited; }
|
||||
void set_edited(bool yn) { _edited = yn; }
|
||||
|
||||
bool overlaps (const NotePtr& ev,
|
||||
const NotePtr& ignore_this_note) const;
|
||||
bool contains (const NotePtr& ev) const;
|
||||
|
||||
bool add_note_unlocked (const NotePtr note, void* arg = 0);
|
||||
@ -339,7 +337,6 @@ protected:
|
||||
private:
|
||||
friend class const_iterator;
|
||||
|
||||
bool overlaps_unlocked (const NotePtr& ev, const NotePtr& ignore_this_note) const;
|
||||
bool contains_unlocked (const NotePtr& ev) const;
|
||||
|
||||
void append_note_on_unlocked(const Event<Time>& event, Evoral::event_id_t);
|
||||
|
Loading…
Reference in New Issue
Block a user