--- ./relaxx/js/src/functions.js	2008-07-06 23:03:53.000000000 +0300
+++ /var/www/music/js/src/functions.js	2008-08-19 23:51:04.000000000 +0300
@@ -588,30 +588,30 @@ function addStream() {;
 function setPlayerStatus(plStatus, reset) {
 	if ((plStatus.songid!=oldStatus.songid) || (!oldStatus.songid)) {
 	  if (plStatus.playlistlength==0) { // No track
-	  	$('trackinfo').innerHTML = language.error_notracks;
-	  }	else {
+	  	$('trackinfo').value = language.error_notracks;
+	  } else {
 		if ($('pl'+plStatus.song)){
   		   // update "Now Playing" display
 		   plTrack = $('pl'+plStatus.song).childNodes;
-		   trInfo = "# "+plStatus.song+" ... "+language.artist+": "+plTrack[1].innerHTML+ " ... " + language.title+": "+plTrack[2].innerHTML + " ... " + language.album+": "+plTrack[3].innerHTML + "... "
-		   $('trackinfo').innerHTML = trInfo;
+		   trInfo = "# "+plStatus.song+" - "+plTrack[1].innerHTML+ " - "+plTrack[2].innerHTML;
+		   $('trackinfo').value = trInfo;
 		}  else {
-			$('trackinfo').innerHTML = language.error_notracks;
+			$('trackinfo').value = language.error_notracks;
+		}
+		// remove active song mark
+		if ($('pl'+oldStatus.song)){
+		    $('pl'+oldStatus.song).className = $('pl'+oldStatus.song).className.replace(' playing', '');
+		    $('pl'+oldStatus.song).childNodes[0].className = '';
 		}
-         // remove active song mark
-         if ($('pl'+oldStatus.song)){
-		        $('pl'+oldStatus.song).className = $('pl'+oldStatus.song).className.replace(' playing', '');
-		        $('pl'+oldStatus.song).childNodes[0].className = '';
-     	}
 		// mark active song in playlist
 		if ($('pl'+plStatus.song)){
  		    $('pl'+plStatus.song).className +=' playing';
 		    $('pl'+plStatus.song).childNodes[0].className = 'playing';
+		    // scroll to current song
+		    pos = $('pl'+plStatus.song).getPosition().y;
+		    $$('#plTable tbody').scrollTo(0,pos-100); 
 		}
 	  }
-	  //Reset marquee
-	  $('trackinfo').direction='right';
-	  $('trackinfo').direction='left'
 	}
 
 	// Toggle play button