X-Git-Url: http://git.tdb.fi/?p=libs%2Fdemoscene.git;a=blobdiff_plain;f=source%2Fsequencer.cpp;fp=source%2Fsequencer.cpp;h=25182b8ef6ee7f4e623b83cfc942f8fe17339e86;hp=b4969bb30337182b35500b7ec378797bd8c1e86c;hb=cdcad43ad8b497bd73df611ae53e1dfd5257400e;hpb=2128f0eff817490e4d86ef921ac346775c62348a

diff --git a/source/sequencer.cpp b/source/sequencer.cpp
index b4969bb..25182b8 100644
--- a/source/sequencer.cpp
+++ b/source/sequencer.cpp
@@ -189,26 +189,22 @@ Sequencer::ActionDefLoader::ActionDefLoader(Sequencer &s, Demo &d):
 	DataFile::ObjectLoader<Sequencer>(s),
 	demo(d)
 {
-	for(const auto &t: obj.action_types)
-		add(t.first, t.second->get_def_loader_func());
-}
-
-void Sequencer::ActionDefLoader::finished()
-{
-	if(action)
-		action->validate();
+	obj.action_registry.add_all(*this);
 }
 
 
 Sequencer::SegmentLoader::SegmentLoader(Sequencer &s, float b, float e, Demo &d):
-	ObjectLoader<Sequencer>(s),
+	ActionDefLoader(s, d),
 	start_beat(b),
-	end_beat(e),
-	demo(d)
+	end_beat(e)
 {
 	add("apply", &SegmentLoader::apply);
-	for(const auto &t: obj.action_types)
-		add(t.first, t.second->get_loader_func());
+}
+
+void Sequencer::SegmentLoader::action_loaded()
+{
+	obj.add_action(*action, start_beat, end_beat);
+	obj.anonymous_actions.push_back(action.release());
 }
 
 void Sequencer::SegmentLoader::apply(const string &n)