Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts: airtime_mvc/public/js/airtime/library/library.js
This commit is contained in:
Naomi Aro
commit
a4d07b3060
|
|
@ -116,10 +116,9 @@ class ApiController extends Zend_Controller_Action
|
|||
return;
|
||||
}
|
||||
|
||||
$name = $this->_getParam("name");
|
||||
$filename = $this->_getParam("filename");
|
||||
|
||||
$file_id = substr($filename, 0, strpos($filename, "."));
|
||||
$fileID = $this->_getParam("fileID");
|
||||
$file_id = substr($fileID, 0, strpos($fileID, "."));
|
||||
|
||||
if (ctype_alnum($file_id) && strlen($file_id) == 32)
|
||||
{
|
||||
$media = Application_Model_StoredFile::RecallByGunid($file_id);
|
||||
|
|
@ -132,7 +131,7 @@ class ApiController extends Zend_Controller_Action
|
|||
$file_base_name = substr($file_base_name, 1);
|
||||
// possibly use fileinfo module here in the future.
|
||||
// http://www.php.net/manual/en/book.fileinfo.php
|
||||
$ext = pathinfo($filename, PATHINFO_EXTENSION);
|
||||
$ext = pathinfo($fileID, PATHINFO_EXTENSION);
|
||||
//Download user left clicks a track and selects Download.
|
||||
if ("true" == $this->_getParam('download')){
|
||||
//path_info breaks up a file path into seperate pieces of informaiton.
|
||||
|
|
@ -146,7 +145,7 @@ class ApiController extends Zend_Controller_Action
|
|||
header('Content-Disposition: attachment; filename="'.$file_base_name.'"');
|
||||
}else{
|
||||
//user clicks play button for track and downloads it.
|
||||
header("Content-Disposition: inline; filename=$file_base_name");
|
||||
header('Content-Disposition: inline; filename="'.$file_base_name.'"');
|
||||
}
|
||||
|
||||
$this->smartReadFile($filepath, $ext);
|
||||
|
|
|
|||
|
|
@ -198,8 +198,7 @@ class PlaylistController extends Zend_Controller_Action
|
|||
|
||||
public function audioPreviewPlayerAction()
|
||||
{
|
||||
$name = $this->_getParam('name');
|
||||
$fileName = $this->_getParam('filename');
|
||||
$fileID = $this->_getParam('fileID');
|
||||
$playlistIndex = $this->_getParam('index');
|
||||
|
||||
$request = $this->getRequest();
|
||||
|
|
@ -218,8 +217,7 @@ class PlaylistController extends Zend_Controller_Action
|
|||
$this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png";
|
||||
}
|
||||
|
||||
$this->view->name = $name;
|
||||
$this->view->fileName = $fileName;
|
||||
$this->view->fileName = $fileID;
|
||||
$this->view->playlistIndex= $playlistIndex;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -660,7 +660,7 @@ Logging::log("getting media! - 2");
|
|||
|
||||
if($type == "au"){//&& isset( $audioResults )) {
|
||||
$row['audioFile'] = $row['gunid'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION);
|
||||
$row['image'] = '<div class="big_play"><span class="ui-icon ui-icon-play"></span></div>';
|
||||
$row['image'] = '<div class="big_play"><img src="/css/images/icon_audioclip.png"></div>';
|
||||
}
|
||||
else {
|
||||
$row['image'] = '<img src="/css/images/icon_playlist.png">';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
<div id="content" class="jp-container">
|
||||
<span class='name'><?php echo "$this->name" ?></span>
|
||||
<span class='filename'><?php echo "$this->fileName" ?></span>
|
||||
<span class='fileID'><?php echo "$this->fileName" ?></span>
|
||||
<div id="jquery_jplayer_1" class="jp-jplayer"></div>
|
||||
<div id="jp_container_1" class="jp-audio">
|
||||
<div class="jp-type-single">
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ var AIRTIME = (function(AIRTIME) {
|
|||
|
||||
//add the play function to the library_type td
|
||||
$(nRow).find('td.library_type').click(function(){
|
||||
open_audio_preview(aData.track_title, aData.audioFile, aData.id);
|
||||
open_audio_preview(aData.audioFile, aData.id);
|
||||
return false;
|
||||
});
|
||||
|
||||
|
|
@ -360,7 +360,7 @@ var AIRTIME = (function(AIRTIME) {
|
|||
//define a play callback.
|
||||
if (oItems.play !== undefined) {
|
||||
callback = function() {
|
||||
open_audio_preview(data.track_title, data.audioFile, data.id);
|
||||
open_audio_preview(data.audioFile, data.id);
|
||||
};
|
||||
oItems.play.callback = callback;
|
||||
}
|
||||
|
|
@ -638,20 +638,16 @@ function addQtipToSCIcons(){
|
|||
|
||||
var audio_preview_window = null;
|
||||
|
||||
function open_audio_preview(name, filename, index) {
|
||||
url = 'Playlist/audio-preview-player/name/'+name+'/filename/'+filename+'/index/'+index;
|
||||
function open_audio_preview(fileID, index) {
|
||||
url = 'Playlist/audio-preview-player/fileID/'+fileID+'/index/'+index;
|
||||
//$.post(baseUri+'Playlist/audio-preview-player', {fileName: fileName, cueIn: cueIn, cueOut: cueOut, fadeIn: fadeIn, fadeInFileName: fadeInFileName, fadeOut: fadeOut, fadeOutFileName: fadeOutFileName})
|
||||
if (audio_preview_window == null || audio_preview_window.closed){
|
||||
audio_preview_window = window.open(url, 'Audio Player', 'width=400,height=95');
|
||||
} else if (!audio_preview_window.closed) {
|
||||
audio_preview_window.play(name, filename);
|
||||
audio_preview_window.play(fileID);
|
||||
} else {
|
||||
console.log("something else : "+baseUrl+url);
|
||||
}
|
||||
|
||||
//Set the play button to pause.
|
||||
//var elemID = "spl_"+elemIndexString;
|
||||
//$('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause");
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,49 +1,11 @@
|
|||
|
||||
|
||||
function audioPreview(filename, elemID){
|
||||
console.log("in the audio preview");
|
||||
var elems = $('.ui-icon.ui-icon-pause');
|
||||
elems.attr("class", "ui-icon ui-icon-play");
|
||||
|
||||
if ($("#jquery_jplayer_1").data("jPlayer") && $("#jquery_jplayer_1").data("jPlayer").status.paused != true){
|
||||
$('#jquery_jplayer_1').jPlayer('stop');
|
||||
return;
|
||||
}
|
||||
|
||||
var ext = getFileExt(filename);
|
||||
var uri = "/api/get-media/file/" + filename;
|
||||
|
||||
var media;
|
||||
var supplied;
|
||||
if (ext == "ogg"){
|
||||
media = {oga:uri};
|
||||
supplied = "oga";
|
||||
} else {
|
||||
media = {mp3:uri};
|
||||
supplied = "mp3";
|
||||
}
|
||||
|
||||
$("#jquery_jplayer_1").jPlayer("destroy");
|
||||
$("#jquery_jplayer_1").jPlayer({
|
||||
ready: function () {
|
||||
$(this).jPlayer("setMedia", media).jPlayer("play");
|
||||
},
|
||||
swfPath: "/js/jplayer",
|
||||
supplied: supplied
|
||||
});
|
||||
|
||||
$('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause");
|
||||
}
|
||||
|
||||
$(document).ready(function(){
|
||||
var filename = $(".filename").text();
|
||||
var name = $(".name").text();
|
||||
play(name, filename);
|
||||
var fileID = $(".fileID").text();
|
||||
play(fileID);
|
||||
});
|
||||
|
||||
function play(name, filename){
|
||||
var uri = "/api/get-media/name/"+name+"/filename/" + filename;
|
||||
var ext = getFileExt(filename);
|
||||
function play(fileID){
|
||||
var uri = "/api/get-media/fileID/" + fileID;
|
||||
var ext = getFileExt(fileID);
|
||||
|
||||
|
||||
var media;
|
||||
|
|
|
|||
|
|
@ -248,11 +248,10 @@ var AIRTIME = (function(AIRTIME){
|
|||
function openAudioPreview(event) {
|
||||
event.stopPropagation();
|
||||
|
||||
var name = $(this).parent().find('.spl_title').text();
|
||||
var audioFile = $(this).attr('audioFile');
|
||||
var id = "";
|
||||
|
||||
open_audio_preview(name, audioFile, id);
|
||||
open_audio_preview(audioFile, id);
|
||||
}
|
||||
|
||||
function editName() {
|
||||
|
|
|
|||
|
|
@ -89,12 +89,10 @@ div.jp-video div.jp-interface {
|
|||
}
|
||||
|
||||
/* Used to hide the filename field **/
|
||||
span.filename {
|
||||
display:none;
|
||||
}
|
||||
span.name {
|
||||
span.fileID {
|
||||
display:none;
|
||||
}
|
||||
|
||||
/* @group CONTROLS */
|
||||
|
||||
div.jp-controls-holder {
|
||||
|
|
|
|||
Loading…
Reference in New Issue