summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_playlist.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-01-08 02:56:49 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-01-08 02:56:49 +0000
commita20f41ab39cc034740ccd564c1057d8737d763d5 (patch)
tree6f713470d72ec04ad03efb1ad6380717476c29fd /libs/ardour/audio_playlist.cc
parent1186b1d881fac3d1d1b55954b84b958c988501c4 (diff)
a metric ton of changes
git-svn-id: svn://localhost/trunk/ardour2@246 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist.cc')
-rw-r--r--libs/ardour/audio_playlist.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 73e0a91164..9c68c61114 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -576,7 +576,6 @@ AudioPlaylist::state_factory (std::string why) const
for (Crossfades::const_iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
state->crossfade_states.push_back ((*i)->get_memento());
}
-
return state;
}
@@ -592,13 +591,13 @@ AudioPlaylist::restore_state (StateManager::State& state)
regions = apstate->regions;
for (list<UndoAction>::iterator s = apstate->region_states.begin(); s != apstate->region_states.end(); ++s) {
- *s;
+ (*s) ();
}
_crossfades = apstate->crossfades;
for (list<UndoAction>::iterator s = apstate->crossfade_states.begin(); s != apstate->crossfade_states.end(); ++s) {
- *s;
+ (*s) ();
}
in_set_state = false;
@@ -611,7 +610,7 @@ AudioPlaylist::restore_state (StateManager::State& state)
UndoAction
AudioPlaylist::get_memento () const
{
- return sigc::bind (mem_fun (*(const_cast<AudioPlaylist*> (this)), &StateManager::use_state), _current_state_id);
+ return sigc::bind (mem_fun (*(const_cast<AudioPlaylist*> (this)), &StateManager::use_state), _current_state_id);
}
void