X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsequencer.cpp;h=8bca70bb368764d7a94058b95aaf595623a95913;hb=7857d6ec5961f94bc926b1a969f2c841713f9650;hp=917108b7878753a987e88d7c931a6e6a69760586;hpb=2a957e891f86cc692ddbb80f71b1478ea03d5a4f;p=libs%2Fdemoscene.git

diff --git a/source/sequencer.cpp b/source/sequencer.cpp
index 917108b..8bca70b 100644
--- a/source/sequencer.cpp
+++ b/source/sequencer.cpp
@@ -1,7 +1,9 @@
 #include <cmath>
 #include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
+#include "fadeoverlay.h"
 #include "sequencer.h"
+#include "stage.h"
 
 using namespace std;
 using namespace Msp;
@@ -12,6 +14,9 @@ Sequencer::Sequencer(float bpm):
 	next_event(0)
 {
 	set_beats_per_minute(bpm);
+
+	register_action_type<FadeOverlay::Fade>("fade");
+	register_action_type<Stage::UseInView>("use_stage");
 }
 
 void Sequencer::set_beats_per_minute(float bpm)
@@ -29,12 +34,12 @@ void Sequencer::add_action(Action &act, float sb, float eb)
 	if(sb<0 || sb>eb)
 		throw invalid_argument("Sequencer::add_action");
 
-	Segment seq_act;
-	seq_act.action = &act;
-	seq_act.start_beat = sb;
-	seq_act.end_beat = eb;
+	Segment seg;
+	seg.action = &act;
+	seg.start_beat = sb;
+	seg.end_beat = eb;
 	auto i = find_if(segments, [=](const Segment &s){ return s.start_beat>sb; });
-	segments.insert(i, seq_act);
+	segments.insert(i, seg);
 }
 
 void Sequencer::start()