From 46563802b8d1c31020752b7a4360f92e7613dc31 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sat, 11 Jan 2020 00:24:47 +0100
Subject: render video after live

---
 app/client/live/live.reducer.js                        | 2 +-
 app/client/modules/biggan/views/biggan.categoryList.js | 2 +-
 app/client/modules/biggan/views/biggan.encodingList.js | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/client')

diff --git a/app/client/live/live.reducer.js b/app/client/live/live.reducer.js
index d352d25..2abb527 100644
--- a/app/client/live/live.reducer.js
+++ b/app/client/live/live.reducer.js
@@ -123,7 +123,7 @@ const liveReducer = (state = liveInitialState, action) => {
             ...state,
             opt: {
               ...state.opt,
-              [line[1]]: line[2],
+              ...new_opt,
             }
           }
         }
diff --git a/app/client/modules/biggan/views/biggan.categoryList.js b/app/client/modules/biggan/views/biggan.categoryList.js
index e1cc2d1..7d38efc 100644
--- a/app/client/modules/biggan/views/biggan.categoryList.js
+++ b/app/client/modules/biggan/views/biggan.categoryList.js
@@ -10,7 +10,7 @@ import actions from '../../../actions'
 import * as bigganTasks from '../biggan.tasks'
 import * as bigganActions from '../biggan.actions'
 
-const ALL_CATEGORIES = 'inversion/categories/biggan_all.json'
+const ALL_CATEGORIES = 'categories/biggan_all.json'
 
 class BigGANCategoryList extends Component {
   state = {
diff --git a/app/client/modules/biggan/views/biggan.encodingList.js b/app/client/modules/biggan/views/biggan.encodingList.js
index 76c306c..710752e 100644
--- a/app/client/modules/biggan/views/biggan.encodingList.js
+++ b/app/client/modules/biggan/views/biggan.encodingList.js
@@ -37,11 +37,11 @@ class BigGANEncodingList extends Component {
           />
           <Slider live
             name='encoding_mix_n'
-            title={"Blend mix"}
+            title={"Latent mix"}
             min={0} max={1} type='float'
           />
           <Slider live
-            name='encoding_mix_n'
+            name='encoding_stored_n'
             title={"Encoding mix"}
             min={0} max={1} type='float'
           />
@@ -55,7 +55,9 @@ class BigGANEncodingList extends Component {
                   <img
                     key={file.id}
                     src={file.url}
-                    onClick={() => actions.live.send_command('setEncoding', 'id=' + file.id)}
+                    onClick={() => actions.live.send_command('setEncoding', JSON.stringify({
+                      id: file.id,
+                    }))}
                   />
                 ))}
               </div>
-- 
cgit v1.2.3-70-g09d2