mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-08 07:45:00 +01:00
chris goddard's region list patch; port 2.X marker drag/move changes to 3.0; compilation fixes-post-evoral
git-svn-id: svn://localhost/ardour2/branches/3.0@3760 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
60f588f21d
commit
6f8cd63450
33 changed files with 758 additions and 188 deletions
|
|
@ -19,6 +19,7 @@
|
|||
#define __STDC_LIMIT_MACROS 1
|
||||
|
||||
#include <iostream>
|
||||
#include <cmath>
|
||||
#include <algorithm>
|
||||
#include <stdexcept>
|
||||
#include <stdint.h>
|
||||
|
|
@ -313,7 +314,7 @@ size_t Sequence::read(EventSink& dst, timestamp_t start, timestamp_t nframes, ti
|
|||
//cerr << "Using cached iterator at " << _next_read << endl;
|
||||
}
|
||||
|
||||
_next_read = start + nframes;
|
||||
_next_read = (nframes_t) floor (start + nframes);
|
||||
|
||||
while (_read_iter != end() && _read_iter->time() < start + nframes) {
|
||||
assert(_read_iter->size() > 0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue