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

CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)

Browse source 
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
This commit is contained in:
Daniel 2012-03-05 18:59:31 -05:00
parent a246f85a5b
commit a09b63b8d0
12 changed files with 49 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/public/js/airtime/library/library.js
View file

@ -160,7 +160,7 @@
//add the play function to the library_type td
$(nRow).find('td.library_type').click(function(){
open_audio_preview(aData.audioFile, iDataIndex);
open_audio_preview(aData.track_title, aData.audioFile, aData.id);
return false;
});
@ -360,7 +360,7 @@
//define a play callback.
if (oItems.play !== undefined) {
callback = function() {
open_audio_preview(data.audioFile, data.id);
open_audio_preview(data.track_title, data.audioFile, data.id);
};
oItems.play.callback = callback;
}
@ -638,13 +638,13 @@
var audio_preview_window = null;
function open_audio_preview(filename, index) {
url = 'Playlist/audio-preview-player/filename/'+filename+'/index/'+index;
function open_audio_preview(name, filename, index) {
url = 'Playlist/audio-preview-player/name/'+name+'/filename/'+filename+'/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(filename);
audio_preview_window.play(name, filename);
} else {
console.log("something else : "+baseUrl+url);
}

69
airtime_mvc/public/js/airtime/library/preview.js
View file

@ -1,69 +0,0 @@
var audio_preview_window_p = null;
function playlistAudioPreviewEditor(filename, elemIndexString){
elemIndex =parseInt(elemIndexString)+1;//increment the index as tags start from 1 not 0
var cueIn = $("dd[id^=spl_cue_in_"+elemIndex+"]").find('span').html();
console.log(cueIn);
var cueOut = $("dd[id^=spl_cue_out_"+elemIndex+"]").find('span').html();
console.log("The cueOut is "+cueOut);
var fadeIn = $("dd[id^=spl_fade_in_"+elemIndex+"]").find('span').html();
if (fadeIn == undefined){ console.log("undefined fadein"); fadeIn = $("dd[id^=spl_fade_in_main]").find('span').html();}
console.log("The fadeIn is "+fadeIn);
var fadeInFileName = "";
if (fadeIn != undefined && parseInt(fadeIn) > 0 ){
//need to get the previous element in the playlist...but don't support previous playlist fading becuase thats not possible.
}
console.log("The fadeInFileName is "+fadeInFileName);
var fadeOut = $("dd[id^=spl_fade_out_"+elemIndex+"]").find('span').html();
if (fadeOut == undefined){ console.log("undefined fadeout"); fadeOut = $("dd[id^=spl_fade_out_main]").find('span').html();}
console.log("The fadeOut is "+fadeOut);
var fadeOutFileName = "";
if (fadeOut != undefined && parseInt(fadeOut) > 0 ){
//need to get the next element in the playlist...but don't support next playlist fading becuase thats not possible.
}
console.log("The fadeOutFileName is "+fadeOutFileName);
//Pop out a play list with cue in and cue out set.
open_player();
//Set the play button to pause.
var elemID = "spl_"+elemIndexString;
$('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause");
}
function open_audio_preview_old(filename, index) {
console.log("hello world 2 "+filename+" help?");
url = 'Playlist/audio-preview-player/filename/'+filename+'/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){
console.log("opening : "+baseUrl+url);
audio_preview_window = window.open(url, 'Audio Player', 'width=400,height=95');
} else if (!audio_preview_window.closed) {
console.log("refreshing : "+baseUrl+url);
audio_preview_window.play(filename);
} 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;
}
$('#library_type').bind('click', function(){
console.log(data);
});

7
airtime_mvc/public/js/airtime/library/preview_jplayer.js
View file

@ -37,11 +37,12 @@ function audioPreview(filename, elemID){
$(document).ready(function(){
var filename = $(".filename").text();
play(filename);
var name = $(".name").text();
play(name, filename);
});
function play(filename){
var uri = "/api/get-media/file/" + filename;
function play(name, filename){
var uri = "/api/get-media/name/"+name+"/filename/" + filename;
var ext = getFileExt(filename);

13
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -245,6 +245,16 @@ 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);
}
function editName() {
var nameElement = $(this),
playlistName = nameElement.text(),
@ -343,6 +353,9 @@ var AIRTIME = (function(AIRTIME){
$(el).delegate(".spl_cue",
{"click": openCueEditor});
//add the play function to the play icon
$(el).delegate(".big_play",
{"click": openAudioPreview});
}
//sets events dynamically for the cue editor.