reduced the footprint of the random play bar and added a tv style page

6 files changed, 270 insertions, 4 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 4694af18..d6bbe00c 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,7 +3,15 @@
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
-  v.3.3.2-Alpha2
+  v.3.3.2-Alpha3
+	- Added 'Simple' Genre Bar (Thx sigger)
+	- Added initial TV page for viewing of nowplaying and additional 
+		information (Thx sigger)
+
+
+  
+--------------------------------------------------------------------------
+  v.3.3.2-Alpha2 08/14/2005
   	- Improved MPD URL method so it acts just like file method 
 		(Thx Sigger, Trey)
 	- Added Simplified Chinese (Thx Hongyi Gao)
diff --git a/index.php b/index.php
index c293668d..86c57b71 100644
--- a/index.php
+++ b/index.php
@@ -75,6 +75,11 @@ $action = scrub_in($_REQUEST['action']);
 		?>
 		</td>	
 	</tr>
+        <tr>
+                <td colspan="2" valign="top">
+                        <?php show_random_play_bar(); ?>
+                </td>
+        </tr>
 	<tr><td colspan="2">&nbsp;</td></tr>
 	<tr>
 		<td colspan="2">
@@ -125,12 +130,13 @@ $action = scrub_in($_REQUEST['action']);
 	                ?>
 	        </td>
 	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
+<!--	<tr><td colspan="2">&nbsp;</td></tr>
 	<tr>
 	        <td colspan="2" valign="top">
 	                <?php show_template('show_random_play'); ?>
 	        </td>
 	</tr>
+-->
 	</table>
 	</td>
 	<td valign="top">
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 4eab4cae..c7b4a758 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -721,4 +721,11 @@ function show_genre($genre_id) {
 
 } // show_genre
 
+function show_random_play_bar() {
+	
+	require (conf('prefix') . '/templates/show_random_play_bar.inc.php');
+	
+} // show_random_play_bar()
+
+
 ?>
