From c522a2c1e97518d21e351821c27a9188e0cb3a1d Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Fri, 17 Nov 2006 06:30:36 +0000
Subject: some bug fixes and tweaks

---
 lib/class/stream.class.php | 17 ++++++++++++++---
 lib/preferences.php        |  2 +-
 lib/ui.lib.php             |  4 ++++
 3 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index 503fd9bf..6a5599a2 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -77,6 +76,18 @@ class Stream {
 
 	} // start
 
+	/**
+	 * manual_url_add
+	 * This manually adds a URL to the stream object for passing
+	 * to whatever, this is an exception for when we don't actually
+	 * have a object_id but instead a weird or special URL
+	 */
+	function manual_url_add($url) { 
+
+
+
+	} // manual_url_add
+
 	/*!
 		@function create_simplem3u
 		@discussion this creates a simple m3u
diff --git a/lib/preferences.php b/lib/preferences.php
index e46ad8e0..39755735 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -323,7 +323,7 @@ function create_preference_input($name,$value) {
 			echo "<select name=\"$name\">\n";
 			echo "<option value=\"0\">" . _('Disabled') . "</option>\n";
 			echo "<option value=\"1\" $is_global>" . _('Global') . "</option>\n";
-			echo "<option value=\"2\" $is_full>" . _('Full') . "</option>\n";
+			echo "<option value=\"2\" $is_full>" . _('Local') . "</option>\n";
 			echo "</select>\n";
 		break;
 		case 'theme_name':
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 6a20f387..c1f676ee 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -330,6 +330,10 @@ function get_now_playing($filter='') {
 
 	$sql = "SELECT song_id,user FROM now_playing ORDER BY start_time DESC";
 	$db_results = mysql_query($sql, dbh());
+
+	$results = array();
+	
+	/* While we've got stuff playing */
 	while ($r = mysql_fetch_assoc($db_results)) {
 		$song = new Song($r['song_id']);
 		$song->format_song();
-- 
cgit