Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Rudi Grinberg 2012-09-13 15:05:48 -04:00
parent 05f4bb64b2 14db5053b1
commit 410a3406af
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/controllers/AudiopreviewController.php
View File

@ -184,6 +184,7 @@ class AudiopreviewController extends Zend_Controller_Action
'element_artist' => isset($track['artist_name'])?$track['artist_name']:"", 'element_artist' => isset($track['artist_name'])?$track['artist_name']:"",
'element_id' => isset($track['id'])?$track['id']:"", 'element_id' => isset($track['id'])?$track['id']:"",
'element_position' => isset($track['position'])?$track['position']:"", 'element_position' => isset($track['position'])?$track['position']:"",
'mime' => isset($track['mime'])?$track['mime']:""
); );
/* If the track type is static we know it must be /* If the track type is static we know it must be

3
airtime_mvc/application/models/Preference.php
View File

@ -1095,7 +1095,8 @@ class Application_Model_Preference
public static function getCurrentLibraryTableSetting() public static function getCurrentLibraryTableSetting()
{ {
$v = self::getValue("library_datatable"); $v = self::getValue("library_datatable");
if( $v === '' ) {
if ( $v === '' ) {
return function ($x) { return $x; }; return function ($x) { return $x; };
} else { } else {
$ds = unserialize($v); $ds = unserialize($v);

3
airtime_mvc/application/models/Schedule.php
View File

@ -782,7 +782,10 @@ SQL;
$media_id = $item['stream_id']; $media_id = $item['stream_id'];
$uri = $item['url']; $uri = $item['url'];
self::createStreamScheduleEvent($data, $item, $media_id, $uri); self::createStreamScheduleEvent($data, $item, $media_id, $uri);
} else {
throw new Exception("Unknown schedule type: ".print_r($item, true));
} }
} }
} }

2
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
View File

@ -143,7 +143,7 @@ function buildplaylist(p_url, p_playIndex) {
mp3:data[index]['uri'] mp3:data[index]['uri']
}; };
} }
if (media) { if (media && isAudioSupported(data[index]['mime'])) {
myPlaylist[index] = media; myPlaylist[index] = media;
} }
// we should create a map according to the new position in the // we should create a map according to the new position in the

7
airtime_mvc/public/js/airtime/common/audioplaytest.js
View File

@ -9,5 +9,10 @@ function isAudioSupported(mime){
bMime = mime; bMime = mime;
} }
return !!bMime && !!audio.canPlayType && audio.canPlayType(bMime) != ""; //return a true of the browser can play this file natively, or if the
//file is an mp3 and flash is installed (jPlayer will fall back to flash to play mp3s).
//Note that checking the navigator.mimeTypes value does not work for IE7, but the alternative
//is adding a javascript library to do the work for you, which seems like overkill....
return (!!audio.canPlayType && audio.canPlayType(bMime) != "") ||
(mime.indexOf("mp3") != -1 && navigator.mimeTypes ["application/x-shockwave-flash"] != undefined);
} }