From 1a164ba699716b5a6d71cdadf64fe9db4a4ed89b Mon Sep 17 00:00:00 2001 From: Paul Arthur Date: Mon, 28 Jan 2013 13:06:47 -0500 Subject: Yank out the Flash player by the roots. --- lib/class/stream.class.php | 3 --- lib/class/stream_playlist.class.php | 47 ------------------------------------- 2 files changed, 50 deletions(-) (limited to 'lib/class') diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 7304891c..c2d77e95 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -373,9 +373,6 @@ class Stream { // If this wasn't ajax included run away if (!defined('AJAX_INCLUDE')) { return false; } - // If we're doin the flash magic then run away as well - if (Config::get('play_type') == 'xspf_player') { return false; } - switch (Config::get('playlist_method')) { default: case 'clear': diff --git a/lib/class/stream_playlist.class.php b/lib/class/stream_playlist.class.php index 1f8b4b88..6ddb158e 100644 --- a/lib/class/stream_playlist.class.php +++ b/lib/class/stream_playlist.class.php @@ -159,7 +159,6 @@ class Stream_Playlist { switch($type) { case 'democratic': case 'localplay': - case 'xspf_player': case 'html5_player': // These are valid, but witchy $redirect = false; @@ -350,52 +349,6 @@ class Stream_Playlist { } // create_xspf - /** - * create_xspf_player - * Due to the fact that this is an integrated player (flash) we actually - * have to do a little 'cheating' to make this work. - * We are going to take advantage of tmp_playlists to do all of this - * hotness - */ - public function create_xspf_player() { - debug_event('stream_playlist', 'Creating XSPF player', 5); - /* Build the extra info we need to have it pass */ - $play_info = "?action=show&tmpplaylist_id=" . $GLOBALS['user']->playlist->id; - - // start ugly evil javascript code - //FIXME: This needs to go in a template, here for now though - //FIXME: This preference doesn't even exists, we'll eventually - //FIXME: just make it the default - if (Config::get('embed_xspf') == 1 ){ - header("Location: ".Config::get('web_path')."/index.php?xspf&play_info=".$GLOBALS['user']->playlist->id); - } - else { - echo "\n"; - echo "" . Config::get('site_title') . "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - } - } // create_xspf_player - /** * create_html5_player * -- cgit