summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-09-28 15:33:59 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-09-28 15:33:59 +0000
commit13852c51ea25a25e3629c7df79894ea51c91f3dd (patch)
tree2532b19509266f82d16d07dd2be16531b9581452
parent79ca59df627660d635a9373bfeb293592c173793 (diff)
downloadampache-13852c51ea25a25e3629c7df79894ea51c91f3dd.tar.gz
ampache-13852c51ea25a25e3629c7df79894ea51c91f3dd.tar.bz2
ampache-13852c51ea25a25e3629c7df79894ea51c91f3dd.zip
stupid mistake that broke all streaming
-rw-r--r--lib/class/stream.class.php2
-rw-r--r--localplay.php3
-rw-r--r--themes/greysme/templates/default.css8
3 files changed, 10 insertions, 3 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index ffd4be6f..96749e15 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -512,7 +512,7 @@ class Stream {
* auto_init
* This is called on class load it sets the session
*/
- public static function auto_init() {
+ public static function _auto_init() {
// Generate the session ID
self::$session = md5(uniqid(rand(), true));;
diff --git a/localplay.php b/localplay.php
index c808270c..8ab9ca1c 100644
--- a/localplay.php
+++ b/localplay.php
@@ -47,6 +47,9 @@ switch ($_REQUEST['action']) {
$localplay = new Localplay($GLOBALS['user']->prefs['localplay_controller']);
$localplay->add_instance($_POST);
break;
+ case 'show_songs':
+
+ break;
case 'delete_song':
$song_id = scrub_in($_REQUEST['song_id']);
$songs = array($song_id);
diff --git a/themes/greysme/templates/default.css b/themes/greysme/templates/default.css
index c509423a..e7d11213 100644
--- a/themes/greysme/templates/default.css
+++ b/themes/greysme/templates/default.css
@@ -390,8 +390,12 @@ h3#content_title span {} /* Doesn't exist anymore (?) */
color:#111;
}
-/* SIDEBAR : Search */
-/********************/
+/* SIDEBAR : Localplay */
+/***********************/
+
+.active_instance {
+
+}
/* SIDEBAR : Preferences */
/*************************/