summaryrefslogtreecommitdiff
path: root/app/client/modules
diff options
context:
space:
mode:
Diffstat (limited to 'app/client/modules')
-rw-r--r--app/client/modules/samplernn/samplernn.datasets.js4
-rw-r--r--app/client/modules/samplernn/samplernn.show.js11
2 files changed, 14 insertions, 1 deletions
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 08f43c2..d29cf6a 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -83,7 +83,7 @@ class SampleRNNDatasets extends Component {
)
}
renderGroups(){
- const { samplernn, onPickDataset, actions } = this.props
+ const { samplernn, onPickDataset, onPickFile, actions } = this.props
const folder = samplernn.folder
const { mapFn, sortFn } = util.sort.orderByFn('date desc')
const datasets = folder.datasets.map(mapFn).sort(sortFn).map(pair => {
@@ -99,6 +99,7 @@ class SampleRNNDatasets extends Component {
fileListClassName=''
rowClassName='input_file'
options={this.fileOptions}
+ onClick={onPickFile}
/>
}
</div>
@@ -127,6 +128,7 @@ class SampleRNNDatasets extends Component {
files={dataset.output}
orderBy='epoch desc'
fields={'name date epoch size'}
+ onPickFile={onPickFile}
/>
}
</div>
diff --git a/app/client/modules/samplernn/samplernn.show.js b/app/client/modules/samplernn/samplernn.show.js
index 8e271fc..2d27b8d 100644
--- a/app/client/modules/samplernn/samplernn.show.js
+++ b/app/client/modules/samplernn/samplernn.show.js
@@ -4,6 +4,7 @@ import { connect } from 'react-redux'
import * as util from '../../util'
import * as samplernnActions from './samplernn.actions'
+import * as audioPlayerActions from '../../common/audioPlayer/audioPlayer.actions'
import DatasetForm from '../../dataset/dataset.form'
import NewDatasetForm from '../../dataset/dataset.new'
@@ -35,10 +36,19 @@ class SampleRNNShow extends Component {
}
<SampleRNNDatasets
id={this.props.match.params.id || localStorage.getItem('samplernn.last_id')}
+ onPickFile={(file, e) => {
+ e.preventDefault()
+ e.stopPropagation()
+ console.log('picked a file', file)
+ this.handlePick(file)
+ }}
/>
</div>
)
}
+ handlePick(file){
+ this.props.audioPlayer.play(file)
+ }
}
const mapStateToProps = state => ({
@@ -48,6 +58,7 @@ const mapStateToProps = state => ({
const mapDispatchToProps = (dispatch, ownProps) => ({
actions: bindActionCreators(samplernnActions, dispatch),
+ audioPlayer: bindActionCreators(audioPlayerActions, dispatch),
})
export default connect(mapStateToProps, mapDispatchToProps)(SampleRNNShow)