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

Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

Browse source
This commit is contained in:
denise 2012-06-12 14:58:51 -04:00
commit df518fb03f
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
View file

@ -166,25 +166,23 @@ function play(p_playlistIndex){
*/
function playOne(p_audioFileID) {
var playlist = new Array();
var fileExtensioin = p_audioFileID.split('.').pop();
console.log(p_audioFileID);
if (fileExtensioin === 'mp3') {
var fileExtension = p_audioFileID.split('.').pop();
if (fileExtension.toLowerCase() === 'mp3') {
media = {title: $('.audioFileTitle').text() !== 'null' ?$('.audioFileTitle').text():"",
artist: $('.audioFileArtist').text() !== 'null' ?$('.audioFileArtist').text():"",
mp3:"/api/get-media/file/"+p_audioFileID
};
}else if (fileExtensioin === 'ogg' ) {
}else if (fileExtension.toLowerCase() === 'ogg' ) {
media = {title: $('.audioFileTitle').text() != 'null' ?$('.audioFileTitle').text():"",
artist: $('.audioFileArtist').text() != 'null' ?$('.audioFileArtist').text():"",
oga:"/api/get-media/file/"+p_audioFileID
};
}
_playlist_jplayer.option("autoPlay", true);
console.log(media);
playlist[0] = media;
//_playlist_jplayer.setPlaylist(playlist); --if I use this the player will call _init on the setPlaylist and on the ready
_playlist_jplayer._initPlaylist(playlist);
_playlist_jplayer.play(0);
window.resizeTo(490, 167);
}
}