smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-27 23:48:22 +01:00
Code Issues Projects Releases Wiki Activity

abort loading crossfades that are missing data for _fade_in or _fade_out

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8190 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-06 01:13:38 +00:00
parent 5fa878da94
commit 256bf66ae0
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libs/ardour/crossfade.cc
View file

@ -724,8 +724,6 @@ Crossfade::set_state (const XMLNode& node)
_position = _in->first_frame();
}
cerr << "Crossfade @ " << _position << endl;
if ((prop = node.property ("active")) != 0) {
bool x = string_is_affirmative (prop->value());
if (x != _active) {
@ -786,14 +784,11 @@ Crossfade::set_state (const XMLNode& node)
/* fade in */
_fade_in.freeze ();
cerr << "After freeze, frozen = " << (int) _fade_in.frozen() << endl;
_fade_in.clear ();
cerr << "After clear, frozen = " << (int) _fade_in.frozen() << endl;
children = fi->children();
for (i = children.begin(); i != children.end(); ++i) {
cerr << "Crossfade looking at child node called " << (*i)->name() << endl;
if ((*i)->name() == "point") {
nframes_t x;
float y;
@ -805,14 +800,16 @@ Crossfade::set_state (const XMLNode& node)
sscanf (prop->value().c_str(), "%f", &y);
_fade_in.add (x, y);
cerr << "After add, frozen = " << (int) _fade_in.frozen() << endl;
}
}
if (_fade_in.size() < 2) {
cerr << "Fade in data missing any points! Crossfade will be lost!\n";
return -1;
}
_fade_in.front()->value=0.0;
cerr << "After front clamp, frozen = " << (int) _fade_in.frozen() << endl;
_fade_in.back()->value=1.0;
cerr << "After back clamp, frozen = " << (int) _fade_in.frozen() << endl;
_fade_in.thaw ();
@ -839,6 +836,11 @@ Crossfade::set_state (const XMLNode& node)
}
}
if (_fade_out.size() < 2) {
cerr << "Fade out data missing any points! Crossfade will be lost!\n";
return -1;
}
_fade_out.front()->value=1.0;
_fade_out.back()->value=0.0;