Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports from es5 #1191

Merged
merged 16 commits into from
Aug 19, 2017
Merged

Ports from es5 #1191

merged 16 commits into from
Aug 19, 2017

Conversation

mspae
Copy link
Contributor

@mspae mspae commented Aug 18, 2017

Adds features and fixes that were added to the es5 branch (previously master) to the new master (previously next).

See #1092

entonbiba and others added 16 commits August 18, 2017 17:09
* fixes safari browser missing buffer when using webaudio

* return correct buffer

* set samples to 4096

* add safari comment
* Join ends of peaks

I'm not entirely sure that the peaks are joined at the ends. When I zoomed all the way in, it seemed that there were gaps...

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js
refs katspaugh#1127

Before katspaugh#909, calling `drawBuffer` to redraw the wave invoked
`drawer.drawPeaks` which in turn invoked `drawer.setWidth` which
always caused the canvas to be cleared as a side effect of
`drawer.updateSize`.

In katspaugh#909 `setWidth` was changed to short circuit if the width did not
change. This now causes the waveform to be redrawn on top of the
previous rendition, making the edges of the wave appear less crisp.

This change makes `setWidth`/`setHeight` return a boolean to indicate
whether changes were needed. If not, `drawer.clearWave` is called
manually. So we make sure that the previous wave is always cleared,
but do not perform the possibly performance intensive task of clearing
the canvas twice if it already happened as a side effect of
`setWidth`.
* requestAnimationFrame addition to utils.

* Update util.js

* Update util.js

* Update util.js

* Update util.js

* Update util.js
* Update drawer.multicanvas.js

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js

* I have no idea why this failed.

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js
* Remove pointer events from the left and right sides of the wave and change `zIndex` to 2.

The reasoning behind this is to allow, for example, the region plugin to have a styling such that the regions are below the waves (so that the waves look clearer and not blended with the regions), while still allowing resize events on the regions. Otherwise, the left/right sections of the wave block the resize elements of the regions, since their `zIndex` needs to be necessarily higher to be drawn over the regions.
…#1104)

* Listen to and relay play and pause events on media element

* Corrected the 'pause' event label

* removed play and pause emits from respective functions
timeline plugin: Round to milliseconds
* add getPeaks background compatibility

* remove space

* add space
* Create LICENSE

Adding the BSD license.

* Change all references to CC license to point to the new BSD license

* Extend the license through the examples directory
Time labels overlaps occur if the duration of audio is more than a few hours.
@katspaugh
Copy link
Owner

katspaugh commented Aug 18, 2017

Thank you so much!

I've changed the repo settings so that we can do a merge without squash for this PR. Ah, never mind, the Rebase & Merge button was already enabled.

@katspaugh katspaugh self-requested a review August 18, 2017 18:57
@mspae mspae merged commit 6de8dcc into katspaugh:master Aug 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants