fix visualizer mobile issues
This commit is contained in:
parent
bc204e333a
commit
7a3ad95d60
GPG Key ID:
1688DA83D222D0B5
|
|
@ -63,6 +63,10 @@
|
|||
var user = {}
|
||||
var scrobbleTimeout
|
||||
|
||||
// Analyser
|
||||
window.resumeAnalyzer = function () {}
|
||||
|
||||
// Mobile specific information
|
||||
window.mobilecheck = function() {
|
||||
var check = false;
|
||||
(function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
|
||||
|
|
@ -70,25 +74,6 @@
|
|||
}
|
||||
window.isMobile = window.mobilecheck()
|
||||
|
||||
// Context bullshit
|
||||
let playerContext = []
|
||||
|
||||
window.resumeAudioContexts = function () {
|
||||
for (let i in playerContext) {
|
||||
let ctx = playerContext[i]
|
||||
if (ctx && ctx.resume) {
|
||||
ctx.resume().catch(function (e) {
|
||||
console.error(e)
|
||||
alert('Failed to play:', e.message)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
window.attachAudioContext = function (ctx) {
|
||||
playerContext.push(ctx)
|
||||
}
|
||||
|
||||
// Seconds into HH:MM:SS
|
||||
function toHHMMSS (numbr) {
|
||||
let secNum = parseInt(numbr, 10) // don't forget the second param
|
||||
|
|
@ -195,9 +180,9 @@
|
|||
posx = e.pageX
|
||||
posy = e.pageY
|
||||
} else if (e.clientX || e.clientY) {
|
||||
posx = e.clientX + document.body.scrollLeft +
|
||||
posx = e.clientX + document.body.scrollLeft +
|
||||
document.documentElement.scrollLeft
|
||||
posy = e.clientY + document.body.scrollTop +
|
||||
posy = e.clientY + document.body.scrollTop +
|
||||
document.documentElement.scrollTop
|
||||
}
|
||||
|
||||
|
|
@ -598,7 +583,7 @@
|
|||
playing.innerHTML = title
|
||||
document.title = title
|
||||
|
||||
window.resumeAudioContexts()
|
||||
window.resumeAnalyzer()
|
||||
|
||||
externalStream = (data.external === true)
|
||||
audio.src = data.play_url || ('/api/serve/by-id/' + id)
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
var volBar = document.querySelector('#player-volbar .seek-inner')
|
||||
var volElem = document.querySelector('.volume')
|
||||
|
||||
var playerContext = []
|
||||
|
||||
// Seconds into HH:MM:SS
|
||||
function toHHMMSS (numbr) {
|
||||
let secNum = parseInt(numbr, 10) // don't forget the second param
|
||||
|
|
@ -170,7 +168,7 @@
|
|||
audio.addEventListener('stop', togglePlayButton, false)
|
||||
|
||||
play.addEventListener('click', function (e) {
|
||||
window.resumeAudioContexts()
|
||||
window.resumeAnalyzer()
|
||||
if (audio.paused) {
|
||||
audio.play()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,38 @@
|
|||
var audio = document.querySelector('#player')
|
||||
var canvas = document.querySelector('#visualizer')
|
||||
var playbar = document.querySelector('.playing-bar')
|
||||
|
||||
var context = new AudioContext()
|
||||
var src = context.createMediaElementSource(audio)
|
||||
var analyser = context.createAnalyser()
|
||||
|
||||
var ctx = canvas.getContext('2d')
|
||||
|
||||
var context
|
||||
var src
|
||||
var analyser
|
||||
|
||||
var bufferLength
|
||||
|
||||
var dataArray
|
||||
|
||||
var barHeight
|
||||
var x = 0
|
||||
|
||||
function start () {
|
||||
context = new AudioContext()
|
||||
src = context.createMediaElementSource(audio)
|
||||
analyser = context.createAnalyser()
|
||||
|
||||
src.connect(analyser)
|
||||
analyser.connect(context.destination)
|
||||
|
||||
analyser.fftSize = 256
|
||||
bufferLength = analyser.frequencyBinCount
|
||||
dataArray = new Uint8Array(bufferLength)
|
||||
|
||||
if (!analyser.getByteFrequencyData) {
|
||||
console.error('This browser sucks. No visualizer for you :(')
|
||||
return
|
||||
}
|
||||
renderFrame()
|
||||
}
|
||||
|
||||
var WIDTH = canvas.width
|
||||
var HEIGHT = canvas.height
|
||||
|
||||
|
|
@ -22,18 +47,6 @@
|
|||
HEIGHT = canvas.height
|
||||
}
|
||||
|
||||
src.connect(analyser)
|
||||
analyser.connect(context.destination)
|
||||
|
||||
analyser.fftSize = 256
|
||||
|
||||
var bufferLength = analyser.frequencyBinCount
|
||||
|
||||
var dataArray = new Uint8Array(bufferLength)
|
||||
|
||||
var barHeight
|
||||
var x = 0
|
||||
|
||||
function renderFrame () {
|
||||
requestAnimationFrame(renderFrame)
|
||||
barWidth = (WIDTH / bufferLength) * 2.5
|
||||
|
|
@ -51,7 +64,7 @@
|
|||
var g = barHeight + (i / bufferLength)
|
||||
var b = 250 * (i / bufferLength)
|
||||
|
||||
let realAdjusted = barHeight * (HEIGHT / analyser.fftSize)
|
||||
const realAdjusted = barHeight * (HEIGHT / analyser.fftSize)
|
||||
|
||||
ctx.fillStyle = 'rgb(' + r + ',' + g + ',' + b + ')'
|
||||
ctx.fillRect(x, HEIGHT - realAdjusted, barWidth, realAdjusted)
|
||||
|
|
@ -60,10 +73,11 @@
|
|||
}
|
||||
}
|
||||
|
||||
renderFrame()
|
||||
|
||||
window.addEventListener('resize', convenientSizer)
|
||||
window.attachAudioContext(context)
|
||||
window.resumeAnalyzer = function () {
|
||||
if (!context) start()
|
||||
return context
|
||||
}
|
||||
|
||||
convenientSizer()
|
||||
})()
|
||||
|
|
|
|||
Loading…
Reference in New Issue