Scrobbling to lastfm! w00t
This commit is contained in:
@@ -1,7 +1,10 @@
|
||||
var Audio = {
|
||||
|
||||
audio: null,
|
||||
|
||||
tid: null,
|
||||
tinterval: 300,
|
||||
ttime: 0,
|
||||
|
||||
play: function() {
|
||||
try {
|
||||
@@ -36,6 +39,7 @@ var Audio = {
|
||||
$('#player .controls .pause').hide();
|
||||
$('#player .controls .play').show();
|
||||
});
|
||||
this.ttime = 0;
|
||||
},
|
||||
|
||||
getLoadedPercent: function() {
|
||||
@@ -52,6 +56,16 @@ var Audio = {
|
||||
return 0;
|
||||
},
|
||||
|
||||
getListenedPercent: function() {
|
||||
try {
|
||||
if (Audio.audio.duration < 30) {
|
||||
return -1;
|
||||
}
|
||||
return Audio.ttime / 1000 / Audio.audio.duration;
|
||||
} catch(e) {}
|
||||
return 0;
|
||||
},
|
||||
|
||||
setPlayedPercent: function(val) {
|
||||
if (typeof(this.audio.duration) != undefined) {
|
||||
this.audio.currentTime = Math.round(val * this.audio.duration / 100);
|
||||
@@ -68,10 +82,18 @@ var Audio = {
|
||||
|
||||
startListener: function() {
|
||||
Audio.killListener();
|
||||
Audio.tid = window.setTimeout(Audio.startListener, 300);
|
||||
Audio.tid = window.setTimeout(Audio.startListener, Audio.tinterval);
|
||||
if (Audio.ttime !== -1) {
|
||||
Audio.ttime += Audio.tinterval;
|
||||
}
|
||||
var pp = Audio.getListenedPercent();
|
||||
if (pp > 0.4) {
|
||||
Audio.ttime = -1;
|
||||
}
|
||||
Player.updateUI(
|
||||
Audio.getLoadedPercent(),
|
||||
Audio.getPlayedPercent()
|
||||
Audio.getPlayedPercent(),
|
||||
pp
|
||||
);
|
||||
},
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ var Player = {
|
||||
$('#player .loaded, #player .played').width(0);
|
||||
|
||||
loadTracksData(tmp[0], tmp[1], length, Player.playSource);
|
||||
Player.updateNowListening(tmp[0], tmp[1]);
|
||||
},
|
||||
|
||||
playSource: function(url) {
|
||||
@@ -66,13 +67,17 @@ var Player = {
|
||||
}
|
||||
},
|
||||
|
||||
updateUI: function(buffered, played) {
|
||||
updateUI: function(buffered, played, listened) {
|
||||
$('#player .loaded').width(Math.round(buffered * this.bar_width));
|
||||
$('#player .played').width(Math.round(played * this.bar_width));
|
||||
if (played == 1) {
|
||||
Audio.killListener();
|
||||
Player.setTrack(Player.nextTrack());
|
||||
}
|
||||
if (listened > 0.4) {
|
||||
var tmp = $('#player .now-playing').text().split(' — ');
|
||||
Player.scrobble(tmp[0], tmp[1]);
|
||||
}
|
||||
},
|
||||
|
||||
reset: function() {
|
||||
@@ -80,6 +85,14 @@ var Player = {
|
||||
Audio.killListener();
|
||||
$('#player .loaded, #player .played').width(0);
|
||||
$('#player .now-playing').text('Select track');
|
||||
},
|
||||
|
||||
updateNowListening: function(artist, track) {
|
||||
Session.query('/lastfm/listening', {'artist': artist, 'track': track})
|
||||
},
|
||||
|
||||
scrobble: function(artist, track) {
|
||||
Session.query('/lastfm/scrobble', {'artist': artist, 'track': track})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user