Skip to content

Commit 45cb96f

Browse files
authored
Revert "Limit louder effect with a max RMS"
1 parent ab0d58e commit 45cb96f

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

src/components/sound-editor/sound-editor.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ const SoundEditor = props => (
265265
onClick={props.onSlower}
266266
/>
267267
<IconButton
268-
disabled={props.tooLoud}
269268
className={classNames(styles.effectButton, styles.flipInRtl)}
270269
img={louderIcon}
271270
title={<FormattedMessage {...messages.louder} />}
@@ -341,7 +340,6 @@ SoundEditor.propTypes = {
341340
onUndo: PropTypes.func.isRequired,
342341
playhead: PropTypes.number,
343342
setRef: PropTypes.func,
344-
tooLoud: PropTypes.bool.isRequired,
345343
trimEnd: PropTypes.number,
346344
trimStart: PropTypes.number
347345
};

src/containers/sound-editor.jsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import log from '../lib/log.js';
1414

1515
const UNDO_STACK_SIZE = 99;
1616

17-
const MAX_RMS = 1.2;
18-
1917
class SoundEditor extends React.Component {
2018
constructor (props) {
2119
super(props);
@@ -267,15 +265,6 @@ class SoundEditor extends React.Component {
267265
}
268266
});
269267
}
270-
tooLoud () {
271-
const numChunks = this.state.chunkLevels.length;
272-
const startIndex = this.state.trimStart === null ?
273-
0 : Math.floor(this.state.trimStart * numChunks);
274-
const endIndex = this.state.trimEnd === null ?
275-
numChunks - 1 : Math.ceil(this.state.trimEnd * numChunks);
276-
const trimChunks = this.state.chunkLevels.slice(startIndex, endIndex);
277-
return Math.max(...trimChunks) > MAX_RMS;
278-
}
279268
getUndoItem () {
280269
return {
281270
...this.copyCurrentBuffer(),
@@ -410,7 +399,6 @@ class SoundEditor extends React.Component {
410399
name={this.props.name}
411400
playhead={this.state.playhead}
412401
setRef={this.setRef}
413-
tooLoud={this.tooLoud()}
414402
trimEnd={this.state.trimEnd}
415403
trimStart={this.state.trimStart}
416404
onChangeName={this.handleChangeName}

src/lib/audio/effects/volume-effect.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,8 @@ class VolumeEffect {
1414
this.gain.gain.setValueAtTime(volume, endSeconds);
1515
this.gain.gain.exponentialRampToValueAtTime(1.0, endSeconds + this.rampLength);
1616

17-
// Use a waveshaper node to prevent sample values from exceeding -1 or 1.
18-
// Without this, gain can cause samples to exceed this range, then they
19-
// are clipped on save, and the sound is distorted on load.
20-
this.waveShaper = this.audioContext.createWaveShaper();
21-
this.waveShaper.curve = new Float32Array([-1, 1]);
22-
this.waveShaper.oversample = 'none';
23-
2417
this.input.connect(this.gain);
25-
this.gain.connect(this.waveShaper);
26-
this.waveShaper.connect(this.output);
18+
this.gain.connect(this.output);
2719
}
2820
}
2921

0 commit comments

Comments
 (0)