diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
| commit | cb413146428ce5db5e281d70f2b3b7df27c1aaab (patch) | |
| tree | 4961e9dcb107f2ca1f0a4298faf5135ba8611d92 /libs/ardour/automation_event.cc | |
| parent | 9aa8af5a28abbb86c9ae86c6991838eb6828d0a9 (diff) | |
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/automation_event.cc')
| -rw-r--r-- | libs/ardour/automation_event.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/ardour/automation_event.cc b/libs/ardour/automation_event.cc index ccf3c35104..99e44340c5 100644 --- a/libs/ardour/automation_event.cc +++ b/libs/ardour/automation_event.cc @@ -685,7 +685,7 @@ AutomationList::truncate_end (double last_coordinate) { Glib::Mutex::Lock lm (_lock); ControlEvent cp (last_coordinate, 0); - list<ControlEvent*>::reverse_iterator i; + AutomationList::reverse_iterator i; double last_val; if (_events.empty()) { @@ -754,7 +754,7 @@ AutomationList::truncate_end (double last_coordinate) uint32_t sz = _events.size(); while (i != _events.rend() && sz > 2) { - list<ControlEvent*>::reverse_iterator tmp; + AutomationList::reverse_iterator tmp; tmp = i; ++tmp; @@ -851,7 +851,7 @@ AutomationList::truncate_start (double overall_length) i = _events.begin(); while (i != _events.end() && !_events.empty()) { - list<ControlEvent*>::iterator tmp; + AutomationList::iterator tmp; tmp = i; ++tmp; @@ -948,6 +948,9 @@ AutomationList::unlocked_eval (double x) const return multipoint_eval (x); break; } + + /*NOTREACHED*/ /* stupid gcc */ + return 0.0; } double |