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

fix problems with list stuff caused by assumptions about list type equivalence

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3150 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-03-17 20:36:37 +00:00
parent 94a2d23645
commit 75d8a7e2b1
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/automation_event.h
View file

@ -69,6 +69,7 @@ class AutomationList : public PBD::StatefulDestructible
public:
typedef std::list<ControlEvent*,ControlEventAllocator> AutomationEventList;
typedef AutomationEventList::iterator iterator;
typedef AutomationEventList::reverse_iterator reverse_iterator;
typedef AutomationEventList::const_iterator const_iterator;
AutomationList (double default_value);

9
libs/ardour/automation_event.cc
View file

@ -674,7 +674,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()) {
@ -743,7 +743,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;
@ -840,7 +840,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;
@ -940,6 +940,9 @@ AutomationList::shared_eval (double x)
return multipoint_eval (x);
break;
}
/*NOTREACHED*/ /* stupid gcc */
return 0.0;
}
double