diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-28 13:06:47 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-28 13:26:11 -0500 |
| commit | 1a164ba699716b5a6d71cdadf64fe9db4a4ed89b (patch) | |
| tree | 566bc5c32c8b0b0e33a4082eda102659f4143b43 /lib | |
| parent | 17613d090558dc2cd5e28e97917fe873c631e3ba (diff) | |
| download | ampache-1a164ba699716b5a6d71cdadf64fe9db4a4ed89b.tar.gz ampache-1a164ba699716b5a6d71cdadf64fe9db4a4ed89b.tar.bz2 ampache-1a164ba699716b5a6d71cdadf64fe9db4a4ed89b.zip | |
Yank out the Flash player by the roots.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/stream.class.php | 3 | ||||
| -rw-r--r-- | lib/class/stream_playlist.class.php | 47 | ||||
| -rw-r--r-- | lib/preferences.php | 3 |
3 files changed, 0 insertions, 53 deletions
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; @@ -351,52 +350,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 "<html><head>\n"; - echo "<title>" . Config::get('site_title') . "</title>\n"; - echo "<script language=\"javascript\" type=\"text/javascript\">\n"; - echo "<!-- begin\n"; - echo "function PlayerPopUp(URL) {\n"; - // We do a little check here to see if it's a Wii! - if (false !== stristr($_SERVER['HTTP_USER_AGENT'], 'Nintendo Wii')) { - echo "window.location=URL;\n"; - } - // Else go ahead and do the normal stuff - else { - echo "window.open(URL, 'XSPF_player', 'width=400,height=170,scrollbars=0,toolbar=0,location=0,directories=0,status=0,resizable=0');\n"; - echo "window.location = '" . return_referer() . "';\n"; - echo "return false;\n"; - } - echo "}\n"; - echo "// end -->\n"; - echo "</script>\n"; - echo "</head>\n"; - - echo "<body onLoad=\"javascript:PlayerPopUp('" . Config::get('web_path') . "/modules/flash/xspf_player.php" . $play_info . "')\">\n"; - echo "</body>\n"; - echo "</html>\n"; - } - } // create_xspf_player - - /** * create_html5_player * * Creates an html5 player. diff --git a/lib/preferences.php b/lib/preferences.php index eeef5646..b59025c7 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -165,7 +165,6 @@ function create_preference_input($name,$value) { case 'condPL': case 'rio_track_stats': case 'rio_global_stats': - case 'embed_xspf': case 'direct_link': if ($value == '1') { $is_true = "selected=\"selected\""; } else { $is_false = "selected=\"selected\""; } @@ -177,7 +176,6 @@ function create_preference_input($name,$value) { case 'play_type': if ($value == 'localplay') { $is_local = 'selected="selected"'; } elseif ($value == 'democratic') { $is_vote = 'selected="selected"'; } - elseif ($value == 'xspf_player') { $is_xspf_player = 'selected="selected"'; } elseif ($value == 'html5_player') { $is_html5_player = 'selected="selected"'; } else { $is_stream = "selected=\"selected\""; } echo "<select name=\"$name\">\n"; @@ -191,7 +189,6 @@ function create_preference_input($name,$value) { if (Config::get('allow_localplay_playback')) { echo "\t<option value=\"localplay\" $is_local>" . T_('Localplay') . "</option>\n"; } - echo "\t<option value=\"xspf_player\" $is_xspf_player>" . T_('Flash Player') . "</option>\n"; echo "\t<option value=\"html5_player\" $is_html5_player>" . _('HTML5 Player') . "</option>\n"; echo "</select>\n"; break; |