diff options
Diffstat (limited to 'app/client/live')
| -rw-r--r-- | app/client/live/live.actions.js | 16 | ||||
| -rw-r--r-- | app/client/live/live.reducer.js | 20 |
2 files changed, 29 insertions, 7 deletions
diff --git a/app/client/live/live.actions.js b/app/client/live/live.actions.js index 348b58b..a9cbdb3 100644 --- a/app/client/live/live.actions.js +++ b/app/client/live/live.actions.js @@ -1,6 +1,8 @@ import socket from '../socket' import types from '../types' +import * as player from './player' + export const get_params = () => { socket.live.get_params() return { type: types.player.get_params, } @@ -27,14 +29,14 @@ export const list_sequences = (module) => { return { type: types.player.loading_sequences } } -export const load_sequence = (sequence) => { - socket.live.load_sequence(sequence) - return { type: types.player.loading_sequence, } +export const load_sequence = (sequence_name) => { + socket.live.load_sequence(sequence_name) + return { type: types.player.loading_sequence, sequence_name } } -export const load_epoch = (checkpoint, epoch) => { - socket.live.load_epoch(checkpoint, epoch) - return { type: types.player.loading_checkpoint, } +export const load_epoch = (checkpoint_name, epoch) => { + socket.live.load_epoch(checkpoint_name, epoch) + return { type: types.player.loading_checkpoint, checkpoint_name, epoch } } export const seek = (frame) => { @@ -44,10 +46,12 @@ export const seek = (frame) => { export const pause = (frame) => { socket.live.pause(pause) + player.toggleFPS(false) return { type: types.player.pausing, } } export const play = (frame) => { socket.live.play() + player.toggleFPS(true) return { type: types.player.playing, } } diff --git a/app/client/live/live.reducer.js b/app/client/live/live.reducer.js index f1f2f4e..3a5b661 100644 --- a/app/client/live/live.reducer.js +++ b/app/client/live/live.reducer.js @@ -17,7 +17,6 @@ const liveInitialState = { const liveReducer = (state = liveInitialState, action) => { let results; - if (action.type !== 'SYSTEM_STDOUT') console.log(action.type, action) switch(action.type) { case types.socket.load_params: if (! action.opt || ! Object.keys(action.opt).length) { @@ -61,6 +60,25 @@ const liveReducer = (state = liveInitialState, action) => { sequences: action.sequences, } + case types.player.loading_sequence: + return { + ...state, + opt: { + ...state.opt, + sequence_name: action.sequence_name, + } + } + + case types.player.loading_checkpoint: + return { + ...state, + opt: { + ...state.opt, + checkpoint_name: action.checkpoint_name, + epoch: action.epoch, + } + } + case types.player.set_fps: return { ...state, |
