Fixed delay/vkey pattern matching, fixed another time conversion error

This commit is contained in:
michael starke
2015-12-31 10:37:18 +01:00
parent 78b9117fd9
commit 1fbf0eb7f3
4 changed files with 12 additions and 4 deletions

View File

@@ -290,7 +290,7 @@ static CGKeyCode kMPFunctionKeyCodes[] = { kVK_F1, kVK_F2, kVK_F3, kVK_F4, kVK_F
} }
// TODO: add {APPLICATION <appname>} // TODO: add {APPLICATION <appname>}
/* Delay */ /* Delay */
NSString *delayPattern = [[NSString alloc] initWithFormat:@"\\{(%@|%@|)[ |=]+([0-9])+\\}", NSString *delayPattern = [[NSString alloc] initWithFormat:@"\\{(%@|%@)[ |=]+([0-9]+)\\}",
kKPKAutotypeDelay, kKPKAutotypeDelay,
kKPKAutotypeVirtualKey/*, kKPKAutotypeVirtualKey/*,
kKPKAutotypeVirtualExtendedKey, kKPKAutotypeVirtualExtendedKey,

View File

@@ -9,7 +9,13 @@
#import "MPAutotypeCommand.h" #import "MPAutotypeCommand.h"
@interface MPAutotypeDelay : MPAutotypeCommand @interface MPAutotypeDelay : MPAutotypeCommand
/**
* Creates an DelayCommand that delays the execution for n milliseconds
*
* @param delay Delay in milliseconds
*
* @return <#return value description#>
*/
- (instancetype)initWithDelay:(NSUInteger)delay; - (instancetype)initWithDelay:(NSUInteger)delay;
@end @end

View File

@@ -22,7 +22,7 @@
} }
- (NSString *)description { - (NSString *)description {
return [[NSString alloc] initWithFormat:@"%@ delay: %ld ms", [self class], _delay]; return [[NSString alloc] initWithFormat:@"%@ delay: %ld ms", self.class, _delay];
} }
- (instancetype)initWithDelay:(NSUInteger)delay { - (instancetype)initWithDelay:(NSUInteger)delay {
@@ -35,7 +35,8 @@
} }
- (void)execute { - (void)execute {
usleep((useconds_t)(_delay*NSEC_PER_MSEC)); /* milliseconds * 10000 = microseconds */
usleep((useconds_t)(_delay*1000));
} }
@end @end

View File

@@ -233,4 +233,5 @@
} }
@end @end