@ -103,13 +103,22 @@ void magSlideShowSource::update() {
runningTime + = deltaTime ;
runningTime + = deltaTime ;
lastTime = nowTime ;
lastTime = nowTime ;
// ofLogVerbose() << "Delta: " << deltaTime << " running: " << runningTime;
for ( auto & slide : activeSlides )
for ( auto & slide : activeSlides )
{
{
slide - > update ( deltaTime ) ;
slide - > update ( deltaTime ) ;
}
}
// Queue the next slide if it is time
if ( doPlayNextSlide )
{
playNextSlide ( ) ;
if ( activeSlides . size ( ) > 1 )
{
activeSlides [ 1 ] - > transition - > start ( activeSlides [ 0 ] ) ;
}
doPlayNextSlide = false ;
}
// Erase any complete slides:
// Erase any complete slides:
auto iter = activeSlides . begin ( ) ;
auto iter = activeSlides . begin ( ) ;
for ( ; iter < activeSlides . end ( ) ; iter + + )
for ( ; iter < activeSlides . end ( ) ; iter + + )
@ -497,13 +506,8 @@ void magSlideShowSource::slideStateChanged(const void *sender, ofEventArgs &args
// << slide->getSlideStateName();
// << slide->getSlideStateName();
if ( slide - > getSlideState ( ) = = magSlide : : SlideState : : BuildOut )
if ( slide - > getSlideState ( ) = = magSlide : : SlideState : : BuildOut )
{
{
// slide->transition->start();
// Flag that we need to load the next slide:
// ofLogVerbose() << "BuildOut " << slide->getId();
doPlayNextSlide = true ;
playNextSlide ( ) ;
if ( activeSlides . size ( ) > 1 )
{
activeSlides [ 1 ] - > transition - > start ( activeSlides [ 0 ] ) ;
}
}
}
}
}