diff --git a/modules/lib.php b/modules/lib.php
index 67a49077..a14e1d84 100644
--- a/modules/lib.php
+++ b/modules/lib.php
@@ -111,7 +111,7 @@ function show_flagged_popup($reason,$label='value', $name='flagged_type', $other
  *
  */
 
-function show_genre_pulldown ($genre, $complete) {
+function show_genre_pulldown ($genre, $complete, $lines= "10 MULTIPLE") {
 	
 	$dbh = dbh();
 
@@ -127,7 +127,7 @@ function show_genre_pulldown ($genre, $complete) {
 
 	$db_result = mysql_query($sql, $dbh);
 
-	echo "\n<select name=\"genre[]\" multiple=\"multiple\" size=\"6\">\n";
+        echo "<select name=\"genre[]\" size=".$lines.">\n";
 
 	if ( ! $complete ) {
 		$genre_info = get_genre_info( -1 );
diff --git a/randomplay.php b/randomplay.php
new file mode 100644
index 00000000..81250d3c
--- /dev/null
+++ b/randomplay.php
@@ -0,0 +1,135 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2005 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+/*!
+	@header Index of Ampache
+	@discussion Do most of the dirty work of displaying the mp3 catalog
+
+*/
+require_once("modules/init.php");
+show_template('header');
+init_mpd();
+show_menu_items('Home');
+show_clear();
+$action = scrub_in($_REQUEST['action']);
+
+if (conf('refresh_interval')) { 
+	show_template('javascript_refresh');
+	}
+?>
+<b><?php echo $user->username._(", welcome to Argyle Manor - Family Room.  "); ?></b>
+
+
+<!-- Big Daddy Table -->
+<table style="padding-left:5px;padding-right:5px;padding-top:5px;padding-bottom:5px;" >
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr>
+	<td valign="top">
+
+<?php
+/*
+ * show_random_play()
+ * 
+
+function show_random_play() {
+ */
+        $web_path = conf('web_path');
+
+        print '
+        <form name="random" method="post" enctype="multipart/form-data" action="' . $web_path . '/song.php">
+        <input type="hidden" name="action" value="m3u" />
+        <table class="border" border="0" cellpadding="3" cellspacing="1" width="100%">
+        <tr class="table-header">
+                <td colspan="4">' . _("Play Random Selection from Multiple Genres") . '</td>
+
+        </tr>
+        <tr class="even">
+        <td>
+        <table border="0">
+                <tr class="even">
+                <td>' . _("Item count") .'</td>
+                <td>
+                        <select name="random">
+                        <option value="-1">' . _("All") . '</option>
+                        <option value="1">1</option>
+                        <option value="5">5</option>
+                        <option value="10">10</option>
+                        <option value="20">20</option>
+                        <option value="30">30</option>
+                        <option value="50">50</option>
+                        <option value="100">100</option>
+                        <option value="500">500</option>
+                        <option value="1000">1000</option>
+                        </select></td>
+                <td rowspan="3" valign="top"> ' . _("From genre") . '</td>
+                <td rowspan="4">
+';
+        show_genre_pulldown( -1, 0, "33 MULTIPLE" );
+
+        print '
+                </td></tr>
+        <tr class="even">
+                <td>
+                        ' . _("Favor Unplayed") . ' <br />
+                        ' . _("Full Albums") . ' <br />
+                        ' . _("Full Artist") . '
+                </td>
+                <td>
+                        <input type="checkbox" id="unplayed" name="unplayed" value="1" onclick="flipField(\'album\');flipField(\'artist\')" />$
+                        <input type="checkbox" id="album" name="full_album" value="1" onclick="flipField(\'unplayed\');flipField(\'artist\')" $
+                        <input type="checkbox" id="artist" name="full_artist" value="1" onclick="flipField(\'unplayed\');flipField(\'album\')"$
+                </td>
+                </tr>
+                <tr class="even">
+                <td nowrap> ' . _("from catalog") . '</td>
+                <td>
+';
+
+        show_catalog_pulldown( -1, 0);
+
+        print '
+        </tr>
+        <tr>
+                <td colspan="4">
+                        <input type="hidden" name="aaction" value="Play!" />
+                        <input class="button" type="submit" name="aaction" value="' . _("Play Random Songs") . '" />
+                </td>
+        </tr>
+        </table>
+        </td></tr>
+        </table>
+        </form>
+';
+
+/* 
+} // show_random_play()
+ */
+?>
+
+</tr>
+</table>
+
+<?php show_menu_items('Home'); ?>
+</body>
+</html>
+<script language="javascript">document.search.search_string.focus();</script>
+
diff --git a/tv.php b/tv.php
new file mode 100644
index 00000000..c6d34bae
--- /dev/null
+++ b/tv.php
@@ -0,0 +1,110 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2005 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+/*!
+	@header TV Display for Ampache
+	@discussion BIG now playing and (soon) on deck
+*/
+require("modules/init.php");
+init_mpd();
+show_template('style');
+
+if (conf('refresh_interval')) { 
+	echo '<script language="JavaScript" type="text/javascript"> var mpd_elapsed = '.$myMpd->current_track_position." </script>\n";
+	echo '<script language="JavaScript" type="text/javascript"> var mpd_song_length = '.$myMpd->current_track_length." </script>\n";
+	echo '<script language="JavaScript" type="text/javascript"> var mpd_state = "'.$myMpd->state.'" </script>';
+	show_template('javascript_refresh'); 
+	}
+?>
+
+<?php
+$dbh = dbh();
+$web_path = conf('web_path');
+
+/* get playlist */
+
+if ($user->prefs['play_type'] == 'mpd') {
+$mpddir = conf('mpd_dir')."/";
+$sql = "SELECT song.id FROM song WHERE file = \"".
+                $mpddir.$myMpd->playlist[$myMpd->current_track_id]['file']."\"";
+        $db_results = @mysql_query($sql,dbh());
+        while ($r = mysql_fetch_assoc($db_results)) {
+                $song = new Song($r['id']);
+                $song->format_song();
+                $np_user = new User(0,$user->id);
+                $results[] = array('song'=>$song,'user'=>$np_user);
+        } // end while
+
+}
+else {
+        $sql = "SELECT song_id,user_id FROM now_playing ORDER BY start_time DESC";
+        $db_results = mysql_query($sql, dbh());
+        while ($r = mysql_fetch_assoc($db_results)) {
+                $song = new Song($r['song_id']);
+                $song->format_song();
+                $np_user = new User(0,$r['user_id']);
+                $results[] = array('song'=>$song,'user'=>$np_user);
+        } // end while
+     } // end else
+
+?>
+
+<?php if (count($results)) { ?>
+<!-- Big Daddy Table -->
+
+<table style="border: thin solid #000000; margin: 25 0  0 25px" class = "body" cellspacing="1" cellpadding="3" border="0" width=900>
+  <tr>
+    <td  class="rowheader" style="background:#F6F600;font: italic 25 pt 'Times Roman', serif" colspan="2"><?php echo _("Now Playing"); ?></td>
+  </tr>
+<?php
+foreach($results as $item) { 
+	$song = $item['song'];
+	$np_user = $item['user'];
+	if (is_object($song)) {
+        	echo '<tr><td>';
+		echo "<table>\n";
+/*		echo '<tr style="background:#F6F670"><td style="font: 35 pt Arial, sans-serif; height:125px; width:500">'.$song->f_title."</td></tr>\n";
+		echo '<tr style="background:#F6F650"><td style="font: 35 pt Arial, sans-serif; height:125px">'.$song->f_artist."</td></tr>\n";
+		echo '<tr style="background:#F6F670"><td style="font: 35 pt Arial, sans-serif; height:125px">'.$song->get_album_name()."</td></tr>\n";
+*/
+		echo '<tr class="npsong"><td style="font: 35 pt Arial, sans-serif; height:125px; width:500">'.$song->f_title."</td></tr>\n";
+		echo '<tr class="npsong"><td style="font: 35 pt Arial, sans-serif; height:125px">'.$song->f_artist."</td></tr>\n";
+		echo '<tr class="npsong"><td style="font: 35 pt Arial, sans-serif; height:125px">'.$song->get_album_name()."</td></tr>\n";
+		echo "</table>\n";
+                if (conf('play_album_art')) {
+                	echo "\t<td align=\"center\">";
+                        echo "<a target=\"_blank\" href=\"" . conf('web_path') . "/albumart.php?id=" . $song->album . "\">";
+                        echo "<img align=\"middle\" border=\"0\" src=\"" . conf('web_path') . "/albumart.php?id=" . $song->album .
+			"&amp;fast=1\" alt=\"Album Art\" height=\"350\" />";
+                        echo "</a>\n";
+                        echo "\t</td>\n";
+                        echo "</tr>\n";
+                	} // if album art on now playing
+		else {
+			echo "\n<td>\n</tr>";
+		}
+        } // if it's a song
+} // while we're getting songs
+?>
+</table>
+<? } ?>
+