Skip to content
Snippets Groups Projects
Commit b34e1c69 authored by Eric Rosenbaum's avatar Eric Rosenbaum
Browse files

Cleanup and connect trim button to delete

parent 64562a8a
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,8 @@ import styles from './sound-editor.css'; ...@@ -15,6 +15,8 @@ import styles from './sound-editor.css';
import playIcon from '../record-modal/icon--play.svg'; import playIcon from '../record-modal/icon--play.svg';
import stopIcon from '../record-modal/icon--stop-playback.svg'; import stopIcon from '../record-modal/icon--stop-playback.svg';
import trimIcon from './icon--trim.svg';
import trimConfirmIcon from './icon--trim-confirm.svg';
import redoIcon from './icon--redo.svg'; import redoIcon from './icon--redo.svg';
import undoIcon from './icon--undo.svg'; import undoIcon from './icon--undo.svg';
import echoIcon from './icon--echo.svg'; import echoIcon from './icon--echo.svg';
...@@ -251,6 +253,7 @@ SoundEditor.propTypes = { ...@@ -251,6 +253,7 @@ SoundEditor.propTypes = {
chunkLevels: PropTypes.arrayOf(PropTypes.number).isRequired, chunkLevels: PropTypes.arrayOf(PropTypes.number).isRequired,
intl: intlShape, intl: intlShape,
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
onActivateTrim: PropTypes.func.isRequired,
onChangeName: PropTypes.func.isRequired, onChangeName: PropTypes.func.isRequired,
onContainerClick: PropTypes.func.isRequired, onContainerClick: PropTypes.func.isRequired,
onEcho: PropTypes.func.isRequired, onEcho: PropTypes.func.isRequired,
......
...@@ -28,7 +28,7 @@ class SoundEditor extends React.Component { ...@@ -28,7 +28,7 @@ class SoundEditor extends React.Component {
'handleEffect', 'handleEffect',
'handleUndo', 'handleUndo',
'handleRedo', 'handleRedo',
'submitNewSamples' 'submitNewSamples',
'handleContainerClick', 'handleContainerClick',
'setRef' 'setRef'
]); ]);
...@@ -153,11 +153,6 @@ class SoundEditor extends React.Component { ...@@ -153,11 +153,6 @@ class SoundEditor extends React.Component {
trimEnd: null trimEnd: null
}); });
} }
handleUpdateTrimEnd (trimEnd) {
this.setState({trimEnd});
}
handleUpdateTrimStart (trimStart) {
this.setState({trimStart});
handleUpdateTrim (trimStart, trimEnd) { handleUpdateTrim (trimStart, trimEnd) {
this.setState({trimStart, trimEnd}); this.setState({trimStart, trimEnd});
this.handleStopPlaying(); this.handleStopPlaying();
...@@ -195,6 +190,8 @@ class SoundEditor extends React.Component { ...@@ -195,6 +190,8 @@ class SoundEditor extends React.Component {
this.undoStack.push(this.copyCurrentBuffer()); this.undoStack.push(this.copyCurrentBuffer());
this.submitNewSamples(samples, sampleRate, true); this.submitNewSamples(samples, sampleRate, true);
this.handlePlay(); this.handlePlay();
}
}
setRef (element) { setRef (element) {
this.ref = element; this.ref = element;
} }
...@@ -216,6 +213,7 @@ class SoundEditor extends React.Component { ...@@ -216,6 +213,7 @@ class SoundEditor extends React.Component {
setRef={this.setRef} setRef={this.setRef}
trimEnd={this.state.trimEnd} trimEnd={this.state.trimEnd}
trimStart={this.state.trimStart} trimStart={this.state.trimStart}
onActivateTrim={this.handleDelete}
onChangeName={this.handleChangeName} onChangeName={this.handleChangeName}
onContainerClick={this.handleContainerClick} onContainerClick={this.handleContainerClick}
onDelete={this.handleDelete} onDelete={this.handleDelete}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment