0
0
Fork 0

Fix more visual issues with the audio player (#11654)

* Fix more visual issues with the audio player

- Add horizontal baseline in the middle of waveform
- Fix audio player colors in light theme
- Use audio element instead of web audio API
- Do not render any bars until the file is loaded
- Do not allow interactions with waveform until the file is loaded

* Fix code style issue
This commit is contained in:
Eugen Rochko 2019-08-25 15:09:19 +02:00 committed by GitHub
parent e72bac7576
commit 2e99e3cab3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 8 deletions

View file

@ -362,7 +362,8 @@ class Status extends ImmutablePureComponent {
src={attachment.get('url')}
alt={attachment.get('description')}
duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
height={110}
peaks={[0]}
height={70}
/>
)}
</Bundle>

View file

@ -14,8 +14,6 @@ const messages = defineMessages({
unmute: { id: 'video.unmute', defaultMessage: 'Unmute sound' },
});
const arrayOf = (length, fill) => (new Array(length)).fill(fill);
export default @injectIntl
class Audio extends React.PureComponent {
@ -23,6 +21,7 @@ class Audio extends React.PureComponent {
src: PropTypes.string.isRequired,
alt: PropTypes.string,
duration: PropTypes.number,
peaks: PropTypes.arrayOf(PropTypes.number),
height: PropTypes.number,
preload: PropTypes.bool,
editable: PropTypes.bool,
@ -77,7 +76,7 @@ class Audio extends React.PureComponent {
}
_updateWaveform () {
const { src, height, duration, preload } = this.props;
const { src, height, duration, peaks, preload } = this.props;
const progressColor = window.getComputedStyle(document.querySelector('.audio-player__progress-placeholder')).getPropertyValue('background-color');
const waveColor = window.getComputedStyle(document.querySelector('.audio-player__wave-placeholder')).getPropertyValue('background-color');
@ -94,7 +93,8 @@ class Audio extends React.PureComponent {
cursorWidth: 0,
progressColor,
waveColor,
forceDecode: true,
backend: 'MediaElement',
interact: preload,
});
wavesurfer.setVolume(this.state.volume);
@ -103,7 +103,7 @@ class Audio extends React.PureComponent {
wavesurfer.load(src);
this.loaded = true;
} else {
wavesurfer.load(src, arrayOf(1, 0.5), null, duration);
wavesurfer.load(src, peaks, 'none', duration);
this.loaded = false;
}
@ -123,6 +123,7 @@ class Audio extends React.PureComponent {
this.wavesurfer.createBackend();
this.wavesurfer.createPeakCache();
this.wavesurfer.load(this.props.src);
this.wavesurfer.toggleInteraction();
this.loaded = true;
}

View file

@ -116,7 +116,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
src={attachment.get('url')}
alt={attachment.get('description')}
duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
height={150}
height={110}
preload
/>
);