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

CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor.

Browse source
This commit is contained in:
Naomi 2013-04-25 17:10:37 -04:00
parent 0deaee4d0e
commit 8fea97d580
4 changed files with 104 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1120,16 +1120,29 @@ var AIRTIME = (function(AIRTIME){
src: $fadeOut.data("fadeout"),
cuein: $fadeOut.data("cuein"),
cueout: $fadeOut.data("cueout"),
moveable: false
moveable: false,
fades: [{
shape: $fadeOut.data("type"),
type: "FadeOut",
end: $fadeOut.data("cueout") - $fadeOut.data("cuein"),
start: $fadeOut.data("cueout") - $fadeOut.data("cuein") - $fadeOut.data("length")
}]
},
{
src: $fadeIn.data("fadein"),
start: $fadeIn.data("offset"),
cuein: $fadeIn.data("cuein"),
cueout: $fadeIn.data("cueout")
cueout: $fadeIn.data("cueout"),
fades: [{
shape: $fadeIn.data("type"),
type: "FadeIn",
end: $fadeIn.data("length"),
start: 0
}]
}
],
dim = AIRTIME.utilities.findViewportDimensions();
dim = AIRTIME.utilities.findViewportDimensions(),
playlistEditor;
$html.dialog({
modal: true,
@ -1139,8 +1152,14 @@ var AIRTIME = (function(AIRTIME){
width: dim.width - 100,
height: dim.height - 100,
buttons: [
//{text: "Submit", click: function() {doSomething()}},
{text: "Cancel", click: function() {$(this).dialog("close");}}
{text: "Save", click: function() {
var json = playlistEditor.getJson();
var x;
}},
{text: "Cancel", click: function() {
$(this).dialog("close");
}}
],
open: function (event, ui) {
@ -1154,7 +1173,7 @@ var AIRTIME = (function(AIRTIME){
timeFormat: 'hh:mm:ss.u'
});
var playlistEditor = new PlaylistEditor();
playlistEditor = new PlaylistEditor();
playlistEditor.setConfig(config);
playlistEditor.init(tracks);
}