ui updates

2 files changed, 12 insertions, 7 deletions

diff --git a/app/client/live/live.reducer.js b/app/client/live/live.reducer.js
index 2abb527..1d437e0 100644
--- a/app/client/live/live.reducer.js
+++ b/app/client/live/live.reducer.js
@@ -10,6 +10,7 @@ const liveInitialState = {
     sequence_playing: true, sequence_step: 1,
     recurse_roll: 0, rotate: 0, scale: 0, process_frac: 0.5,
     view_mode: 'b',
+    encoding_stored_mix_n: 0,
   },
   all_checkpoints: [],
   checkpoints: [],
@@ -115,7 +116,12 @@ const liveReducer = (state = liveInitialState, action) => {
           const new_opt = action.data.data.trim().split('\n').reduce((a,b) => {
             if (b.indexOf('set_opt') === 0) {
               const terms = b.split(' ')
-              a[terms[1]] = terms[2]
+              let key = terms[1]
+              let value = parseFloat(terms[2])
+              if (isNaN(value)) {
+                value = terms[2]
+              }
+              a[key] = value
             }
             return a
           }, {})
diff --git a/app/client/live/player.js b/app/client/live/player.js
index 483bbf1..78f5c24 100644
--- a/app/client/live/player.js
+++ b/app/client/live/player.js
@@ -3,7 +3,7 @@ import Whammy from './whammy'
 import types from '../types'
 import * as pix2wav from '../audio/pix2wav'
 
-let fps = 0, last_frame
+let fps = 0
 let recording = false, saving = false, synthesizing = false
 let videoWriter
 
@@ -42,6 +42,10 @@ export function saveFrame(){
 }
 
 export function onFrame (data) {
+  store.dispatch({
+    type: types.player.current_frame,
+    meta: data.meta,
+  })
   const blob = new Blob([data.frame], { type: 'image/jpg' })
   const url = URL.createObjectURL(blob)
   const img = new Image ()
@@ -49,7 +53,6 @@ export function onFrame (data) {
   if (! canvas) return console.error('no canvas for frame')
   img.onload = () => {
     img.onload = null
-    last_frame = data.meta
     URL.revokeObjectURL(url)
     const ctx = canvas.getContext('2d-lodpi')
     ctx.drawImage(img, 0, 0, canvas.width, canvas.height)
@@ -100,10 +103,6 @@ export function startWatchingFPS(){
       type: types.player.set_fps,
       fps: fps,
     })
-    store.dispatch({
-      type: types.player.current_frame,
-      meta: last_frame,
-    })
     fps = 0
   }, 1000)
 }