Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 5 additions and 2 deletions
Showing only changes of commit cc6311a01a - Show all commits

View File

@ -58,7 +58,9 @@ intval.init = function () {
primed : false //is ready to stop frame
}
}
intval._frame = {}
intval._frame = {
}
intval._release = {
min : 20,
seq : 1000
@ -293,13 +295,14 @@ intval.frame = function (dir = null, time = null) {
intval._state.frame.paused = true
setTimeout(intval._pause, intval._state.frame.open)
if (dir) {
log.info('frame', { pausing : time - intval._state.frame.open })
log.info('frame', { pausing : time + intval._state.frame.open })
setTimeout( () => {
log.info('frame', 'restarting')
intval._state.frame.paused = false
intval._startFwd()
}, time + intval._state.frame.closed)
} else {
log.info('frame', { pausing : time + intval._state.frame.open })
setTimeout( () => {
log.info('frame', 'restarting')
intval._state.frame.paused = false