Soundship
/
Loopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-Updated tests for gridlogic

main
Harry van Haaren 2013-10-24 17:05:51 +01:00
parent 1488186b6c
commit 0d9920c9cc
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gridlogic.cxx
View File

@ -88,16 +88,16 @@ void GridLogic::launchScene( int scene )
}
else
{
if ( lc->somethingQueued() )
{
lc->neutralize();
jack->getControllerUpdater()->setSceneState( t, s, lc->getState() );
}
else if ( lc->playing() )
if ( lc->playing() )
{
lc->queueStop();
jack->getControllerUpdater()->setSceneState( t, s, lc->getState() );
}
else if ( lc->somethingQueued() )
{
lc->neutralize();
jack->getControllerUpdater()->setSceneState( t, s, lc->getState() );
}
}
}
}

24
src/tests/gridlogictests.cxx
View File

@ -28,6 +28,30 @@ int GridLogic::runTests()
jack->getGridLogic()->launchScene( s );
QUNIT_IS_TRUE( jack->getGridLogic()->getLaunchedScene() == s );
/// QUEUE s1, then launch s2, s1
int launchScene = s + 1;
lc->init();
lc->setState( true, false, false, true, false, false ); // qplay
//LUPPP_NOTE("state before = %s", GridLogic::StateString[ lc->getState() ] );
jack->getGridLogic()->launchScene( launchScene ); // launch different clip
QUNIT_IS_TRUE( jack->getGridLogic()->getLaunchedScene() == launchScene );
//LUPPP_NOTE("state after before bar = %s", GridLogic::StateString[ lc->getState() ] );
jack->getGridLogic()->bar();
//LUPPP_NOTE("state after bar = %s", GridLogic::StateString[ lc->getState() ] );
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_STOPPED );
/// s1 playing, then launch s2, s1
lc->init();
lc->setState( true, true, false, false, false, false ); // playing
//LUPPP_NOTE("state before = %s", GridLogic::StateString[ lc->getState() ] );
jack->getGridLogic()->launchScene( launchScene ); // launch different clip
QUNIT_IS_TRUE( jack->getGridLogic()->getLaunchedScene() == launchScene );
//LUPPP_NOTE("state after before bar = %s", GridLogic::StateString[ lc->getState() ] );
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_STOP_QUEUED );
jack->getGridLogic()->bar();
//LUPPP_NOTE("state after bar = %s", GridLogic::StateString[ lc->getState() ] );
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_STOPPED );
/// PRESS PAD
// empty -> recording