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);
}