From 9c6a5fc5787109a0dfe47caf9a3df9c72a2ff1fc Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Sat, 5 Jun 2010 14:46:52 +1200
Subject: [PATCH] Nicely working now with several small javascript widgets.

---
 inc/album-list.php           |  29 +++++++
 inc/artist-list.php          |  29 +++++++
 inc/daemonInterface.php      |  13 ++-
 inc/header.php               |  28 +------
 inc/home-header.php          |  94 ++++++++++++++++++++++
 inc/menu.php                 | 183 +++++++++++++++++++++++++++++++++++++------
 inc/mpdPlayer.php            |   6 +-
 inc/show-album.php           | 103 ++++++++++++++++++++++++
 inc/show-artist.php          | 101 ++++++++++++++++++++++++
 inc/stream-list.php          |  31 ++++++++
 inc/vlcPlayer.php            |   6 +-
 inc/xmms2Player.php          |   5 +-
 scripts/add_subtree.pl       |   2 +-
 scripts/xmmsosd.pl           | 156 ++++++++++++++++++++++++++++++++++++
 www/action.php               |  58 ++++++++++++++
 www/adorno.css               | 100 ++++++++++++++++++-----
 www/always.php               |  25 +++++-
 www/current.php              |  20 +++++
 www/img/stop.png             | Bin 0 -> 923 bytes
 www/index.php                |  24 +++---
 www/js/adorno.js             | 175 +++++++++++++++++++++++++++++++++++------
 www/{index.php => queue.php} |  39 ++++-----
 22 files changed, 1086 insertions(+), 141 deletions(-)
 create mode 100644 inc/album-list.php
 create mode 100644 inc/artist-list.php
 create mode 100644 inc/home-header.php
 create mode 100644 inc/show-album.php
 create mode 100644 inc/show-artist.php
 create mode 100644 inc/stream-list.php
 create mode 100755 scripts/xmmsosd.pl
 create mode 100644 www/action.php
 create mode 100644 www/current.php
 create mode 100644 www/img/stop.png
 rewrite www/js/adorno.js (97%)
 copy www/{index.php => queue.php} (70%)

