summaryrefslogtreecommitdiff
path: root/app/client
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-05-22 17:06:04 +0200
committerJules Laplace <julescarbon@gmail.com>2018-05-22 17:06:04 +0200
commit7997f17a8d59a762cb2a26ca96b67822446342d7 (patch)
treef203e544b0e558b277f1ea458dd8e6b81f829cb8 /app/client
parent0a2bc7f1bf214b2099c1f8139a67288c10249565 (diff)
move player component
Diffstat (limited to 'app/client')
-rw-r--r--app/client/common/player.component.js (renamed from app/client/live/components/player.component.js)2
-rw-r--r--app/client/index.jsx1
-rw-r--r--app/client/live/index.js6
3 files changed, 4 insertions, 5 deletions
diff --git a/app/client/live/components/player.component.js b/app/client/common/player.component.js
index 42776ac..6b3d56f 100644
--- a/app/client/live/components/player.component.js
+++ b/app/client/common/player.component.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
function Player(props) {
return (
<div className='player'>
- <canvas width='424' height='256' />
+ <canvas width={props.width} height={props.height} />
</div>
)
}
diff --git a/app/client/index.jsx b/app/client/index.jsx
index 8cf0ecd..d30c73f 100644
--- a/app/client/index.jsx
+++ b/app/client/index.jsx
@@ -1,6 +1,5 @@
import { h, render } from 'preact'
import { Provider } from 'react-redux'
-// import { } from 'react-router-redux'
import { BrowserRouter, Route } from 'react-router-dom'
// import client from './client'
diff --git a/app/client/live/index.js b/app/client/live/index.js
index 462d75d..94af289 100644
--- a/app/client/live/index.js
+++ b/app/client/live/index.js
@@ -2,7 +2,7 @@ import { h, Component } from 'preact'
import { bindActionCreators } from 'redux'
import { connect } from 'react-redux'
-import Player from './components/player.component'
+import Player from '../common/player.component'
import ParamGroup from '../common/paramGroup.component'
import Slider from '../common/slider.component'
import Select from '../common/select.component'
@@ -54,7 +54,7 @@ class App extends Component {
toggleRecording(){
if (this.props.opt.recording){
stopRecording()
- this.props.actions.pause()
+ this.props.actions.pause()
} else {
startRecording()
}
@@ -62,7 +62,7 @@ class App extends Component {
render(){
return (
<div className='app'>
- <Player />
+ <Player width={424} height={256} />
<div className='params'>
<div className='column'>
<ParamGroup