Remove support for Odeo

README.markdown

@@ -86,6 +86,7 @@ The following have recently been removed:
 * `subscribe_*` (except `subscribe_url`)
 * `utf8_bad_replace`
 * `set_javascript` (See `SimplePie_Misc::output_javascript()`)
+* Support for Odeo
 
 ### Deprecated
 The following have recently been deprecated:

SimplePie/Enclosure.php

@@ -529,7 +529,7 @@ public function get_framerate()
 	/**
 	 * Get the preferred handler
 	 *
-	 * @return string|null One of 'odeo', 'flash', 'fmedia', 'quicktime', 'wmedia', 'mp3'
+	 * @return string|null One of 'flash', 'fmedia', 'quicktime', 'wmedia', 'mp3'
 	 */
 	public function get_handler()
 	{
@@ -1125,21 +1125,8 @@ public function embed($options = '', $native = false)
 
 		$embed = '';
 
-		// Odeo Feed MP3's
-		if ($handler === 'odeo')
-		{
-			if ($native)
-			{
-				$embed .= '<embed src="http://odeo.com/flash/audio_player_fullsize.swf" pluginspage="http://adobe.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="440" height="80" wmode="transparent" allowScriptAccess="any" flashvars="valid_sample_rate=true&external_url=' . $this->get_link() . '"></embed>';
-			}
-			else
-			{
-				$embed .= '<script type="text/javascript">embed_odeo("' . $this->get_link() . '");</script>';
-			}
-		}
-
 		// Flash
-		elseif ($handler === 'flash')
+		if ($handler === 'flash')
 		{
 			if ($native)
 			{
@@ -1217,16 +1204,10 @@ public function embed($options = '', $native = false)
 	 *
 	 * @see get_type()
 	 * @param bool $find_handler Internal use only, use {@see get_handler()} instead
-	 * @return string MIME type or 'odeo'
+	 * @return string MIME type
 	 */
 	public function get_real_type($find_handler = false)
 	{
-		// If it's Odeo, let's get it out of the way.
-		if (substr(strtolower($this->get_link()), 0, 15) === 'http://odeo.com')
-		{
-			return 'odeo';
-		}
-
 		// Mime-types by handler.
 		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
 		$types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player

SimplePie/Misc.php

@@ -2252,10 +2252,6 @@ public static function output_javascript()
 		header('Cache-Control: must-revalidate');
 		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
 		?>
-function embed_odeo(link) {
-	document.writeln('<embed src="http://odeo.com/flash/audio_player_fullsize.swf" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="440" height="80" wmode="transparent" allowScriptAccess="any" flashvars="valid_sample_rate=true&external_url='+link+'"></embed>');
-}
-
 function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
 	if (placeholder != '') {
 		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');