77//
88
99#import " TCMCommandLineUtility.h"
10- #import < QTKit/QTKit .h>
10+ #import < QTKit/QTKitDefines .h>
1111#import " TCMCaptureManager.h"
1212#import " FSArguments.h"
1313#import " FSArguments_Coalescer_Internal.h"
@@ -215,17 +215,6 @@ static void exception_handler(NSException *anException) {
215215 S_defaultHandler (anException);
216216}
217217
218- @interface QTCaptureDevice (SightSnapAdditions)
219- - (NSString *)localizedUniqueDisplayName ;
220- @end
221-
222- @implementation QTCaptureDevice (SightSnapAdditions)
223- - (NSString *)localizedUniqueDisplayName {
224- NSString *result = [NSString stringWithFormat: @" %@ [%@ - %@ ]" self .localizedDisplayName, self .modelUniqueID, self .uniqueID];
225- return result;
226- }
227- @end
228-
229218@interface AVCaptureDevice (SightSnapAdditions)
230219- (NSString *)localizedUniqueDisplayName ;
231220@end
@@ -374,7 +363,7 @@ - (int)run {
374363
375364 NSInteger terminalWidth = 80 ;
376365 if ([package booleanValueForSignature: help]) {
377- puts (" sightsnap v0.6 by @monkeydom"
366+ puts (" sightsnap v0.6.1 by @monkeydom"
378367 puts (" usage: sightsnap [options] [output[.jpg|.png]] [options]"
379368 puts (" "
380369 puts (" Default output filename is signtsnap.jpg - if no extension is given, jpg is used.\n If you add directory in front, it will be created."
@@ -539,41 +528,51 @@ - (NSURL *)nextFrameFileURL {
539528
540529- (void )captureImage {
541530 self.lastFrameFireDate = [NSDate new ];
542-
531+ static NSDateFormatter *dateFormatter = nil ;
532+ if (!dateFormatter) {
533+ dateFormatter = [NSDateFormatter new ];
534+ dateFormatter.timeStyle = NSDateFormatterMediumStyle;
535+ dateFormatter.dateStyle = NSDateFormatterShortStyle;
536+ }
543537 TCMCaptureManager *captureManager = [TCMCaptureManager captureManager ];
544- if (self.shouldTimeStamp ) {
545- if (!self.timeStampDate ) {
538+ BOOL shouldTimeStamp = self.shouldTimeStamp ;
539+ if (shouldTimeStamp) {
540+ if (!self.timeStampDate && self.onlyOneTimeStamp ) {
546541 self.timeStampDate = [NSDate date ];
547- } else if (!self.onlyOneTimeStamp ) {
548- self.timeStampDate = self.lastFrameFireDate ;
549542 }
550- NSDateFormatter *dateFormatter = [NSDateFormatter new ];
551- dateFormatter.timeStyle = NSDateFormatterMediumStyle;
552- dateFormatter.dateStyle = NSDateFormatterShortStyle;
553- self.topLeftText = [dateFormatter stringFromDate: self .timeStampDate];
554543 }
544+ NSDate *timeStampDate = self.timeStampDate ;
545+
555546 if (self.topLeftText || self.titleText || self.commentText ) {
556-
547+ NSString *fontName = self.fontName ;
548+ CGFloat fontSize = self.fontSize ;
549+
557550 SIGHTCaption *topLeftCaption;
558551 if (self.topLeftText ) {
559- SIGHTCaption *caption = [SIGHTCaption captionWithText: self .topLeftText position: kSIGHTCaptionPositionTopLeft fontName: self . fontName fontSize: self . fontSize];
552+ SIGHTCaption *caption = [SIGHTCaption captionWithText: self .topLeftText position: kSIGHTCaptionPositionTopLeft fontName: fontName fontSize: fontSize];
560553 topLeftCaption = caption;
561554 }
562555 SIGHTCaption *topRightCaption;
563556 if (self.titleText ) {
564- SIGHTCaption *caption = [SIGHTCaption captionWithText: self .titleText position: kSIGHTCaptionPositionTopRight fontName: self . fontName fontSize: self . fontSize];
557+ SIGHTCaption *caption = [SIGHTCaption captionWithText: self .titleText position: kSIGHTCaptionPositionTopRight fontName: fontName fontSize: fontSize];
565558 topRightCaption = caption;
566559 }
567560
568561 SIGHTCaption *bottomLeftCaption;
569562 if (self.commentText ) {
570- SIGHTCaption *caption = [SIGHTCaption captionWithText: self .commentText position: kSIGHTCaptionPositionBottomLeft fontName: self . fontName fontSize: self . fontSize];
563+ SIGHTCaption *caption = [SIGHTCaption captionWithText: self .commentText position: kSIGHTCaptionPositionBottomLeft fontName: fontName fontSize: fontSize];
571564 bottomLeftCaption = caption;
572565 }
573- TCMCaptureQuartzAction drawAction = ^(CGContextRef ctx, CGRect aFrame) {
566+ TCMCaptureQuartzAction drawAction = ^(CGContextRef ctx, CGRect aFrame, NSDate *frameTimestampDate ) {
574567 CGFloat topRightCaptionFirstLineMargin = 0.0 ;
575- if (topLeftCaption) {
576- topRightCaptionFirstLineMargin = [topLeftCaption drawInContext: ctx frame: aFrame firstLineLessWidth: 0 ];
568+ if (shouldTimeStamp) {
569+ NSDate *date = timeStampDate;
570+ if (!date) {
571+ date = frameTimestampDate;
572+ }
573+ NSString *timeStampString = [dateFormatter stringFromDate: date];
574+ SIGHTCaption *caption = [SIGHTCaption captionWithText: timeStampString position: kSIGHTCaptionPositionTopLeft fontName: fontName fontSize: fontSize];
575+ topRightCaptionFirstLineMargin = [caption drawInContext: ctx frame: aFrame firstLineLessWidth: 0 ];
577576 }
578577 if (topRightCaption) {
579578 [topRightCaption drawInContext: ctx frame: aFrame firstLineLessWidth: topRightCaptionFirstLineMargin];
@@ -600,6 +599,8 @@ - (void)didCaptureImage {
600599 if (!self.firstCapturedFrameDate ) {
601600 // [[NSUserNotificationCenter defaultUserNotificationCenter] scheduleNotification:[[NSUserNotification alloc] init]];
602601 self.firstCapturedFrameDate = [NSDate date ];
602+ // fix the hop at the first frame due to the skipframes
603+ nextScheduleDate = [self .firstCapturedFrameDate dateByAddingTimeInterval: self .grabInterval];
603604 } else {
604605 NSTimeInterval maxGrabDuration = self.maxGrabDuration ;
605606 if (maxGrabDuration > 0.0 ) {
0 commit comments