Added "loop" parameter to MovieStimulus; if set to a non-zero value, …

…movie will repeat indefinitely
dicarlolab-mworks · Dec 14, 2010 · f1b104b · f1b104b
1 parent 43a2112
commit f1b104b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/MoviePlugin/MWLibrary.xml b/MoviePlugin/MWLibrary.xml
@@ -11,7 +11,7 @@
 
 		<!-- Payload -->
 		<code>
-        <stimulus type="movie" tag="" stimulus_group="" frames_per_second="10" ended="" />
+        <stimulus type="movie" tag="" stimulus_group="" frames_per_second="10" ended="" loop="0" />
 		</code>
     </MWElement>
 </MWElements>
diff --git a/MoviePlugin/MovieStimulus.cpp b/MoviePlugin/MovieStimulus.cpp
@@ -16,13 +16,26 @@
 MovieStimulus::MovieStimulus(const std::string &_tag,
                              shared_ptr<Variable> _frames_per_second,
                              shared_ptr<StimulusGroup> _stimulus_group,
-                             shared_ptr<Variable> ended) :
+                             shared_ptr<Variable> ended,
+                             shared_ptr<Variable> loop) :
     StandardDynamicStimulus(_tag, _frames_per_second),
     stimulus_group(_stimulus_group),
-    ended(ended)
+    ended(ended),
+    loop(loop)
 {
 }
 
+int MovieStimulus::getFrameNumber() {
+    int frameNumber = DynamicStimulusDriver::getFrameNumber();
+
+    if (bool(loop->getValue())) {
+        int numFrames = stimulus_group->getNElements();
+        frameNumber %= numFrames;
+    }
+
+    return frameNumber;
+}
+
 bool MovieStimulus::needDraw() {
     return StandardDynamicStimulus::needDraw() && (getFrameNumber() <= stimulus_group->getNElements());
 }
@@ -53,6 +66,7 @@ shared_ptr<mw::Component> MovieStimulusFactory::createObject(std::map<std::strin
 	const char *STIMULUS_GROUP = "stimulus_group";
 	const char *FRAMES_PER_SECOND = "frames_per_second";
 	const char *ENDED = "ended";
+	const char *LOOP = "loop";
 
 	REQUIRE_ATTRIBUTES(parameters, 
 					   TAG, 
@@ -74,11 +88,15 @@ shared_ptr<mw::Component> MovieStimulusFactory::createObject(std::map<std::strin
         ended = reg->getVariable(parameters[ENDED]);
         CHECK_ATTRIBUTE(ended, parameters, ENDED);
     }
+
+	shared_ptr<Variable> loop = reg->getVariable(parameters[LOOP], "0");
+    CHECK_ATTRIBUTE(loop, parameters, LOOP);
 
 	shared_ptr <MovieStimulus> new_movie = shared_ptr<MovieStimulus>(new MovieStimulus(tagname,
                                                                                        frames_per_second,
                                                                                        the_group,
-                                                                                       ended));
+                                                                                       ended,
+                                                                                       loop));
 
 	shared_ptr <StimulusNode> thisStimNode = shared_ptr<StimulusNode>(new StimulusNode(new_movie));
 	reg->registerStimulusNode(tagname, thisStimNode);

diff --git a/MoviePlugin/MovieStimulus.h b/MoviePlugin/MovieStimulus.h
@@ -21,14 +21,17 @@ class MovieStimulus : public StandardDynamicStimulus {
 
 	boost::shared_ptr<StimulusGroup> stimulus_group;
     shared_ptr<Variable> ended;
+    shared_ptr<Variable> loop;
 
 public:
 
 	MovieStimulus(const std::string &_tag,
                   shared_ptr<Variable> _frames_per_second,
                   shared_ptr<StimulusGroup> _stimulus_group,
-                  shared_ptr<Variable> ended);
-
+                  shared_ptr<Variable> ended,
+                  shared_ptr<Variable> loop);
+
+	virtual int getFrameNumber();
     virtual bool needDraw();
     virtual void drawFrame(shared_ptr<StimulusDisplay> display, int frameNumber);
 	virtual Datum getCurrentAnnounceDrawData();