" + "0" + ms2npt(s.tcOutMs).replace(".", ",");
- srt += "\n";
- srt += text;
- srt += "\n\n";
- }
- else if (fmt == 'enc') {
- srt += srtNo + " " + ms2frames(s.tcInMs) + " " + ms2frames(s.tcOutMs) + " " + text;
- srt += "\n\n";
- }
- srtNo++;
}
+ srt.push({
+ 'in': s.tcInMs,
+ out: s.tcOutMs,
+ text: text
+ });
}
+ });
+ if (fmt == 'srt') {
+ return Ox.formatSRT(srt);
+ } else if (fmt == 'enc') {
+ return formatEnc(srt);
+ }
return srt;
}
@@ -241,24 +209,7 @@ TextArea.prototype.toSrt = function(fmt) {
this.spans = spans;
var srt = spansToSrt(spans, fmt);
//console.log(srt);
- return Ox.encodeUTF8(srt);
-}
-
-
-TextArea.prototype.addTime = function(ms, start_no) {
-//console.log(ms);
- this.toSrt();
- var s = [];
- var spans = this.spans;
- for (var i=0; i < spans.length;i++) {
- s[i] = {
- index: i,
- tcOutMs: spans[i].tcOutMs + ms,
- text: spans[i].text,
- tcInMs: spans[i].tcInMs + ms
- }
- }
- return spansToSrt(s, 'srt', start_no);
+ return srt;
}
@@ -270,7 +221,7 @@ TextArea.prototype.toHTML = function() {
span = spans[i];
txt = '';
txt += '\n';
- txt += '';
+ txt += '';
txt += (i + 1).toString();
txt += "\n";
txt += '
\n';
@@ -285,9 +236,9 @@ TextArea.prototype.toHTML = function() {
//creates new Span (tcIn and tcOut in npt format)
var Span = function(tcIn, tcOut, text, index) {
this.index = index;
- this.tcOutMs = npt2ms(tcOut);
+ this.tcOutMs = Ox.isString(tcOut) ? Ox.parseDuration(tcOut) : tcOut;
this.text = text;
- this.tcInMs = npt2ms(tcIn);
+ this.tcInMs = Ox.isString(tcOut) ? Ox.parseDuration(tcIn) : tcIn;
}
var SeekBar = function(elem) {
@@ -307,7 +258,7 @@ SeekBar.prototype.init = function() {
drag: function() {
clearInterval(videoListener);
var pos = that.get();
- $('#timeCode').html(ms2npt(pos));
+ $('#timeCode').html(Ox.formatDuration(pos, 3));
},
stop: function() {
var pos = that.get();
@@ -432,7 +383,7 @@ function loadCuts(url, id) {
pandora_api('get', {id: id, keys: ['cuts']}, function(result) {
var txt = '';
result.data.cuts.forEach(function(cut) {
- textArea.insertTc(ms2npt(cut));
+ textArea.insertTc(Ox.formatDuration(cut));
});
});
}
diff --git a/js/player.js b/js/player.js
index 330b40c..959c233 100644
--- a/js/player.js
+++ b/js/player.js
@@ -121,12 +121,12 @@ VideoPlayer.prototype.togglePause = function() {
VideoPlayer.prototype.listener = function() {
var t = Video.get();
- var npt = ms2npt(t);
+ var npt = Ox.formatDuration(t, 3);
$('#timeCode').html(npt);
var seekBarPos = parseInt((t/Video.duration) * 320);
$('#seekPointer').css("left", seekBarPos + "px");
- }
+}
VideoPlayer.prototype.setDuration = function(duration) {
this.duration = duration;
- }
+}
diff --git a/js/staticfuncs.js b/js/staticfuncs.js
index 2e3ac7d..70c36dd 100644
--- a/js/staticfuncs.js
+++ b/js/staticfuncs.js
@@ -1,88 +1,27 @@
-function npt2ms(npt) {
- var ms = 0.0
- npt = String(npt);
- var p = npt.split(':')
- for(i=0;i 3) {
- ms = ms.toString().substring(0,3);
- }
- ss = it % 60;
- mm = ((it - ss) / 60) % 60;
- hh = ((it - (mm * 60) - ss) / 3600) % 60;
- npt = hh+':'+strpad(mm.toString(), '0', 2, 'left')
- npt += ':'+strpad(ss.toString(), '0', 2, 'left')
- npt += '.'+strpad(ms.toString(), '0', 3, 'left')
- return npt;
-}
-
-function ms2frames(ms, fmt) {
- if (!fmt) var fmt = "PAL";
- var npt = ms2npt(ms);
+function formatFrames(seconds) {
+ var npt = Ox.formatDuration(seconds, 3);
var dotpos = npt.lastIndexOf(".");
var mmStr = npt.substring(dotpos + 1, npt.length);
var mmInt = parseInt(mmStr);
- if (fmt == 'PAL') {
- var frames = parseInt((mmInt / 1000) * 24);
- } else if (fmt == "NTSC") {
- var frames = parseInt((mmInt / 1000) * 29.97);
- }
+ var frames = parseInt((mmInt / 1000) * 24);
var framesTc = '';
var joinToken = ":";
var framesTc = npt.substring(0, dotpos ) + joinToken + frames;
return framesTc;
-}
-
-function ms2time(ms) {
- var npt = ms2npt(ms)
- return npt.substr(npt.length-9, npt.length-6);
-}
-
-
-function strpad(str, pad, len, dir) {
- while (str.length < len) {
- if (dir == 'left')
- str = pad + str;
- else if (dir == 'right')
- str = str + pad;
- }
- return str;
}
function isValidTimecode(tc) {
var tc = $.trim(tc);
var nptRegex = new RegExp("^[0-9][0-9]?\:[0-9][0-9]\:[0-9][0-9][\.|\,|\:][0-9]?[0-9]?[0-9]?$");
- return nptRegex.test(tc);to
-}
-
-//where filters is a JSON object, for eg. {'Video Files': '*.dv;*.ogg;*.ogv;*.ogx;*.avi;*.mov;*.mp4;*.mpeg;*.mpg;*.vob'}
-function selectFile(filters, callback) {
- alert('select file');
- //fixme. select file
- callback && callback(fp);
-}
-
-function getFileNameExt(filename) {
- var dotPos = filename.lastIndexOf(".");
- var ext = filename.substring(dotPos + 1, filename.length);
- return ext;
+ return nptRegex.test(tc);
}
function getFileNameSansExt(filename) {
var dotPos = filename.lastIndexOf(".");
if (dotPos != '-1') {
- var filenameSansExt = filename.substring(0,dotPos);
- } else {
+ var filenameSansExt = filename.substring(0, dotPos);
+ } else {
var filenameSansExt = filename;
- }
+ }
return filenameSansExt;
}