summaryrefslogtreecommitdiff
path: root/app/client
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-07-27 18:16:29 +0200
committerJules Laplace <julescarbon@gmail.com>2018-07-27 18:16:29 +0200
commitdc1c2bf024885af3476f41e2f245765c633816a7 (patch)
treef65d73151565692153a1ac2666ac5c542560e2c4 /app/client
parentf1aa17aff5a252f7e7a00b81954e0c172dee9d32 (diff)
html
Diffstat (limited to 'app/client')
-rw-r--r--app/client/live/live.reducer.js6
-rw-r--r--app/client/modules/pix2pixhd/views/pix2pixhd.live.js11
2 files changed, 13 insertions, 4 deletions
diff --git a/app/client/live/live.reducer.js b/app/client/live/live.reducer.js
index 810f84c..2472594 100644
--- a/app/client/live/live.reducer.js
+++ b/app/client/live/live.reducer.js
@@ -5,7 +5,11 @@ import types from '../types'
const liveInitialState = {
loading: false,
error: null,
- opt: { hue: 0, saturation: 0, luminosity: 0, sequence_step: 1, recurse_roll: 0, rotate: 0, scale: 0, process_frac: 0.5 },
+ opt: {
+ hue: 0, saturation: 0, luminosity: 0,
+ sequence_playing: true, sequence_step: 1,
+ recurse_roll: 0, rotate: 0, scale: 0, process_frac: 0.5
+ },
checkpoints: [],
epochs: ['latest'],
sequences: [],
diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
index aea1ec6..05a8acf 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
@@ -3,7 +3,7 @@ import { bindActionCreators } from 'redux'
import { connect } from 'react-redux'
import {
- ParamGroup, Param, Player,
+ ParamGroup, Param, Player, Group,
Slider, Select, TextInput, Button, Loading
} from '../../../common/'
@@ -102,7 +102,7 @@ class Pix2PixHDLive extends Component {
return <Loading />
}
return (
- <div className='app centered'>
+ <div className='app live centered'>
<Player width={424} height={256} fullscreen={this.props.fullscreen} />
<div className='params row'>
<div className='column'>
@@ -135,6 +135,7 @@ class Pix2PixHDLive extends Component {
onChange={this.changeEpoch}
/>
</ParamGroup>
+ <div>
<ParamGroup
title='Playback'
name='sequence_playing'
@@ -153,11 +154,15 @@ class Pix2PixHDLive extends Component {
name='frame_delay'
min={0.0} max={2.0} type='float'
/>
+ </ParamGroup>
+ </div>
+ <Group
+ >
{this.renderRestartButton()}
{this.renderLiveButtons()}
{this.renderRecordButton()}
<p class='last_message'>{this.props.last_message}</p>
- </ParamGroup>
+ </Group>
</div>
<div className='column'>
<ParamGroup