Skip to content
Snippets Groups Projects
Commit a8e87893 authored by ale's avatar ale
Browse files

Merge branch 'master' of git.autistici.org:djrandom

parents 091a7cdb 6d17646d
No related branches found
No related tags found
No related merge requests found
......@@ -17,4 +17,4 @@ b);d.removeChunk(b)});e.find(".chunk_inner .song").hover(function(){$(this).find
djr.Player.prototype.play=function(a){djr.debug("play "+a);this.cur_song&&(this.old_songs.push(this.cur_song),this.old_songs.length>5&&this.old_songs.shift());this.cur_song=a;$(".song").removeClass("playing");$("#song_"+a).addClass("playing");this.player.jPlayer("setMedia",{mp3:"/dl/"+a}).jPlayer("play");var b=$("#song_"+a+" .artist").text(),c=$("#song_"+a+" .album").text();$("#jp_playlist_1").html($("#song_"+a+" .title").text()+"<br>"+b+"<br><small>"+c+"</small>");b="/album_image/"+escape(b)+"/"+
escape(c);$("#albumart_fs").attr("src",b);$("#albumart_fs").fullBg();$("#albumart_fs").show();this.backend.nowPlaying(a,this.old_songs)};djr.Player.prototype.nextSong=function(){this.play(this.playlist.getNextSong(this.cur_song))};djr.Player.prototype.streamCurrentPlaylist=function(){};djr.state={backend:null,player:null};
djr.init=function(){djr.state.backend=new djr.Backend;djr.state.player=new djr.Player(djr.state.backend,"#djr_player");$("#playlistClearBtn").click(function(){djr.state.player.clearPlaylist()});$("#playlistStreamBtn").click(function(){djr.state.player.streamCurrentPlaylist()});$("#playlistExtendBtn").click(function(){djr.state.player.extendCurrentPlaylist()});$("#playlistLast25").click(function(){djr.state.player.lastPlaylist(25)});$("#playlistRandom").click(function(){djr.state.player.randomPlaylist(25)});
$("#playlistMost").click(function(){djr.state.player.mostPlayedPlaylist()});$("#albumart_fs").load(function(){$(this).fullBg();$(this).show()})};djr.player=function(){return djr.state.player};djr.debug=function(a){$("#debug").append(a+"<br>")};
$("#playlistMost").click(function(){djr.state.player.mostPlayedPlaylist(25)});$("#albumart_fs").load(function(){$(this).fullBg();$(this).show()})};djr.player=function(){return djr.state.player};djr.debug=function(a){$("#debug").append(a+"<br>")};
......@@ -307,7 +307,7 @@ djr.init = function () {
djr.state.player.randomPlaylist(25);
});
$('#playlistMost').click(function() {
djr.state.player.mostPlayedPlaylist();
djr.state.player.mostPlayedPlaylist(25);
});
// Set the album art image to auto-fullscreen on load.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment