From 619fad9e4b508c968b3f9fb7f529bb5ee1539ca1 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 27 Jan 2011 14:18:11 -0500 Subject: [PATCH] -formatting --- public/js/playlist/playlist.js | 206 ++++++++++++++++----------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index 02e5934d6..60dc91172 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -25,36 +25,36 @@ var nextSongPrepare = true; /* Another script can register its function here * when it wishes to know when a song ends. */ function registerSongEndListener(func){ - songEndFunc = func; + songEndFunc = func; } function notifySongEndListener(){ if (typeof songEndFunc == "function"){ //create a slight pause in execution to allow the browser - //to update the display. - setTimeout(songEndFunc, 50); - } + //to update the display. + setTimeout(songEndFunc, 50); + } } function getTrackInfo(song){ - var str = ""; - - if (song.track_title != null) - str += song.track_title; - if (song.artist_name != null) - str += " - " + song.artist_name; - //if (song.album_title != null) - //str += " - " + song.album_title; - - str += "," - - return str; + var str = ""; + + if (song.track_title != null) + str += song.track_title; + if (song.artist_name != null) + str += " - " + song.artist_name; + //if (song.album_title != null) + //str += " - " + song.album_title; + + str += "," + + return str; } function secondsTimer(){ - var date = new Date(); - estimatedSchedulePosixTime = date.getTime() - localRemoteTimeOffset; - updateProgressBarValue(); + var date = new Date(); + estimatedSchedulePosixTime = date.getTime() - localRemoteTimeOffset; + updateProgressBarValue(); } function updateGlobalValues(obj){ @@ -65,35 +65,35 @@ function updateGlobalValues(obj){ function newSongStart(){ nextSongPrepare = true; - currentSong[0] = nextSongs.shift(); + currentSong[0] = nextSongs.shift(); updateGlobalValues(currentSong[0]); updatePlaybar(); - + notifySongEndListener(); } /* Called every "uiUpdateInterval" mseconds. */ function updateProgressBarValue(){ - if (estimatedSchedulePosixTime != -1){ + if (estimatedSchedulePosixTime != -1){ if (showStartPosixTime != 0){ var showPercentDone = (estimatedSchedulePosixTime - showStartPosixTime)/showLengthMs*100; if (showPercentDone < 0 || showPercentDone > 100){ showPercentDone = 0; - $('#on-air-info').attr("class", "on-air-info off"); + $('#on-air-info').attr("class", "on-air-info off"); } else { - $('#on-air-info').attr("class", "on-air-info on"); - } - $('#progress-show').attr("style", "width:"+showPercentDone+"%"); + $('#on-air-info').attr("class", "on-air-info on"); + } + $('#progress-show').attr("style", "width:"+showPercentDone+"%"); } var songPercentDone = 0; - if (currentSong.length > 0){ - songPercentDone = (estimatedSchedulePosixTime - currentSong[0].songStartPosixTime)/currentSong[0].songLengthMs*100; - if (songPercentDone < 0 || songPercentDone > 100){ - songPercentDone = 0; + if (currentSong.length > 0){ + songPercentDone = (estimatedSchedulePosixTime - currentSong[0].songStartPosixTime)/currentSong[0].songLengthMs*100; + if (songPercentDone < 0 || songPercentDone > 100){ + songPercentDone = 0; currentSong = new Array(); - } - } + } + } $('#progress-bar').attr("style", "width:"+songPercentDone+"%"); //calculate how much time left to next song if there is any @@ -103,31 +103,31 @@ function updateProgressBarValue(){ setTimeout(newSongStart, nextSongs[0].songStartPosixTime - estimatedSchedulePosixTime); } } - - updatePlaybar(); - } - setTimeout(secondsTimer, uiUpdateInterval); + + updatePlaybar(); + } + setTimeout(secondsTimer, uiUpdateInterval); } function updatePlaybar(){ - /* Column 0 update */ + /* Column 0 update */ $('#previous').text("Prev Song: N/A"); $('#prev-length').text("n/a,"); $('#current').text("Current Song: N/A"); $('#next').text("Next Song: N/A"); $('#next-length').empty(); - if (previousSongs.length > 0){ - $('#previous').text(getTrackInfo(previousSongs[previousSongs.length-1])); - $('#prev-length').text(convertToHHMMSSmm(previousSongs[previousSongs.length-1].songLengthMs)); - } - if (currentSong.length > 0){ - $('#current').text(getTrackInfo(currentSong[0])); - } - if (nextSongs.length > 0){ - $('#next').text(getTrackInfo(nextSongs[0])); - $('#next-length').text(convertToHHMMSSmm(nextSongs[0].songLengthMs)); - } - + if (previousSongs.length > 0){ + $('#previous').text(getTrackInfo(previousSongs[previousSongs.length-1])); + $('#prev-length').text(convertToHHMMSSmm(previousSongs[previousSongs.length-1].songLengthMs)); + } + if (currentSong.length > 0){ + $('#current').text(getTrackInfo(currentSong[0])); + } + if (nextSongs.length > 0){ + $('#next').text(getTrackInfo(nextSongs[0])); + $('#next-length').text(convertToHHMMSSmm(nextSongs[0].songLengthMs)); + } + $('#start').empty(); $('#end').empty(); $('#time-elapsed').empty(); @@ -135,39 +135,39 @@ function updatePlaybar(){ $('#song-length').empty(); $('#showposition').empty(); $('#showlength').empty(); - for (var i=0; i