procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Disabled SPMediaKeyTap in MacAppStore build: it crashes.

This commit is contained in:
John Preston 2016-10-20 01:02:21 +03:00
parent 3b843f3d0f
commit 143cfe0d0f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/pspecific_mac_p.mm
View File

@ -109,12 +109,16 @@ ApplicationDelegate *_sharedDelegate = nil;
} }
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
#ifndef OS_MAC_STORE
keyTap = [[SPMediaKeyTap alloc] initWithDelegate:self]; keyTap = [[SPMediaKeyTap alloc] initWithDelegate:self];
if ([SPMediaKeyTap usesGlobalMediaKeyTap]) { if ([SPMediaKeyTap usesGlobalMediaKeyTap]) {
[keyTap startWatchingMediaKeys]; [keyTap startWatchingMediaKeys];
} else { } else {
LOG(("Media key monitoring disabled")); LOG(("Media key monitoring disabled"));
} }
#else // !OS_MAC_STORE
keyTap = nullptr;
#endif // else for !OS_MAC_STORE
} }
- (void)applicationDidBecomeActive:(NSNotification *)aNotification { - (void)applicationDidBecomeActive:(NSNotification *)aNotification {
@ -197,8 +201,10 @@ PsMacWindowPrivate::PsMacWindowPrivate() : data(new PsMacWindowData(this)) {
[[NSDistributedNotificationCenter defaultCenter] addObserver:data->observerHelper selector:@selector(screenIsLocked:) name:Q2NSString(strNotificationAboutScreenLocked()) object:nil]; [[NSDistributedNotificationCenter defaultCenter] addObserver:data->observerHelper selector:@selector(screenIsLocked:) name:Q2NSString(strNotificationAboutScreenLocked()) object:nil];
[[NSDistributedNotificationCenter defaultCenter] addObserver:data->observerHelper selector:@selector(screenIsUnlocked:) name:Q2NSString(strNotificationAboutScreenUnlocked()) object:nil]; [[NSDistributedNotificationCenter defaultCenter] addObserver:data->observerHelper selector:@selector(screenIsUnlocked:) name:Q2NSString(strNotificationAboutScreenUnlocked()) object:nil];
#ifndef OS_MAC_STORE
// Register defaults for the whitelist of apps that want to use media keys // Register defaults for the whitelist of apps that want to use media keys
[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:[SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers], kMediaKeyUsingBundleIdentifiersDefaultsKey, nil]]; [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:[SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers], kMediaKeyUsingBundleIdentifiersDefaultsKey, nil]];
#endif // OS_MAC_STORE
} }
} }
@ -297,10 +303,14 @@ void PsMacWindowPrivate::enableShadow(WId winId) {
bool PsMacWindowPrivate::filterNativeEvent(void *event) { bool PsMacWindowPrivate::filterNativeEvent(void *event) {
NSEvent *e = static_cast<NSEvent*>(event); NSEvent *e = static_cast<NSEvent*>(event);
if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) { if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) {
#ifndef OS_MAC_STORE
// If event tap is not installed, handle events that reach the app instead // If event tap is not installed, handle events that reach the app instead
if (![SPMediaKeyTap usesGlobalMediaKeyTap]) { if (![SPMediaKeyTap usesGlobalMediaKeyTap]) {
return handleMediaKeyEvent(e); return handleMediaKeyEvent(e);
} }
#else // !OS_MAC_STORE
return handleMediaKeyEvent(e);
#endif // else for !OS_MAC_STORE
} }
return false; return false;
} }