danbarber/neompc
1
0
Fork 0
mirror of https://github.com/danbee/neompc synced 2025-03-04 08:39:10 +00:00
Code Issues Releases Wiki Activity

+ Added track time display to the Control Page.

Browse Source
This commit is contained in:
Dan Barber 2007-05-16 14:27:56 +00:00
parent c3c17c1d3c
commit 5e5e2ea4bb
4 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/javascript.js
View File

@ -2,12 +2,40 @@
song_length = {$song_length};
song_position = {$song_position};
song_min = {$initialmin};
song_sec = {$initialsec};
mpd_state = '{$mpd_state}';
{literal}
update_int = null;
function format_time(number) {
if (number < 10) {
return '0' + number.toString();
}
else {
return number.toString();
}
}
function update_progress() {
//set the interval if it hasn't been set already.
if (update_int == null) {
update_int = setInterval('update_progress()', 1000);
}
if (song_position < song_length) {
song_position = song_position + 1;
song_sec = song_sec + 1;
if (song_sec >= 60) {
song_sec = 0;
song_min = song_min + 1
}
}
progressbar = document.getElementById('progressbar');
new_margin = Math.round(200 - ((song_position / song_length) * 200));
@ -15,17 +43,16 @@
new_margin_string = new_margin + 'px';
progressbar.style.marginRight = new_margin_string;
document.getElementById('min').innerHTML = format_time(song_min);
document.getElementById('sec').innerHTML = format_time(song_sec);
//alert(progressbar.style.marginRight + ' - ' + new_margin_string);
if (song_position < song_length) {
song_position = song_position + 1;
}
}
if (mpd_state == 'play') {
update_int = setInterval('update_progress()', 1000);
//start off with a shorter interval. this should make the whole thing a little more accurate.
setTimeout('update_progress()', 750);
}
{/literal}

6
lib/page.php
View File

@ -38,11 +38,15 @@
$smarty->assign('coversize', $_CONFIG['album_cover_size']);
}
$time_left = (($mympd->current_track_length - $mympd->current_track_position) + 2) * 1000;
$time_left = (($mympd->current_track_length - $mympd->current_track_position) + 1) * 1000;
$initialprogress = round(200 - (($mympd->current_track_position / $mympd->current_track_length) * 200));
$smarty->assign('initialprogress', $initialprogress);
$smarty->assign('initialmin', date('i', $mympd->current_track_position));
$smarty->assign('initialsec', date('s', $mympd->current_track_position));
$smarty->assign('totalmin', date('i', $mympd->current_track_length));
$smarty->assign('totalsec', date('s', $mympd->current_track_length));
//echo $time_left / 1000;

6
templates/default/control.html
View File

@ -1,7 +1,9 @@
<div id="controls"><a href="index.php?action=prev"><img src="images/prev_button.gif" Alt="Previous" /></a><a href="index.php?action=play"><img src="images/play_button.gif" Alt="Play" /></a><a href="index.php?action=pause"><img src="images/pause_button.gif" Alt="Pause" /></a><a href="index.php?action=stop"><img src="images/stop_button.gif" Alt="Stop" /></a><a href="index.php?action=next"><img src="images/next_button.gif" Alt="Next" /></a></div>
<div id="controls"><a href="index.php?action=prev"><img src="images/prev_button.gif" Alt="Previous" /></a><a href="index.php?action=play"><img src="images/play_button.gif" Alt="Play" /></a><a href="index.php?action=pause"><img src="images/pause_button.gif" Alt="Pause" /></a><a href="index.php?action=stop"><img src="images/stop_button.gif" Alt="Stop" /></a><a href="index.php?action=next"><img src="images/next_button.gif" Alt="Next" /></a></div>
<div id="song_display">{if $current_title}<span class="pos">{$current_track_no+1|string_format:"%02d"}.</span> <span class="title">{$current_title}</span><br /><span class="artist">{$current_artist}</span> {if $current_album}<!--<span class="album">({$current_album})</span>-->{/if}{elseif $current_file}{$current_file}{else}<br />[Nothing playing]{/if}</div>
{if $mpd_state == 'play' || $mpd_state == 'pause'}<div id="tracktime"><span id="min">{$initialmin}</span>:<span id="sec">{$initialsec}</span> <span id="total">({$totalmin}:{$totalsec})</span></div>{/if}
{if $mpd_state == 'play' || $mpd_state == 'pause'}<div id="progress"><div id="progressbar" style="margin-right: {$initialprogress}px;">&nbsp;</div></div>{/if}
{if $coverimage}<div id="cover_image"><img id="cover" title="{$current_album}" src="lib/image.php?file={$coverimage}&size={$coversize}" /></div>{/if}

6
templates/default/styles.css
View File

@ -157,5 +157,11 @@ img#cover {
border: 1px solid #666;
padding: 2px;
}
#tracktime {
font-weight: bold;
}
#tracktime #total {
color: #666;
}
{/literal}