Skip to content

Commit 254c147

Browse files
committed
fixed 59.94 ndf timecodes
1 parent 617c92e commit 254c147

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ To run the tests in a browser environment, open the `test/smpte-timecode-test.ht
100100
in a browser.
101101

102102
## Update History
103+
- 1.3.6
104+
- fix for #42 - 59.94 and 29.97 non-drop-frame timecodes would not initialize properly
103105
- 1.3.5
104106
- packaging fix
105107
- 1.3.4

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "smpte-timecode",
3-
"version": "1.3.5",
3+
"version": "1.3.6",
44
"description": "JavaScript implementation of SMPTE timecode type",
55
"main": "smpte-timecode.js",
66
"scripts": {

smpte-timecode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
// we got a fractional, we'll assume it's a 29.97, 23.98, 59.94 or something of the sort
4747
this.frameRateNum = frameRateRound*1000;
4848
this.frameRateDen = 1001;
49-
if (frameRateRound != 24) this.dropFrame = true;
49+
if (frameRateRound != 24 && typeof(dropFrame) !== 'boolean') this.dropFrame = true;
5050
}
5151
}
5252
break;

test/smpte-timecode-test.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,4 +292,10 @@ describe('Issues', function() {
292292
expect(t.frameCount).to.be(2112);
293293
expect(Timecode('12:34:56:578',600).toString()).to.be('12:34:56:578');
294294
});
295+
296+
it ('#42 59.94 NDF Time Codes', function(){
297+
var t = new Timecode(123456, 59.95, false);
298+
expect(t.dropFrame).to.be(false);
299+
});
300+
295301
});

0 commit comments

Comments
 (0)