Skip to content
Browse files

merge portrait class

  • Loading branch information...
1 parent fa8b50f commit 8f8da5712265771131df55f18c0b0088c410de75 @obviousjim committed Aug 15, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −5 Renderer/src/ScreenLabPortrait.cpp
View
10 Renderer/src/ScreenLabPortrait.cpp
@@ -74,23 +74,23 @@ void ScreenLabPortrait::resetAndPlay(){
soundPlayer.play();
soundPlayer.setLoopState(OF_LOOP_NONE);
- rendererRef->setup(take.calibrationDirectory);
+// rendererRef->setup(take.calibrationDirectory);
cout << "setting up renderer " << endl;
cout << "sound player duration " << soundPlayer.getDuration() << endl;
//<<<<<<< HEAD
if(useHighResPlayer){
if(!hiResPlayer.isLoaded()){
- hiResPlayer.loadMovie(take.hiResVideoPath);
+ hiResPlayer.loadMovie(scene.alternativeHiResVideoPath);
}
hiResPlayer.setSpeed(.5);
//videoPlayer.setFrame(startFrame);
hiResPlayer.setPosition(videoTimes.min / videoPlayer.getDuration() );
hiResPlayer.setVolume(0);
hiResPlayer.play();
hiResPlayer.setLoopState(OF_LOOP_NORMAL);
- rendererRef->setRGBTexture(hiResPlayer);
+// rendererRef->setRGBTexture(hiResPlayer);
}
else {
videoPlayer.setSpeed(.5);
@@ -99,7 +99,7 @@ void ScreenLabPortrait::resetAndPlay(){
videoPlayer.setVolume(0);
videoPlayer.play();
videoPlayer.setLoopState(OF_LOOP_NORMAL);
- rendererRef->setRGBTexture(videoPlayer);
+// rendererRef->setRGBTexture(videoPlayer);
}
//=======
@@ -108,7 +108,7 @@ void ScreenLabPortrait::resetAndPlay(){
// videoPlayer.setVolume(0);
// videoPlayer.play();
// videoPlayer.setLoopState(OF_LOOP_NORMAL);
-
+ cout << "calibration folder is " << scene.calibrationFolder << endl;
rendererRef->setup(scene.calibrationFolder);
rendererRef->setRGBTexture(videoPlayer);
//>>>>>>> 7785d622a173e710bd358ffb900bc4ebd357bed5

0 comments on commit 8f8da57

Please sign in to comment.
Something went wrong with that request. Please try again.