From 33efbbebaa3db7a9f55dc202ddd12997d65fef99 Mon Sep 17 00:00:00 2001
From: Toxblh <toxblh@gmail.com>
Date: Thu, 10 May 2018 09:56:04 +0200
Subject: [PATCH] switch hidKeys to obj-c realesation

---
 MTMR/CBridge/TouchBarSupport.h |  4 +---
 MTMR/CBridge/TouchBarSupport.m | 14 +++-----------
 MTMR/KeyPress.swift            | 21 ++-------------------
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/MTMR/CBridge/TouchBarSupport.h b/MTMR/CBridge/TouchBarSupport.h
index 0452f39..a9d3b3a 100644
--- a/MTMR/CBridge/TouchBarSupport.h
+++ b/MTMR/CBridge/TouchBarSupport.h
@@ -10,8 +10,6 @@
 
 @interface MediaKeys : NSObject
 
-+ (void)decreaseVolume;
-+ (void)increaseVolume;
-+ (void)muteVolume;
++ (void)HIDPostAuxKey:(UInt8)keyCode;
 
 @end
diff --git a/MTMR/CBridge/TouchBarSupport.m b/MTMR/CBridge/TouchBarSupport.m
index 6e92a5f..f6c4956 100644
--- a/MTMR/CBridge/TouchBarSupport.m
+++ b/MTMR/CBridge/TouchBarSupport.m
@@ -31,7 +31,7 @@ static io_connect_t get_event_driver(void)
 }
 
 
-static void HIDPostAuxKey( const UInt8 auxKeyCode )
+static void HIDReleaseAuxKey( const UInt8 auxKeyCode )
 {
     NXEventData   event;
     kern_return_t kr;
@@ -52,16 +52,8 @@ static void HIDPostAuxKey( const UInt8 auxKeyCode )
     kr = IOHIDPostEvent( get_event_driver(), NX_SYSDEFINED, loc, &event, kNXEventDataVersion, 0, FALSE );
 }
 
-+ (void)decreaseVolume {
-    HIDPostAuxKey(NX_KEYTYPE_SOUND_DOWN);
-}
-
-+ (void)increaseVolume {
-    HIDPostAuxKey(NX_KEYTYPE_SOUND_UP);
-}
-
-+ (void)muteVolume {
-    HIDPostAuxKey(NX_KEYTYPE_MUTE);
++ (void)HIDPostAuxKey: (UInt8)keyCode {
+    HIDReleaseAuxKey(keyCode);
 }
 
 @end
diff --git a/MTMR/KeyPress.swift b/MTMR/KeyPress.swift
index 23870dc..54766d9 100644
--- a/MTMR/KeyPress.swift
+++ b/MTMR/KeyPress.swift
@@ -29,24 +29,7 @@ extension KeyPress {
     }
 }
 
-func doKey(_ key: UInt16, down: Bool) {
-    let ev = NSEvent.keyEvent(
-        with: down ? .keyDown : .keyUp,
-        location: .zero,
-        modifierFlags: [],
-        timestamp: TimeInterval(0),
-        windowNumber: 0,
-        context: nil,
-        characters: "",
-        charactersIgnoringModifiers: "",
-        isARepeat: false,
-        keyCode: key)
-    let cev = ev!.cgEvent!
-    cev.post(tap: CGEventTapLocation(rawValue: 0)!)
-}
-
 func HIDPostAuxKey(_ key: Int32) {
-    let key = UInt16(key)
-    doKey(key, down: true)
-    doKey(key, down: false)
+    let key = UInt8(key)
+    MediaKeys.hidPostAuxKey(key)
 }