smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

Fix CC interpolation (i.e. output a maximum reslution stream of CC for a line segment).

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3781 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-09-21 17:11:11 +00:00
parent 073a94350b
commit ca12fe9733
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/automation_time_axis.cc
View file

@ -356,8 +356,8 @@ void
AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style) AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style)
{ {
_control->list()->set_interpolation(style); _control->list()->set_interpolation(style);
if (_line) if (_line)
_line->set_interpolation(style); _line->set_interpolation(style);
} }
void void

7
libs/evoral/src/Sequence.cpp
View file

@ -58,9 +58,8 @@ struct null_ostream : public std::ostream {
static null_ostream nullout; static null_ostream nullout;
//static ostream& debugout = cout; //static ostream& debugout = cout;
//static ostream& errorout = cerr;
static ostream& debugout = nullout; static ostream& debugout = nullout;
static ostream& errorout = nullout; static ostream& errorout = cerr;
// Read iterator (const_iterator) // Read iterator (const_iterator)
@ -206,7 +205,6 @@ Sequence::const_iterator& Sequence::const_iterator::operator++()
} }
} }
const std::vector<ControlIterator>::iterator old_control_iter = _control_iter;
_control_iter = _control_iters.begin(); _control_iter = _control_iters.begin();
// find the _control_iter with the earliest event time // find the _control_iter with the earliest event time
@ -237,8 +235,7 @@ Sequence::const_iterator& Sequence::const_iterator::operator++()
} }
// Use the next earliest controller iff it's earlier than the note event // Use the next earliest controller iff it's earlier than the note event
if (_control_iter != _control_iters.end() && _control_iter->x != DBL_MAX if (_control_iter != _control_iters.end() && _control_iter->x != DBL_MAX) {
&& _control_iter != old_control_iter) {
if (type == NIL || _control_iter->x < t) { if (type == NIL || _control_iter->x < t) {
type = CONTROL; type = CONTROL;
} }