diff --git a/inc/album-list.php b/inc/album-list.php
new file mode 100644
index 0000000..0f88a5a
--- /dev/null
+++ b/inc/album-list.php
@@ -0,0 +1,29 @@
+<?php
+/**
+* List albums
+*/
+echo "<h3>Albums</h3>\n<p>";
+$where = '';
+$params = array();
+if ( isset($search) ) {
+  $where = "(artist ~* :search OR album ~* :search OR title ~* :search OR path_name ~* :search) ";
+  $params[':search'] = $search;
+}
+if ( isset($altr) ) {
+  $altr = trim($altr);
+  $where .= ($where == ''? '' : ' AND ');
+  $where .= '(album ~ :album_match)';
+  $params[':album_match'] = '^'.$altr;
+}
+if ( $where != '' ) $where = 'WHERE '. $where;
+$sql = 'SELECT distinct ON (lower(album)) album FROM tracks '.$where.' ORDER BY lower(album)';
+$qry = new AwlQuery( $sql, $params );
+
+if ( $qry->Exec('album') && $qry->rows() > 0 ) {
+  while ( $album = $qry->Fetch() ) {
+    $display = htmlspecialchars($album->album);
+    if ( trim($display) == "" ) $display = "&laquo;unknown&raquo;";
+    echo " <a href=\"?type=album&l=" . urlencode($album->album) . "$letter_get\" class=\"album\">$display</a>\n";
+  }
+}
+
diff --git a/inc/artist-list.php b/inc/artist-list.php
new file mode 100644
index 0000000..d483e92
--- /dev/null
+++ b/inc/artist-list.php
@@ -0,0 +1,29 @@
+<?php
+/**
+* List artists
+*/
+echo "<h3>Artists</h3>\n<p>";
+$where = '';
+$params = array();
+if ( isset($search) ) {
+  $where = "(artist ~* :search OR album ~* :search OR title ~* :search OR path_name ~* :search) ";
+  $params[':search'] = $search;
+}
+if ( isset($altr) ) {
+  $altr = trim($altr);
+  $where .= ($where == ''? '' : ' AND ');
+  $where .= '(artist ~ :artist_match)';
+  $params[':artist_match'] = '^'.$altr;
+}
+if ( $where != '' ) $where = 'WHERE '. $where;
+$sql = 'SELECT distinct ON (lower(artist)) artist FROM tracks '.$where.' ORDER BY lower(artist)';
+$qry = new AwlQuery( $sql, $params );
+
+if ( $qry->Exec('artist') && $qry->rows() > 0 ) {
+  while ( $artist = $qry->Fetch() ) {
+    $display = htmlspecialchars($artist->artist);
+    if ( trim($display) == "" ) $display = "&laquo;unknown&raquo;";
+    echo " <a href=\"?type=artist&a=" . urlencode($artist->artist) . "$letter_get\" class=\"artist\">$display</a>\n";
+  }
+}
+
diff --git a/inc/daemonInterface.php b/inc/daemonInterface.php
index 30176b0..c284946 100644
--- a/inc/daemonInterface.php
+++ b/inc/daemonInterface.php
@@ -43,6 +43,7 @@ function current_track() {
   $qry = new AwlQuery( $query, $current_track->track );
   if ( $qry->Exec('current_track') && $qry->rows() > 0 ) {
     $track = $qry->Fetch();
+    $track->state = $current_track->state;
     return $track;
   }
   return;
@@ -73,20 +74,22 @@ function current_queue() {
 
   $queue_pos = array();
   $position = 0;
-  $in_list = "";
+  $in_list = '';
+  $params = array();
   foreach( $queue AS $k => $track ) {
-    $in_list .= ($position == 0 ? "" : ", ") . qpg($track);
+    $in_list .= ($position == 0 ? '' : ', ') . ':t'.$position;
+    $params[':t'.$position] = $track;
     $queue_pos[$track] = $position++;
   }
 
   $queue = array();
-  if ( $in_list == "" ) return $queue;
+  if ( $in_list == '' ) return $queue;
 
   /**
   * Select the track information from the database
   */
   $sql = sprintf("SELECT *, EXTRACT( 'epoch' FROM duration ) AS dur_secs FROM tracks WHERE path_name IN ( %s );", $in_list );
-  $qry = new AwlQuery( $sql );
+  $qry = new AwlQuery( $sql, $params );
   if ( $qry->Exec("current_queue",__LINE__,__FILE__) && $qry->rows() ) {
     while( $track = $qry->Fetch() ) {
       $position = $queue_pos[$track->path_name];
@@ -96,3 +99,5 @@ function current_queue() {
 
   return $queue;
 }
+
+
diff --git a/inc/header.php b/inc/header.php
index 72fd33d..93712ab 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -3,40 +3,16 @@
   /////////////////////////////////////////////////////////
   // Work out our page title
   /////////////////////////////////////////////////////////
-  $refresh_time = 90;
   if ( !isset($page_title) || $page_title == "" ) {
     $current_track = current_track();
     if ( is_object($current_track) ) {
       $page_title = "$current_track->title : $current_track->album : $current_track->artist  ";
       $refresh_time = ( $current_track->finishing - time() ) + 5;
-      if ( $refresh_time < 0 ) $refresh_time = 180;
-      if ( $refresh_time < 90 && $refresh_time > 30 ) $refresh_time = 90;
-      error_log( "$sysabbr: DBG: Title >>$page_title<<   Finish >>$current_track->finishing >>".time()." >>$refresh_time");
     }
   }
 
-  $refresh_url = $letter_get;
-  if ( isset($a) )
-    $refresh_url .= "&a=".urlencode($a);
-  else if ( isset($l) )
-    $refresh_url .= "&l=".urlencode($l);
-  $refresh_url = sprintf( 'http://%s%s?act=no', $_SERVER['HTTP_HOST'], $_SERVER['PHP_SELF'], $refresh_url );
+  if ( isset($action) ) daemon_other_command($action,$track);
 
-  if ( isset($refresh) && ! $refresh) {
-    // Don't add a refresh header
-    error_log("Refresh forced off");
-    $meta_refresh = "";
-  }
-  else if ( "$submit" != "" ) {
-    daemon_other_command($action,$track);
-    $meta_refresh = "$refresh_time;URL=$refresh_url" ;
-    header("Refresh: ".$meta_refresh);
-  }
-  else {
-    $meta_refresh = "$refresh_time; URL=$refresh_url" ;
-    header("Refresh: ".$meta_refresh);
-  }
-  error_log("Refresh header was : $meta_refresh");
 
   if ( !isset($stylesheet) ) $stylesheet = "adorno.css";
   echo <<<DOCHEADER
@@ -44,8 +20,6 @@
 <html>
 <head>
 <title>$page_title</title>
-<meta name="MSSmartTagsPreventParsing" content="TRUE">
-<meta name="Refresh" content="$meta_refresh">
 <link rel="stylesheet" type="text/css" href="$stylesheet" />
 </head>
 
diff --git a/inc/home-header.php b/inc/home-header.php
new file mode 100644
index 0000000..b247bd8
--- /dev/null
+++ b/inc/home-header.php
@@ -0,0 +1,94 @@
+<?php
+
+  require_once("LinkClass.php");
+  require_once("DataEntry.php");
+
+function build_controls() {
+  $url = '<a href="#" onclick="act(\'%s\');"><img src="/img/%s" title="%s" /></a>'."\n";
+  $controls = "";
+
+  $controls .= sprintf( $url, 'pause', 'pause.png', 'Pause the playback');
+  $controls .= sprintf( $url, 'resume','resume.png','Resume the paused playback');
+  $controls .= sprintf( $url, 'next',  'next.png',  'Skip ahead to the next track');
+  $controls .= sprintf( $url, 'stop',  'stop.png',  'Stop playing tracks');
+  $controls .= sprintf( $url, 'clear', 'clear.png', 'Clear the currently queued tracks');
+  $controls .= sprintf( $url, 'off',   'off.png',   'Shut music server down and turn off');
+
+  return $controls;
+}
+
+
+
+function build_menubar() {
+  global $ltrtype, $a, $l, $lltr, $altr, $search;
+
+  if ( !isset($ltrtype) ) $ltrtype = 'artist';
+  $url = $_SERVER['PHP_SELF'] . build_url_params( array('altr' => '--altr--') );
+  $ls = new LinkSet( '<a href="%s"%s%s>%s</a>', 'alphabetica' );
+
+  $sf = new EntryForm( '', $GLOBALS, true );
+  $sf->SimpleForm();
+  $menubar = $sf->StartForm(array('method' => 'get', 'id' => 'search_form'));
+  if ( isset($ltrtype) ) $menubar .= $sf->HiddenField( 'type', $ltrtype );
+  if ( isset($lltr) )    $menubar .= $sf->HiddenField( 'lltr', $lltr );
+  if ( isset($altr) )    $menubar .= $sf->HiddenField( 'altr', $altr );
+  if ( isset($a) )       $menubar .= $sf->HiddenField( 'a', $a );
+  else if ( isset($l) )  $menubar .= $sf->HiddenField( 'l', $l );
+
+  $menubar .= '<table width="100%" border="0"><tr class="tr_menu"><td class="h3"><span id="current_type" onclick="toggle_type();">'.ucfirst($ltrtype).'</span>s:</td><td id="alphabet">';
+  $qry = new AwlQuery("SELECT letter, pattern, $ltrtype"."_count AS count FROM letter_groups ORDER BY 1;");
+  if ( $qry->Exec("artist") && $qry->rows() > 0 ) {
+    while ( $letter = $qry->Fetch() ) {
+      $help = "Display $letter->count $ltrtype"."s beginning with the letter '$letter->letter'.";
+      $display = $letter->letter;
+      if ( trim($letter->letter) == "#" ) {
+        $help = 'List all '."$letter->count $ltrtype".'s not beginning with an alphabetic character.';
+      }
+      $menubar .= $ls->Link( str_replace('--altr--', rawurlencode($letter->pattern), $url), $display, $help );
+    }
+  }
+  $menubar .= '</td>';
+
+  $f = new EntryField( 'text', 'search',
+                   array( 'title' => 'Enter a regular expression to search for artists / albums that match that',
+                          'size'  => '15', 'class' => 'search_field'),
+                   "$search" );
+  $menubar .= '<td align="right">'.$f->Render().'</td>';
+  $menubar .= '<td>'.$sf->SubmitButton("submit","Search").'</td>';
+
+  $menubar .= '</tr></table>';
+
+  $menubar .= $sf->EndForm();
+
+  return $menubar;
+}
+
+$controls = build_controls();
+$menubar  = build_menubar();
+if ( !isset($stylesheet) ) $stylesheet = "adorno.css";
+
+  echo <<<EOHTML
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Strict//EN" "http://www.w3.org/TR/html4/DTD/html4-strict.dtd">
+<html>
+<head>
+<title>Adorno Music Server</title>
+<link rel="stylesheet" type="text/css" href="$stylesheet" />
+<script language="javascript" src="js/adorno.js" defer>Javascript is required, sorry.</script>
+</head>
+<body>
+<table id="header">
+ <tr>
+  <td id="now_playing">Stopped</td>
+  <td id="controls">
+$controls  </td>
+ </tr>
+</table>
+<div id="menu">
+  $menubar
+</div>
+<div id="playurl">
+<form id="urlform" method="POST"><input name="url" class="playurl" type="text"><input class="submit" type="submit" name="act" value="Play URL"></form>
+</div>
+<div id="content">
+
+EOHTML;
diff --git a/inc/menu.php b/inc/menu.php
index c434e02..6a19c32 100644
--- a/inc/menu.php
+++ b/inc/menu.php
@@ -2,41 +2,43 @@
   require_once("LinkClass.php");
   require_once("DataEntry.php");
 
-  // Here's a bit of misdirection that ensures the URL always has a ?var=value at the beginning.
-  if ( ! strpos( $refresh_url, '?' ) ) $refresh_url .= "?s=" . substr( md5(rand(1,50000)), 1, 3 );
-
-  $url = '    <a href="'.str_replace('%','%%',$refresh_url).'&submit=a&action=%s">';
-  $url .= '<img src="/img/%s" title="%s" /></a>'."\n";
+  $url = '<a href="#" onclick="act(\'%s\');"><img src="/img/%s" title="%s" /></a>'."\n";
   $controls = "";
 
-  $controls .= sprintf( $url, "pause",  "pause.png",  "Pause the playback");
-  $controls .= sprintf( $url, "resume", "resume.png", "Resume the paused playback");
-  $controls .= sprintf( $url, "next",   "next.png",   "Skip ahead to the next track");
-  $controls .= sprintf( $url, "clear",  "clear.png",  "Clear the currently queued tracks");
-  $controls .= sprintf( $url, "off",    "off.png",    "Shut music server down and turn off");
+  $controls .= sprintf( $url, 'pause', 'pause.png', 'Pause the playback');
+  $controls .= sprintf( $url, 'resume','resume.png','Resume the paused playback');
+  $controls .= sprintf( $url, 'next',  'next.png',  'Skip ahead to the next track');
+  $controls .= sprintf( $url, 'stop',  'stop.png',  'Stop playing tracks');
+  $controls .= sprintf( $url, 'clear', 'clear.png', 'Clear the currently queued tracks');
+  $controls .= sprintf( $url, 'off',   'off.png',   'Shut music server down and turn off');
 
   $url = "";
-  if ( "$lltr" <> "" )   $url .= "&lltr=" . urlencode($lltr);
-  if ( "$a" <> "" )      $url .= "&a=" . urlencode($a);
-  elseif ( "$l" <> "" )  $url .= "&l=" . urlencode($l);
-  $ltrtype = "artist";
-  if ( preg_match( '/album.php/', $REQUEST_URI) ) $ltrtype = "album";
+  if ( "$lltr" <> "" )     $url .= "&lltr=" . rawurlencode($lltr);
+  elseif ( "$altr" <> "" ) $url .= "&altr=" . rawurlencode($altr);
+  if ( "$a" <> "" )      $url .= "&a=" . rawurlencode($a);
+  elseif ( "$l" <> "" )  $url .= "&l=" . rawurlencode($l);
+
+  if ( !isset($ltrtype) ) {
+    $ltrtype = 'artist';
+    if ( preg_match( '/album.php/', $_SERVER['REQUEST_URI']) ) $ltrtype = 'album';
+  }
 
-  $url = $PHP_SELF . preg_replace( '/^&/', '?', $url . '&' );
+  $url = $_SERVER['PHP_SELF'] . preg_replace( '/^&/', '?', $url . '&' );
   if ( !preg_match( '{/(artist|album)\.php}', $url) ) {
     error_log( "$sysabbr: DBG: >>$url<< " . (preg_match('{/(artist|album)\.php}', $url)? 'true':'false') );
-    $url = preg_replace( '{/[a-z0-9_-]+\.php}i', '/artist.php', $url );
+    // $url = preg_replace( '{/[a-z0-9_-]+\.php}i', '/artist.php', $url );
+    $url .= sprintf('type=%s&', $ltrtype);
   }
   $ls = new LinkSet( '<a href="'.str_replace('%','%%',$url).'altr=%s"%s%s>%s</a>', 'alphabetica' );
   error_log( "$sysabbr: DBG: >>$ls->template<<" );
 
-  $menubar = '<table width="100%" border="0"><tr class="tr_menu"><td class="h3">'.ucfirst($ltrtype).'s:</td><td>';
+  $menubar = '<table width="100%" border="0"><tr class="tr_menu"><td class="h3"><span id="current_type" onclick="toggle_type();">'.ucfirst($ltrtype).'</span>s:</td><td id="alphabet">';
   $qry = new AwlQuery("SELECT letter, pattern, $ltrtype"."_count AS count FROM letter_groups ORDER BY 1;");
   if ( $qry->Exec("artist") && $qry->rows() > 0 ) {
     while ( $letter = $qry->Fetch() ) {
       $help = "Display $letter->count $ltrtype"."s beginning with the letter '$letter->letter'.";
       $display = $letter->letter;
-      if ( trim("$letter->letter") == "#" ) {
+      if ( trim($letter->letter) == "#" ) {
         $help = 'List all '."$letter->count $ltrtype".'s not beginning with an alphabetic character.';
       }
       $menubar .= $ls->Link( urlencode($letter->pattern), $display, $help );
@@ -45,7 +47,7 @@
   $menubar .= '</td>';
 //  $menubar .= '<td class="h3">Search:</td>';
   $sf = new EntryForm( $refresh_url, $GLOBALS, true );
-  $sf->TrivialForm();
+  $sf->SimpleForm();
   $menubar .= $sf->StartForm(array('method' => 'get'));
   if ( isset($lltr) )   $menubar .= $sf->HiddenField( 'lltr', $lltr );
   if ( isset($altr) )   $menubar .= $sf->HiddenField( 'altr', $altr );
@@ -74,13 +76,141 @@
 
   echo <<<EOHTML
 <body>
+<script language="javascript"><!--
+function toggle_type() {
+  var type_span = document.getElementById('current_type');
+  var type = type_span.innerHTML.toLowerCase();
+  var old_type = type;
+  // alert(type);
+  if ( type == 'artist' )       { type = 'album'; }
+  else if ( type == 'album' )   { type = 'stream'; }
+  else if ( type == 'stream' )  { type = 'genre'; }
+  else if ( type == 'genre' )   { type = 'artist'; }
+  // alert(type);
+  type_span.innerHTML = type.substring(0,1).toUpperCase() + type.substring(1);
+
+  var alphabet = document.getElementById('alphabet').childNodes;
+  
+  var href;
+  var title;
+  var title_match = new RegExp('([0-9]+ )?' + old_type,'g');
+ 
+  for (var i = 0; i < alphabet.length; i++) 
+  {
+    href = alphabet[i].href;
+    alphabet[i].href = href.replace(old_type,type);
+    title = alphabet[i].title;
+    alphabet[i].title = title.replace(title_match,type);
+//    if ( alphabet[i].innerHTML == 'F' ) {
+//      alert(alphabet[i].title);
+//    }
+  };
+
+}
+
+var base_url = 'http://aiw/';
+var status_req = new XMLHttpRequest();
+var mytime;
+var redo_queue = true;
+function update_now_playing() {
+  var td = document.getElementById('now_playing');
+  status_req.open('GET', base_url + 'current.php', true);
+  status_req.onreadystatechange = function (aEvt) {
+    if ( status_req.readyState == 4 ) {
+      if ( status_req.status == 200 ) {
+        if ( td.innerHTML != status_req.responseText ) {
+          td.innerHTML = status_req.responseText;
+          var in_td = td.childNodes;
+          var title = '';
+          if ( in_td.length == 1 ) {
+            var nodecontent = status_req.responseText;
+            if ( nodecontent.match(/Nothing is currently playing/i) ) {
+              title = 'Adorno: stopped';
+            }
+            else if ( nodecontent.match(/paused/i) ) {
+              title = 'Adorno: paused';
+            }
+            in_td = in_td[0].childNodes;
+          }
+          for ( var i=0; i < in_td.length; i++ ) {
+            if ( in_td[i].innerHTML == undefined ) continue;
+            if ( title == '' )
+              title = in_td[i].innerHTML;
+            else
+              title = title + ' : ' + in_td[i].innerHTML;
+          }
+          document.title = title;
+          update_queue();
+        }
+        else if ( redo_queue )
+          update_queue();
+      }
+//      else
+//        td.innerHTML = "<p>Error loading page</p>";
+    }
+  };
+  status_req.send(null);
+  mytime=setTimeout('update_now_playing()',10000);
+}
+
+function update_queue() {
+  var td = document.getElementById('queue');
+  redo_queue = false;
+  status_req.open('GET', base_url + 'queue.php', true);
+  status_req.onreadystatechange = function (aEvt) {
+    if ( status_req.readyState == 4 ) {
+      if ( status_req.status == 200 ) {
+        td.innerHTML = status_req.responseText;
+      }
+//      else
+//        td.innerHTML = "<p>Error loading page</p>";
+    }
+  };
+  status_req.send(null);
+}
+
+var last_action_result = '';
+function act( action ) {
+  var act_req = new XMLHttpRequest();
+  status_req.open('GET', base_url + 'action.php?action=' + action, true);
+  status_req.onreadystatechange = function (aEvt) {
+    if ( status_req.readyState == 4 ) {
+      if ( status_req.status == 200 ) {
+        last_action_result = 'success';
+        redo_queue = true;
+        update_now_playing();
+      }
+      else
+        last_action_result = 'failure';
+    }
+  };
+  status_req.send(null);
+}
+
+function enqueue(artist,album,track) {
+  var act_req = new XMLHttpRequest();
+  var details = '&a=' + artist + '&l=' + album;
+  if ( track != '' ) details = details + '&t=' + track;
+  var url = base_url +  'action.php?action=enqueue' + details
+  // alert(url);
+  status_req.open('GET', url, true);
+  status_req.onreadystatechange = function (aEvt) {
+    if ( status_req.readyState == 4 ) {
+      if ( status_req.status == 200 ) {
+        last_action_result = 'success';
+        redo_queue = true;
+        update_now_playing();
+      }
+      else
+        last_action_result = 'failure';
+    }
+  };
+  status_req.send(null);
+}
+--></script>
 <table id="header">
  <tr>
-  <td id="now_playing">
-    <span class="track_title">$current_track->title</span>
-    <span class="album_title">$current_track->album</span>
-    <span class="artist_name">$current_track->artist</span>
-  </td>
+  <td id="now_playing">Stopped</td>
   <td id="controls">
 $controls  </td>
  </tr>
@@ -91,6 +221,9 @@ $controls  </td>
 <div id="playurl">
 <form id="urlform" method="POST"><input name="url" class="playurl" type="text"><input class="submit" type="submit" name="act" value="Play URL"></form>
 </div>
+<script language="javascript"><!--
+update_now_playing();
+--></script>
 <div id="content">
 
 EOHTML;
diff --git a/inc/mpdPlayer.php b/inc/mpdPlayer.php
index ce30e09..ab7c9bb 100644
--- a/inc/mpdPlayer.php
+++ b/inc/mpdPlayer.php
@@ -185,6 +185,9 @@ function daemon_current_track() {
 function daemon_other_command( $action, $track ) {
   global $mpd;
   switch( $action ) {
+    case 'resume':
+      $mpd->Daemon('play');
+      break;
     case 'pause':
       $mpd->Daemon($action);
       break;
@@ -192,7 +195,8 @@ function daemon_other_command( $action, $track ) {
       $mpd->Daemon($action);
       break;
     default:
-      error_log("adorno: ERROR: Unsupported command '$action'" );
+      error_log("adorno: WARNING: Unsupported command '$action'" );
+      $mpd->Daemon($action);
   }
 
   return true;
diff --git a/inc/show-album.php b/inc/show-album.php
new file mode 100644
index 0000000..1c4d73b
--- /dev/null
+++ b/inc/show-album.php
@@ -0,0 +1,103 @@
+<script language="javascript"><!--
+function show_hide() {
+  var args = show_hide.arguments;
+  var tbody = document.getElementById('album-' + args[0]);
+  var control = document.getElementById('control-' + args[0]);
+//  alert(tbody.style.display);
+  if ( tbody.style.display == 'none' ) {
+    tbody.style.display = '';
+    control.innerHTML = '–';
+  }
+  else {
+    tbody.style.display = 'none';
+    control.innerHTML = '+';
+  }
+}
+--></script>
+<?php
+/**
+* List artists
+*/
+function album_track( $trk, $link_title, $row_class = "" ) {
+  global $letter_get, $ltrtype;
+
+  $track_link_url = sprintf( "?type=%s&l=%s&a=%s&t=%s",
+       $ltrtype, urlencode($trk->album), urlencode($trk->artist), urlencode($trk->title) );
+  $safe_title = htmlspecialchars($link_title);
+  $duration = preg_replace( "/^[0:]{1,4}/", "", $trk->duration );
+  $enqueue = sprintf( "enqueue('%s','%s','%s')", rawurlencode($trk->artist),
+                 rawurlencode($trk->album), rawurlencode($trk->title) );
+  $link = <<<EOHTML
+    <a class="track$row_class" onclick="$enqueue" title="$trk->path_name">$safe_title</a>
+  </td>
+  <td class="track$row_class" width="7%">$duration</td>
+  <td class="track$row_class" width="4%">
+    <a class="alphabetica" href="edit_track.php$track_link_url" title="Edit Track Info">E</a>
+
+EOHTML;
+
+  return $link;
+}
+
+if ( isset($l) ) {
+  echo '<h3>'.htmlspecialchars($l).'</h3>';
+
+  $qa = 'SELECT artist, album, title, tracknum, path_name, duration::interval(0), ';
+  $qa .= 'extract( EPOCH FROM duration)::int AS secs, quality, get_last_played(hash_key) AS last_played ';
+  $qa .= 'FROM tracks WHERE lower(album) = lower(?) ';
+  $qa .= 'ORDER BY lower(album), setpart, tracknum';
+  $qry = new AwlQuery($qa, $l);
+  if ( $qry->Exec() && $qry->rows() > 0 ) {
+    echo '<table width="100%" cellspacing="0" cellpadding="0">
+';
+    $last_album = '';
+    $rownum = 0;
+    $id = 0;
+    while ( $track = $qry->Fetch() ) {
+      if ( $track->album != '' && $track->album != $last_album ) {
+        if ( $rownum != 0 ) echo '</tbody>';
+        echo '<tr class="th4">';
+        $id++;
+        echo '<td width="3%" class="th4"><span class="expand_hide" id="control-'.$id.'" onclick="show_hide('.$id.')" title="Expand section">+</span></td>';
+        echo '<td width="86%" class="th4" style="text-align:left"><a class="th4" onclick="';
+        printf( "enqueue('','%s','')", rawurlencode($track->album) );
+        echo '" title="Play Entire Album">'.htmlspecialchars($track->album).'</a></td>';
+        echo '<td width="7%">&nbsp;</td>';
+        echo '<td width="4%" class="th4"><a class="alphabetica"  class="track" href="edit_track.php?l='
+ . rawurlencode($track->album) . '&a='
+ . rawurlencode($track->artist) . '" title="Edit Album Info">E</a>
+</td></tr>
+<tbody id="album-'.$id.'" style="display:none;">
+<tr class="th4">
+';
+        $last_album = $track->album;
+      }
+      else if ( $rownum == 0 ) {
+        echo '<tr class="th4">';
+        $id++;
+        echo '<td width="3%" class="th4"><span onclick="show_hide(\'album-'.$id.'\')">+</span></td>';
+        echo '<td class="th4" colspan="3" style="text-align:left">Unkown Album</td></tr>
+<tbody id="album-'.$id.'" style="display:none;">
+<tr class="th4">
+';
+      }
+      else {
+        echo '<tr class="th4">';
+      }
+      $rowclass = ($rownum % 2);
+      echo '<td colspan="2" style="text-align:left;" class="track'.$rowclass.'">';
+      echo album_track($track, ($track->tracknum > 0 ? $track->tracknum.': ' : '') . $track->title,  $rowclass );
+      $rownum++;
+      echo '</td>';
+      echo '</tr>
+';
+    }
+    if ( $rownum != 0 ) echo '</tbody>';
+    echo '</table>';
+  }
+
+}
+
+
+
+
diff --git a/inc/show-artist.php b/inc/show-artist.php
new file mode 100644
index 0000000..37f76a2
--- /dev/null
+++ b/inc/show-artist.php
@@ -0,0 +1,101 @@
+<script language="javascript"><!--
+function show_hide() {
+  var args = show_hide.arguments;
+  var tbody = document.getElementById('album-' + args[0]);
+  var control = document.getElementById('control-' + args[0]);
+//  alert(tbody.style.display);
+  if ( tbody.style.display == 'none' ) {
+    tbody.style.display = '';
+    control.innerHTML = '–';
+  }
+  else {
+    tbody.style.display = 'none';
+    control.innerHTML = '+';
+  }
+}
+--></script>
+<?php
+/**
+* List artists
+*/
+function artist_track( $trk, $link_title, $row_class = "" ) {
+  global $letter_get, $ltrtype;
+
+  $safe_title = htmlspecialchars($link_title);
+  $duration = preg_replace( "/^[0:]{1,4}/", "", $trk->duration );
+  $enqueue = sprintf( "enqueue('%s','%s','%s')", rawurlencode($trk->artist),
+                 rawurlencode($trk->album), rawurlencode($trk->title) );
+  $link = <<<EOHTML
+    <a class="track$row_class" onclick="$enqueue" title="$trk->path_name">$safe_title</a>
+  </td>
+  <td class="track$row_class" width="7%">$duration</td>
+  <td class="track$row_class" width="4%">
+    <a class="alphabetica" href="edit_track.php$track_link_url" title="Edit Track Info">E</a>
+
+EOHTML;
+
+  return $link;
+}
+
+if ( isset($a) ) {
+  echo '<h3>'.htmlspecialchars($a).'</h3>';
+
+  $qa = 'SELECT artist, album, title, tracknum, path_name, duration::interval(0), ';
+  $qa .= 'extract( EPOCH FROM duration)::int AS secs, quality, get_last_played(hash_key) AS last_played ';
+  $qa .= 'FROM tracks WHERE lower(artist) = lower(?) ';
+  $qa .= 'ORDER BY lower(album), setpart, tracknum';
+  $qry = new AwlQuery($qa, $a);
+  if ( $qry->Exec() && $qry->rows() > 0 ) {
+    echo '<table class="album_list" cellspacing="0">
+';
+    $last_album = '';
+    $rownum = 0;
+    $id = 0;
+    while ( $track = $qry->Fetch() ) {
+      if ( $track->album != '' && $track->album != $last_album ) {
+        if ( $rownum != 0 ) echo '</tbody>';
+        echo '<tr class="th4">';
+        $id++;
+        echo '<td width="3%" class="th4"><span class="expand_hide" id="control-'.$id.'" onclick="show_hide('.$id.')" title="Expand section">+</span></td>';
+        echo '<td width="86%" class="th4" style="text-align:left"><a class="th4" onclick="';
+        printf( "enqueue('%s','%s','')", rawurlencode($track->artist), rawurlencode($track->album) );
+        echo '" title="Play Entire Album">'.htmlspecialchars($track->album).'</a></td>';
+        echo '<td width="7%">&nbsp;</td>';
+        echo '<td width="4%" class="th4"><a class="alphabetica"  class="track" href="edit_track.php?l='
+ . rawurlencode($track->album) . '&a='
+ . rawurlencode($track->artist) . '" title="Edit Album Info">E</a>
+</td></tr>
+<tbody id="album-'.$id.'" style="display:none;">
+<tr class="th4">
+';
+        $last_album = $track->album;
+      }
+      else if ( $rownum == 0 ) {
+        echo '<tr class="th4">';
+        $id++;
+        echo '<td width="3%" class="th4"><span class="expand_hide" id="control-'.$id.'" onclick="show_hide('.$id.')" title="Expand section">+</span></td>';
+        echo '<td class="th4" colspan="3" style="text-align:left">Unkown Album</td></tr>
+<tbody id="album-'.$id.'" style="display:none;">
+<tr class="th4">
+';
+      }
+      else {
+        echo '<tr class="th4">';
+      }
+      $rowclass = ($rownum % 2);
+      echo '<td colspan="2" style="text-align:left;" class="track'.$rowclass.'">';
+      echo artist_track($track, ($track->tracknum > 0 ? $track->tracknum.': ' : '') . $track->title,  $rowclass );
+      $rownum++;
+      echo '</td>';
+      echo '</tr>
+';
+    }
+    if ( $rownum != 0 ) echo '</tbody>';
+    echo '</table>';
+  }
+
+}
+
+
+
+
diff --git a/inc/stream-list.php b/inc/stream-list.php
new file mode 100644
index 0000000..26819f7
--- /dev/null
+++ b/inc/stream-list.php
@@ -0,0 +1,31 @@
+<?php
+/**
+* List Streams
+*/
+echo "<h3>Streams</h3>\n<p>";
+$where = '';
+$params = array();
+if ( isset($search) ) {
+  $where = "(stream_url ~* :search OR playlist_url ~* :search OR genre ~* :search OR description ~* :search) ";
+  $params[':search'] = $search;
+}
+if ( isset($altr) ) {
+  $altr = trim($altr);
+  $where .= ($where == ''? '' : ' AND ');
+  $where .= '(description ~ :match)';
+  $params[':match'] = '^'.$altr;
+}
+if ( $where != '' ) $where = 'WHERE '. $where;
+$sql = 'SELECT * FROM streams '.$where.' ORDER BY lower(description)';
+$qry = new AwlQuery( $sql, $params );
+
+if ( $qry->Exec('album') && $qry->rows() > 0 ) {
+  while ( $stream = $qry->Fetch() ) {
+    $display = htmlspecialchars($stream->description);
+    if ( $display == '' ) $display = htmlspecialchars($stream->stream_url);
+    $title = htmlspecialchars($stream->stream_url);
+    if ( trim($display) == "" ) $display = "&laquo;unknown&raquo;";
+    echo " <a href=\"?type=stream&url=" . urlencode($stream->stream_url) . "$letter_get\" class=\"stream\" title=\"$title\">$display</a>\n";
+  }
+}
+
diff --git a/inc/vlcPlayer.php b/inc/vlcPlayer.php
index d52f7a3..27b1e38 100644
--- a/inc/vlcPlayer.php
+++ b/inc/vlcPlayer.php
@@ -217,6 +217,9 @@ function daemon_current_track() {
 function daemon_other_command( $action, $track ) {
   global $vlc;
   switch( $action ) {
+    case 'resume':
+      $vlc->Daemon('play');
+      break;
     case 'pause':
       $vlc->Daemon($action);
       break;
@@ -224,7 +227,8 @@ function daemon_other_command( $action, $track ) {
       $vlc->Daemon($action);
       break;
     default:
-      error_log("adorno: ERROR: Unsupported command '$action'" );
+      error_log("adorno: WARNING: Unsupported command '$action'" );
+      $vlc->Daemon($action);
   }
 
   return true;
diff --git a/inc/xmms2Player.php b/inc/xmms2Player.php
index 1def58f..abc134c 100644
--- a/inc/xmms2Player.php
+++ b/inc/xmms2Player.php
@@ -159,6 +159,7 @@ class xmms2Connection {
     $songnow->track = str_replace( 'file://', '', $this->status['url'] );
     $songnow->duration = intval($this->status['duration']) / 1000;
     $songnow->finishing = date( 'Y-m-d H:i:s', $this->status['laststarted'] + $songnow->duration);
+    $songnow->state   = $this->status['state'];
 
     // printf( "<p>Song now is: %s started %s, finishes %s</p>\n", $songnow->track, $songnow->started, $songnow->finishing );
 
@@ -260,7 +261,9 @@ function daemon_other_command( $action, $track ) {
       $xmms2->Daemon($action);
       break;
     default:
-      error_log("adorno: ERROR: Unsupported command '$action'" );
+      error_log("adorno: WARNING: Unsupported command '$action'" );
+      $xmms2->Daemon($action);
+      break;
   }
 
   return true;
diff --git a/scripts/add_subtree.pl b/scripts/add_subtree.pl
index 333dd4d..682ccbc 100755
--- a/scripts/add_subtree.pl
+++ b/scripts/add_subtree.pl
@@ -13,7 +13,7 @@ use Ogg::Vorbis::Header;
 
 my %opts = (
              'database' => 'adorno',
-             'dbuser'   => 'general',
+             'dbuser'   => 'adorno_app',
              'force'    => 0,
              'remove'   => 0,
              'clean'    => 0,
diff --git a/scripts/xmmsosd.pl b/scripts/xmmsosd.pl
new file mode 100755
index 0000000..85580ab
--- /dev/null
+++ b/scripts/xmmsosd.pl
@@ -0,0 +1,156 @@
+#!/usr/bin/perl -w
+
+# lcdxmms.pl - an example client for LCDproc
+
+#
+# Simple client for LCDproc which displays current status from xmms2
+#
+
+use strict;
+use Getopt::Long;
+use IO::Socket;
+use Fcntl;
+
+my $debug = 0;
+
+# Host which runs lcdproc daemon (LCDd)
+my $SERVER = "localhost";
+
+# Port on which LCDd listens to requests
+my $PORT = "13666";
+
+# XMMS status command
+my @xmms = qw{xmms2 status};
+
+# Gracefully exit, since we won't otherwise
+$SIG{INT} = \&graceful_close;
+$SIG{TERM} = \&graceful_close;
+
+# Connect to the LCD Daemon...
+my $lcdd = IO::Socket::INET->new(
+		Proto     => 'tcp',
+		PeerAddr  => $SERVER,
+		PeerPort  => $PORT,
+	)
+	|| die "Cannot connect to LCDproc port\n";
+
+# Make sure our messages get there right away
+$lcdd->autoflush(1);
+
+sleep 1;	# Give server plenty of time to notice us...
+
+print $lcdd "hello\n";
+my $lcdresponse = <$lcdd>;
+print $lcdresponse if ( $debug );
+
+# determine LCD size (not needed here, but useful for other clients)
+($lcdresponse =~ /lcd.+wid\s+(\d+)\s+hgt\s+(\d+)/);
+my $lcdwidth = $1; my $lcdheight= $2;
+print "Detected LCD size of $lcdwidth x $lcdheight\n" if ($debug);
+
+# Turn off blocking mode...
+fcntl($lcdd, F_SETFL, O_NONBLOCK);
+
+# Set up some screen widgets...
+print $lcdd "client_set name {XMMS}\n";
+$lcdresponse = <$lcdd>;
+print $lcdd "screen_add xmmsosd\n";
+$lcdresponse = <$lcdd>;
+print $lcdd "screen_set xmmsosd -name {Adorno} -heartbeat off -wid $lcdwidth -hgt $lcdheight\n";
+$lcdresponse = <$lcdd>;
+print $lcdd "widget_add xmmsosd title string\n";
+$lcdresponse = <$lcdd>;
+print $lcdd "widget_set xmmsosd title 1 1 {-+ * Adorno * +-}\n";
+$lcdresponse = <$lcdd>;
+print $lcdd "widget_add xmmsosd track scroller\n";
+$lcdresponse = <$lcdd>;
+
+
+while(1) {
+  my $status = `xmms2 status`;
+  $status =~ s{^\s*(\S.*\S)\s*$}{$1};
+  print STDERR 'status: ', $status, "  xxxx\n" if ( $debug );
+  write_lcd_text($lcdd,$status);
+  while (defined(my $line = <$lcdd>)) {
+    chomp $line;
+#    print "Received '$line'\n" if ($debug);
+    my @items = split(/ /, $line);
+    my $command = shift @items;
+  }
+
+  # wait a bit
+  sleep 5;
+}
+
+
+sub write_lcd_text {
+  my $lcdd = shift;
+  my $text = shift;
+
+  # replace all whitespace by single spaces
+  $text =~ s{\s+}{ }gs;
+  $text =~ s{^\s*(\S.*\S)\s*$}{$1};
+  my $status;
+  $text =~ s{^(\S+):\s*}{} && do {
+    $status = $1;
+  };
+  $text =~ s{: \s* \d{2}:\d{2}  \s* of \s* \d{2}:\d{2}\s*}{}x;
+
+  if ( $status eq 'Stopped' ) {
+    print $lcdd "screen_set xmmsosd -backlight off\n";
+    $text = '';
+  }
+  else {
+    print $lcdd "screen_set xmmsosd -backlight on\n";
+#    my $response = <$lcdd>;
+#    print 'response: ', $response, "\n" if ( $debug );
+  }
+
+  my $now = scalar localtime;
+  $now =~ s{^.*\s(\d{2}:\d{2}):\d{2}\s.*$}{$1};
+  print $lcdd "widget_set xmmsosd title  1 1 {$now : $status}\n";
+  print $lcdd "widget_set xmmsosd track 1 2 16 2 h 3 {  $text  }\n";
+  $text = <$lcdd>;
+
+  return $text;  # not that we expect to use it, but hey...
+}
+
+
+sub graceful_close {
+  print "Exiting...\n" if ($debug);
+  close($lcdd);
+  exit;
+}
+
+
+sub error {
+  my $status = shift;
+  my @msg = @_;
+
+  die join(" ", @msg) . "\n";
+
+  exit($status)  if ($status);
+}
+
+
+sub usage {
+  my $status = shift;
+
+  print STDERR "Usage: lcdxmms [<options>]\n";
+  if (!$status) {
+    print STDERR <<EOUSAGE;
+  where <options> are\n" .
+    -s <server>     connect to <server> (default: $SERVER)
+    -p <port>       connect to <port> on <server> (default: $PORT)
+    --debug         enable debugging messages
+      show this help page
+
+EOUSAGE
+  }
+  else {
+    print STDERR "For help, type: lcdxmms --help\n";
+  }  
+
+  exit($status);
+}
+
diff --git a/www/action.php b/www/action.php
new file mode 100644
index 0000000..a1748ce
--- /dev/null
+++ b/www/action.php
@@ -0,0 +1,58 @@
+<?php
+  include('always.php');
+
+  header('Content-type: text/plain');
+
+  // echo "Action=" . $action, "\n";
+  switch( $action ) {
+    case 'enqueue':
+      if ( isset($url) ) {
+        PlayTrack( $url, md5($url) );
+
+        // Attempt to update the database with the stream details
+        $sql = "SELECT 1 FROM streams WHERE stream_url = ?";
+        $qry = new AwlQuery( $sql, $url );
+        if ( $qry->rows() == 0 ) {
+          $sql = "INSERT INTO streams ( stream_url ) VALUES( ? )";
+          $qry = new AwlQuery( $sql, $url );
+        }
+        // echo "Playing $url\n";
+      }
+      else {
+        $sql = 'SELECT path_name, hash_key FROM tracks WHERE album = :album ';
+        $params = array( ':album' => $l );
+        if ( isset($a)  && $a != '' ) {
+          $sql .= 'AND artist = :artist ';
+          $params[':artist'] = $a;
+        }
+        if ( isset($t)  && $t != '' ) {
+          $sql .= 'AND title = :title ';
+          $params[':title'] = $t;
+        }
+        $sql .= 'ORDER BY setpart, tracknum';
+        echo $sql;
+        print_r( $params );
+
+        $qry = new AwlQuery( $sql, $params );
+        if ( $qry->Exec("PlayTracks") && $qry->rows() > 0 ) {
+          while( $track = $qry->Fetch() ) {
+            PlayTrack( $track->path_name, $track->hash_key );
+            // echo "Playing $track->path_name\n";
+          }
+        }
+      }
+      break;
+
+
+    case 'move':
+      param_to_global( 'i', 'int' );
+      param_to_global( 'd', '{^[ud]}' );
+      daemon_move( $i, (substr($d,0,1) == 'd' ? 1 : -1) );
+      break;
+
+
+    default:
+      daemon_other_command($action,null);
+      break;
+
+  }
diff --git a/www/adorno.css b/www/adorno.css
index c9cafbc..ad20d62 100644
--- a/www/adorno.css
+++ b/www/adorno.css
@@ -45,15 +45,22 @@ h3, .h3, .h3:link, .h3:visited {
   vertical-align: bottom;
   background: #040407;
   color: white;
-  margin-bottom: 0;
-  padding: 2px 0 0 0;
+  padding: 0.1em 0;
   border-style: none;
   line-height: 120%;
   font-weight: 700;
-  margin: 0;
-  padding: 0;
+  margin: 0.5em 0 0;
   vertical-align: middle;
-  -moz-border-radius: 5px;
+  -moz-border-radius: 0.5em 0.5em 0 0;
+}
+
+span.expand_hide {
+  font-weight: 700;
+  width:0.8em;
+  height:0.8em;
+  padding: 0.1em;
+  border: thin white solid;
+  background-color: #606060;
 }
 
 h4, .h4, .h4:link, .h4:visited {
@@ -64,7 +71,6 @@ h4, .h4, .h4:link, .h4:visited {
   margin-bottom: 0;
   padding: 2px 0 0 0;
   border-style: none;
-  line-height: 120%;
   font-weight: 700;
 }
 
@@ -74,10 +80,9 @@ th4, .th4, .th4:link, .th4:visited {
   font-weight: 700;
   background: #040407;
   color: white;
-  margin-bottom: 1px;
-  padding: 5px 1px 2px;
+  margin: 0.5em 0;
+  padding: 0.2em 0;
   border-style: none;
-  line-height: 120%;
 }
 
 hr {
@@ -173,7 +178,7 @@ input.submit:hover {
   margin: 0;
   padding: 0;
   border-style: none;
-  line-height: 112%;
+  color: #221155;
 }
 .track0 {
   background: #f0f7f7;
@@ -181,6 +186,27 @@ input.submit:hover {
 .track1 {
   background: #e0f0f0;
 }
+a.track, a.track0, a.track1 {
+  width:100%;
+  display:block;
+  padding-left: 1em;
+}
+
+table.album_list {
+  border:none;
+  border-left: 1px #040407 solid;
+  border-right: 1px #040407 solid;
+  border-bottom: 5px #040407 solid;
+  -moz-border-radius: 0 0 5px 5px;
+  width:100%;
+  padding:0;
+  margin:0;
+}
+
+table.album_list tr,
+table.album_list tr td {
+  border:0;
+}
 
 .artist, .artist:link, .artist:visited     {
   font: 90% tahoma, verdana, sans-serif;
@@ -200,6 +226,18 @@ input.submit:hover {
   color: yellow;
 }
 
+a.stream, a.stream:link, a.stream:visited     {
+  display: block;
+  font-family: tahoma, verdana, sans-serif;
+  font-weight: 700;
+  padding: 0.2em 1em;
+  color: #000060;
+  vertical-align: middle;
+}
+a.stream:hover {
+  color: #7000c0;
+}
+
 #header {
   background-color: #f0f0f0;
   width: 100%;
@@ -233,9 +271,18 @@ input.submit:hover {
   font-size: 1em;
 }
 
+#now_playing span.paused {
+  text-decoration:blink;
+  color:orange;
+}
+
+#now_playing span.stopped {
+  color:#b0b0b0;
+}
+
 #controls {
   text-align: right;
-  width: 185px;
+  width: 220px;
   height: 23px;
   vertical-align: middle;
   padding: 0;
@@ -264,15 +311,6 @@ input.submit:hover {
   background-color: #e4e4ec;
 }
 
-#queue span.q_title {
-  font-size: 1.1em;
-  padding-left: 1em;
-  padding-right: 1em;
-  margin-left: 1em;
-  margin-right: 1em;
-  font-weight: bold;
-}
-
 #queue span.q_album {
   font-size: 1.4em;
   padding-left: 1em;
@@ -289,6 +327,28 @@ input.submit:hover {
   margin-right: 1em;
 }
 
+#queue tr.q_row {
+  background-color:#f8f8f8;
+  border: 1px #c0c0c0 dashed;
+}
+
+#queue tr.r0 {
+  background-color:#f0f0f4;
+}
+
+
+#queue tr.q_row  td.q_cell {
+ padding:0;
+ margin:0;
+ white-space:nowrap;
+}
+
+#queue tr.q_row  td.q_title {
+ padding: 0.1em 1em;
+ font-size: 1.1em;
+ font-weight: bold;
+}
+
 #playurl input.playurl {
   width: 42em;
   font: xx-small tahoma, verdana, sans-serif;
diff --git a/www/always.php b/www/always.php
index cc2f401..3e6d11a 100644
--- a/www/always.php
+++ b/www/always.php
@@ -90,13 +90,34 @@ if ( !isset($c->page_title) ) $c->page_title = $c->system_name;
 param_to_global('altr','{^[A-Z#]$}');
 param_to_global('lltr','{^[A-Z#]$}');
 param_to_global('search','{^.*$}');
-param_to_global('action','{^(pause|resume|next|clear|off)$}');
+param_to_global('action','{^(pause|enqueue|remove|resume|next|clear|off|stop)$}');
 param_to_global('submit','{^.*$}');
 param_to_global('a','{^.*$}');
 param_to_global('l','{^.*$}');
+param_to_global('t','{^.*$}');
+param_to_global( 'ltrtype', '{(artist|album|genre|stream)}', 'type' );
+
+
+function build_url_params( $url_params = array() ) {
+  $std_params = array( 'ltrtype', 'altr', 'lltr', 'a', 'search' );
+  foreach( $std_params AS $p ) {
+    if ( !isset($url_params[$p]) && isset($GLOBALS[$p])
+          && ! ($p == 'ltrtype' && isset($url_params['type'])) ) {
+      $url_params[($p == 'ltrtype'?'type':$p)] = $GLOBALS[$p];
+    }
+  }
+  $params = array();
+  foreach( $url_params AS $k => $v ) {
+    $params[] = $k .'=' . rawurlencode($v);
+  }
+  $params = implode( $params, '&' );
+  if ( $params != '' ) $params = '?' . $params;
+  return $params;
+}
+
 
 $letter_get = ( "$altr" == "" ? "" : "&altr=$altr" ) . ( "$lltr" == "" ? "" : "&lltr=$lltr" );
-if ( isset($search) && $search == "" ) unset($search);
+if ( isset($search) && $search == '' ) $search = null;
 if ( isset($search) ) $letter_get .= "&search=".urlencode($search);
 
 
diff --git a/www/current.php b/www/current.php
new file mode 100644
index 0000000..b086d00
--- /dev/null
+++ b/www/current.php
@@ -0,0 +1,20 @@
+<?php
+  include('always.php');
+  $current_track = current_track();
+
+  if ( is_object($current_track) ) {
+    if ( $current_track->state == 'Stopped' ) {
+      echo 'Nothing is currently playing';
+    }
+    else {
+      if ( $current_track->state == 'Paused' ) echo '<span class="paused">';
+      printf( '<span class="track_title">%s</span>
+<span class="album_title">%s</span>
+<span class="artist_name">%s</span>
+<span class="finish_time">%s</span>
+', $current_track->title, $current_track->album,
+        $current_track->artist,
+        date("H:i:s",$current_track->finishing));
+      if ( $current_track->state == 'Paused' ) echo ' (paused)</span>';
+    }
+  }
diff --git a/www/img/stop.png b/www/img/stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc6565b8e7d3d30324a9bb241442d61556777e46
GIT binary patch
literal 923
zcwPaU17!S(P)<h;3K|Lk000e1NJLTq001BW000#T1^@s6C(Z2Y00004b3#c}2nYxW
zd<bNS00009a7bBm0009_0009_0sWnLegFUf8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10~kp}K~zYI#g;v99Yqv|pL1q*_kP%rd)*qFGD1OgmM9`w$uCGr
zfrNzk6-ep$A4n9GlvJQ7DUi~k05u72V*|OqAG7m8F|&KKvLh#wk&iURO6Q#S-ShFz
zNJ<HS!}*f~;A`Mh;3L3ry%vB!fM0-bo}b=*0U#+Q4(CrE0N(=dT{GyL>|fxE=cjjn
zkb~LdL*N;(iwI_Rfb7hXdU9!Gik=t)q)1mi5dl$D4Wjn)IJYD%P6=l(AjiD|KDNNa
z9(?~3bhJAROp)l<MDK{f5rZd1PfD>%1R{tiq82q4H8pB$)Q%9*?9%KY%??awgp*$(
zrCs2m1&#pBY<~crVj#3jLc1pTHPNpL-jPB}jGhz&PzWH18dNP}Dog=4c7&-$m}-J(
z9w{B|!fc;#`WL{F1#Sb#WY&X+c1>u{@oq_QOG3LM_%-*Br`$W9m%op%7XU;NQGR~(
z4?jJ6S-{7bdV&oOQ%y0|h#o5wxNQLoAoaL_ukf1%-YxK(bG$n*m00rqcSlr}UfSc%
zzWOq9Ywt%)HNp4|Hnh2AF#-uwje9J>4kjl04c=u?zgb)$auqm0RVi-yH@42eq*z)d
z{j8`+?>`_A{D$Z^x#aB%-!2QG1u<-{1n++&tnn^E*P5~&YAS-M(b5Wl{+Du@JTbK8
zIHGr%RB&V+d0Pv_P-6S-$$2}Riv&{YhYKPp<wHO1=_1Y>t@y{V%|kc1Tm2XikkTJS
zfjrS73Th~|d<O!>U(GfT+HZ=yHUnD%YWqIrlf}f?1~oPBb~PB(lvrEmTqSRZ)7fAM
zjctg*VXATIRhC>5c=z@dP&2~T(|oE))`Mz{+6H5rf$xBT+6LQ8Y_~c^Vr@m+#w%B`
zZ6o#MR@Q-Pl1Vhvo{-uGf*TO<fK6_NjB89aCQGYsSI0JlYRqS!|IWSR_pemKda^fE
z!g?}L!sJ#RzL$g9<7dDfGyeeH`><#Bf87ND@#UZ0UGSR)o&tBm*$GVd`U^?aV4Gb`
xJ-wFOum@kiBAlIcpHFZ6J#h0cqMLpb{s*Sf>~9O-;DG=D002ovPDHLkV1n3}nC$=n

literal 0
HcwPel00001

diff --git a/www/index.php b/www/index.php
index d3f76ce..04be048 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,23 +1,20 @@
 <?php
   include('always.php');
   require_once("Session.php");
-  require_once("PlayTracks.php");
 
-  $title = $system_name;
-  require_once("header.php");
+  require_once("home-header.php");
 
 function track_link( $trk, $link_title, $row_class = "" ) {
   global $letter_get;
 
-  $track_link_url = sprintf( "?l=%s&a=%s&t=%s", urlencode($trk->album), urlencode($trk->artist)
-, urlencode($trk->title) );
+  $track_link_url = sprintf( "?l=%s&a=%s&t=%s", urlencode($trk->album),
+                                  urlencode($trk->artist), urlencode($trk->title) );
   $safe_title = htmlspecialchars($link_title);
   $duration = preg_replace( "/^[0:]{1,4}/", "", $trk->duration );
   $link = <<<EOHTML
 <tr class="track$row_class">
   <td class="track$row_class">
-    <a class="track$row_class" href="artist.php$track_link_url$letter_get" title="$trk->path_na
-me">$safe_title</a>
+    <a class="track$row_class" href="artist.php$track_link_url$letter_get" title="$trk->path_name">$safe_title</a>
   </td>
   <td class="track$row_class">$duration</td>
   <th class="track$row_class">
@@ -40,8 +37,8 @@ $album_artist_fmt = <<<EOHTML
 </tr>
 EOHTML;
 
-$artist_link_fmt = '<a href="/artist.php?a=%s"><span class="q_artist">%s</span></a>';
-$album_link_fmt  = '<a href="/album.php?l=%s"><span class="q_album">%s</span></a>';
+$artist_link_fmt = '<a href="/?type=artist&a=%s"><span class="q_artist">%s</span></a>';
+$album_link_fmt  = '<a href="/?type=album&l=%s"><span class="q_album">%s</span></a>';
 
 $track_fmt = <<<EOHTML
 
@@ -55,6 +52,8 @@ $track_fmt = <<<EOHTML
 </tr>
 EOHTML;
 
+echo '<table width="100%"><tr valign="top"><td width="50%">';
+
 $current_track = current_track();
 $tracks = current_queue();
 echo '<table id="queue">';
@@ -87,7 +86,14 @@ for( $k=0; isset($tracks[$k]); $k++ ) {
 
 }
 echo "</table>\n";
+echo '</td><td width="50%">';
+
+if ( isset($a) ) include('show-artist.php');
+if ( isset($l) ) include('show-album.php');
+
+include($ltrtype . '-list.php');
 ?>
 
+</td></tr></table>
 </body>
 </html>
diff --git a/www/js/adorno.js b/www/js/adorno.js
dissimilarity index 97%
index 9db8dc1..2cef158 100644
--- a/www/js/adorno.js
+++ b/www/js/adorno.js
@@ -1,26 +1,149 @@
-
-var xmlhttp;
-
-if (!xmlhttp && typeof XMLHttpRequest!=undefined) {
-  xmlhttp = new XMLHttpRequest();
-} else {
-  xmlhttp = false;
-}
-
-function GetCurrentTrackInfo() {
-  xmlhttp.open("GET", "/get_current_track_info.php", true);
-  xmlhttp.onreadystatechange = function() {
-    if (xmlhttp.readyState==4) {
-      var rsp = xmlhttp.responseText;
-      var fields = rsp.split(" : ");
-      var artist = fields[0];
-      var album  = fields[1];
-      var track  = fields[2];
-      var t_now  = fields[3];
-      var t_end  = fields[4];
-      xmlhttp.send(null)
-      document.links[0].text = "&raquo;" + artist + "&raquo;" + album + "&raquo;"
-    }
-  }
-}
-
+// Javascript for Adorno Music Player
+
+var base_url = /(https?:\/\/[a-z0-9.-]+\/)/i.exec(document.URL)
+base_url = base_url[0];
+
+
+////////////////////////////////////////////////////////////////
+// Toggle the Artist/Album/Genre/Stream selection
+////////////////////////////////////////////////////////////////
+function toggle_type() {
+  var type_span = document.getElementById('current_type');
+  var type = type_span.innerHTML.toLowerCase();
+  var old_type = type;
+
+  if ( type == 'artist' )       { type = 'album'; }
+  else if ( type == 'album' )   { type = 'stream'; }
+  else if ( type == 'stream' )  { type = 'genre'; }
+  else if ( type == 'genre' )   { type = 'artist'; }
+
+  type_span.innerHTML = type.substring(0,1).toUpperCase() + type.substring(1);
+
+  var alphabet = document.getElementById('alphabet').childNodes;
+  
+  var href;
+  var title;
+  var title_match = new RegExp('([0-9]+ )?' + old_type,'g');
+ 
+  for (var i = 0; i < alphabet.length; i++) {
+    href = alphabet[i].href;
+    alphabet[i].href = href.replace(old_type,type);
+//    if ( i == 2 ) {
+//      alert( href + "\n" + alphabet[i].href );
+//    }
+    title = alphabet[i].title;
+    alphabet[i].title = title.replace(title_match,type);
+  }
+
+  var search_form = document.getElementById('search_form');
+  for (var i=0; i < search_form.elements.length; i++ ) {
+    if ( search_form.elements[i].name == 'type' ) {
+      search_form.elements[i].value = type;
+      break;
+    }
+  }
+}
+
+
+var status_req = new XMLHttpRequest();
+var mytime;
+var redo_queue = true;
+
+function update_now_playing() {
+  var td = document.getElementById('now_playing');
+  status_req.open('GET', base_url + 'current.php', true);
+  status_req.onreadystatechange = function (aEvt) {
+    if ( status_req.readyState == 4 ) {
+      if ( status_req.status == 200 ) {
+        if ( td.innerHTML != status_req.responseText ) {
+          td.innerHTML = status_req.responseText;
+          var in_td = td.childNodes;
+          var title = '';
+          if ( in_td.length == 1 ) {
+            var nodecontent = status_req.responseText;
+            if ( nodecontent.match(/Nothing is currently playing/i) ) {
+              title = 'Adorno: stopped';
+            }
+            else if ( nodecontent.match(/paused/i) ) {
+              title = 'Adorno: paused';
+            }
+            in_td = in_td[0].childNodes;
+          }
+          for ( var i=0; i < in_td.length; i++ ) {
+            if ( in_td[i].innerHTML == undefined ) continue;
+            if ( title == '' )
+              title = in_td[i].innerHTML;
+            else
+              title = title + ' : ' + in_td[i].innerHTML;
+          }
+          document.title = title;
+          update_queue();
+        }
+        else if ( redo_queue )
+          update_queue();
+      }
+    }
+  };
+  status_req.send(null);
+  mytime=setTimeout('update_now_playing()',10000);
+}
+
+function update_queue() {
+  var td = document.getElementById('queue');
+  redo_queue = false;
+  status_req.open('GET', base_url + 'queue.php', true);
+  status_req.onreadystatechange = function (aEvt) {
+    if ( status_req.readyState == 4 ) {
+      if ( status_req.status == 200 ) {
+        td.innerHTML = status_req.responseText;
+      }
+      else
+        redo_queue = true;
+    }
+  };
+  status_req.send(null);
+}
+
+
+var last_action_result = '';
+function act() {
+  var argv = act.arguments;
+  var argc = argv.length;
+
+  if ( argc < 1 || argc > 2 ) {
+    alert( 'act(action,details) - only 1 or two arguments, not ' + argc + ' please!' );
+    return;
+  }
+
+  var action = argv[0];
+  var details = '';
+  if ( argc == 2 ) details = argv[1];
+
+  var act_req = new XMLHttpRequest();
+  status_req.open('GET', base_url + 'action.php?action=' + action + details, true);
+  status_req.onreadystatechange = function (aEvt) {
+    if ( status_req.readyState == 4 ) {
+      if ( status_req.status == 200 ) {
+        last_action_result = 'success';
+        redo_queue = true;
+        update_now_playing();
+      }
+      else {
+        redo_queue = true;
+        last_action_result = 'failure';
+      }
+    }
+  };
+  status_req.send(null);
+}
+
+
+function enqueue(artist,album,track) {
+  var details = '&l=' + album;
+  if ( artist != '' ) details = details + '&a=' + artist;
+  if ( track != '' ) details = details + '&t=' + track;
+  act('enqueue',details);
+}
+
+
+mytime=setTimeout('update_now_playing()',1000);
diff --git a/www/index.php b/www/queue.php
similarity index 70%
copy from www/index.php
copy to www/queue.php
index d3f76ce..37e259e 100644
--- a/www/index.php
+++ b/www/queue.php
@@ -1,23 +1,17 @@
 <?php
   include('always.php');
-  require_once("Session.php");
-  require_once("PlayTracks.php");
 
-  $title = $system_name;
-  require_once("header.php");
+header( 'Content-type: text/plain');
 
 function track_link( $trk, $link_title, $row_class = "" ) {
-  global $letter_get;
-
-  $track_link_url = sprintf( "?l=%s&a=%s&t=%s", urlencode($trk->album), urlencode($trk->artist)
-, urlencode($trk->title) );
+  $track_link_url = sprintf( "?l=%s&a=%s&t=%s", urlencode($trk->album),
+                                     urlencode($trk->artist), urlencode($trk->title) );
   $safe_title = htmlspecialchars($link_title);
   $duration = preg_replace( "/^[0:]{1,4}/", "", $trk->duration );
   $link = <<<EOHTML
 <tr class="track$row_class">
   <td class="track$row_class">
-    <a class="track$row_class" href="artist.php$track_link_url$letter_get" title="$trk->path_na
-me">$safe_title</a>
+    <a class="track$row_class" href="artist.php$track_link_url" title="$trk->path_name">$safe_title</a>
   </td>
   <td class="track$row_class">$duration</td>
   <th class="track$row_class">
@@ -34,22 +28,20 @@ EOHTML;
 $album_artist_fmt = <<<EOHTML
 
 <tr class="q_headline">
-  <td class="q_cell" colspan="3">
+  <td class="q_cell" colspan="4">
     %s
   </td>
 </tr>
 EOHTML;
 
-$artist_link_fmt = '<a href="/artist.php?a=%s"><span class="q_artist">%s</span></a>';
-$album_link_fmt  = '<a href="/album.php?l=%s"><span class="q_album">%s</span></a>';
+$artist_link_fmt = '<a href="/?type=artist&a=%s"><span class="q_artist">%s</span></a>';
+$album_link_fmt  = '<a href="/?type=album&l=%s"><span class="q_album">%s</span></a>';
 
 $track_fmt = <<<EOHTML
 
-<tr class="q_row">
+<tr class="q_row r%d">
   <td class="q_cell" title="Position in queue">%d</td>
-  <td class="q_cell" title="Track number and name">
-    <span class="q_title">%d - %s</span>
-  </td>
+  <td class="q_title" title="Track number and name">%d - %s</td>
   <td class="q_cell" title="When this track will start playing">%s</td>
   <td class="q_cell"><a href="/?i=%d&d=up">up</a> <a href="/?i=%d&d=dn">dn</a></td>
 </tr>
@@ -57,7 +49,9 @@ EOHTML;
 
 $current_track = current_track();
 $tracks = current_queue();
-echo '<table id="queue">';
+
+// print_r( $tracks );
+
 $last_artist = "";
 $last_album = "";
 $when = $current_track->finishing;
@@ -67,6 +61,7 @@ for( $k=0; isset($tracks[$k]); $k++ ) {
   $escape_artist = urlencode($v->artist);
   $escape_album  = urlencode($v->album);
 
+
   if ( $escape_artist != $last_artist || $escape_album != $last_album ) {
     if ( $escape_artist != $last_artist && $escape_album != $last_album ) {
       $links = sprintf( $album_link_fmt, $escape_album, $v->album);
@@ -82,12 +77,8 @@ for( $k=0; isset($tracks[$k]); $k++ ) {
     $last_artist = $escape_artist;
     $last_album = $escape_album;
   }
-  printf( $track_fmt, $position, $v->tracknum, $v->title, date('H:i:s', $when ), $position, $position );
+  printf( $track_fmt, ($position %2), $position, $v->tracknum,
+                         $v->title, date('H:i:s', $when ), $position, $position );
   $when += $v->dur_secs;
 
 }
-echo "</table>\n";
-?>
-
-</body>
-</html>
-- 
2.11.4.GIT