Merge remote-tracking branch 'upstream/master'

Author: latenitefilms

Hammerspoon Tests/HSaudiodevice.m

@@ -144,6 +144,10 @@ - (void)testMute {
     RUN_LUA_TEST()
 }
 
+- (void)testThru {
+    RUN_LUA_TEST()
+}
+
 - (void)testVolume {
     SKIP_IN_TRAVIS()
     RUN_LUA_TEST()

extensions/audiodevice/libaudiodevice.m

@@ -1162,6 +1162,94 @@ static int audiodevice_setbalance(lua_State* L) {
 
 }
 
+/// hs.audiodevice:thru() -> bool or nil
+/// Method
+/// Get the play through (low latency/direct monitoring) state of the audio device
+///
+/// Parameters:
+///  * None
+///
+/// Returns:
+///  * True if the audio device has thru enabled, False if thru is disabled, nil if it does not support thru
+///
+/// Notes:
+///  * This method only works on devices that have hardware support (often microphones with a built-in headphone jack)
+///  * This setting corresponds to the "Thru" setting in Audio MIDI Setup
+static int audiodevice_thru(lua_State* L) {
+    LuaSkin *skin = [LuaSkin sharedWithState:L];
+    [skin checkArgs:LS_TUSERDATA, USERDATA_TAG, LS_TBREAK];
+
+    audioDeviceUserData *audioDevice = userdataToAudioDevice(L, 1);
+    AudioDeviceID deviceId = audioDevice->deviceId;
+    unsigned int scope;
+    UInt32 thru;
+    UInt32 thruSize = sizeof(UInt32);
+
+    if (isOutputDevice(deviceId)) {
+        scope = kAudioObjectPropertyScopeOutput;
+    } else {
+        scope = kAudioObjectPropertyScopeInput;
+    }
+
+    AudioObjectPropertyAddress propertyAddress = {
+        kAudioDevicePropertyPlayThru,
+        scope,
+        kAudioObjectPropertyElementMain
+    };
+
+    if (AudioObjectHasProperty(deviceId, &propertyAddress) && (AudioObjectGetPropertyData(deviceId, &propertyAddress, 0, NULL, &thruSize, &thru) == noErr)) {
+        lua_pushboolean(L, thru != 0);
+    } else {
+        lua_pushnil(L);
+    }
+
+    return 1;
+}
+
+/// hs.audiodevice:setThru(thru) -> bool
+/// Method
+/// Set the play through (low latency/direct monitoring) state of the audio device
+///
+/// Parameters:
+///  * thru -  A boolean value. True to enable thru, False to disable
+///
+/// Returns:
+///  * True if thru was set, False if the audio device does not support thru
+///
+/// Notes:
+///  * This method only works on devices that have hardware support (often microphones with a built-in headphone jack)
+///  * This setting corresponds to the "Thru" setting in Audio MIDI Setup
+static int audiodevice_setThru(lua_State* L) {
+    LuaSkin *skin = [LuaSkin sharedWithState:L];
+    [skin checkArgs:LS_TUSERDATA, USERDATA_TAG, LS_TBOOLEAN, LS_TBREAK];
+
+    audioDeviceUserData *audioDevice = userdataToAudioDevice(L, 1);
+    AudioDeviceID deviceId = audioDevice->deviceId;
+    unsigned int scope;
+    UInt32 thru = lua_toboolean(L, 2);
+    UInt32 thruSize = sizeof(UInt32);
+
+    if (isOutputDevice(deviceId)) {
+        scope = kAudioObjectPropertyScopeOutput;
+    } else {
+        scope = kAudioObjectPropertyScopeInput;
+    }
+
+    AudioObjectPropertyAddress propertyAddress = {
+        kAudioDevicePropertyPlayThru,
+        scope,
+        kAudioObjectPropertyElementMain
+    };
+
+    if (AudioObjectHasProperty(deviceId, &propertyAddress) && (AudioObjectSetPropertyData(deviceId, &propertyAddress, 0, NULL, thruSize, &thru) == noErr)) {
+        lua_pushboolean(L, TRUE);
+    } else {
+        lua_pushboolean(L, FALSE);
+    }
+
+    return 1;
+}
+
 /// hs.audiodevice:isOutputDevice() -> boolean
 /// Method
 /// Determines if an audio device is an output device
@@ -1900,6 +1988,8 @@ static int datasource_eq(lua_State* L) {
     {"setVolume",               audiodevice_setvolume},
     {"balance",                 audiodevice_balance},
     {"setBalance",              audiodevice_setbalance},
+    {"thru",                    audiodevice_thru},
+    {"setThru",                 audiodevice_setThru},
     {"setInputVolume",          audiodevice_setInputVolume},
     {"setOutputVolume",         audiodevice_setOutputVolume},
     {"muted",                   audiodevice_muted},

extensions/audiodevice/test_audiodevice.lua

@@ -158,6 +158,21 @@ function testMute()
   return success()
 end
 
+function testThru()
+  local device = hs.audiodevice.defaultInputDevice()
+  local wasThru = device:thru()
+  if (type(wasThru) ~= "boolean") then
+    -- This device does not support thru. Not much we can do about it, so log it and move on
+    print("Audiodevice does not support thru, unable to test thru functionality. Skipping test due to lack of hardware")
+    return success()
+  end
+  device:setThru(not wasThru)
+  assertIsEqual(not wasThru, device:thru())
+  -- Be nice to whoever is running the test and restore the original state
+  device:setThru(wasThru)
+  return success()
+end
+
 function testJackConnected()
   local jackConnected = hs.audiodevice.defaultOutputDevice():jackConnected()
   if (type(jackConnected) ~= "boolean") then

extensions/ipc/ipc.lua

@@ -33,19 +33,54 @@ local MSG_ID = {
     CONSOLE    =  3,    -- cloned console output
 }
 
+-- stop printReplacement from being reentrant
+-- otherwise errors might cascade into lots of recursive prints
+-- hammerspoon is single threaded, thus this does not need a semaphore
+-- otherwise we'll have to deal with a potential race condition
+module.insidePrintInstances = {}
+
+module.print_enter = function(instance)
+  val = module.insidePrintInstances[instance] or 0
+  module.insidePrintInstances[instance] = val + 1
+end
+
+module.print_exit = function(instance)
+  -- make sure instance exists
+  if module.insidePrintInstances[instance] then
+    module.insidePrintInstances[instance] = module.insidePrintInstances[instance] - 1
+    -- make sure to delete the entry from the table to avoid
+    -- growing forever
+    if module.insidePrintInstances[instance] == 0 then
+      module.insidePrintInstances[instance] = nil
+    end
+  end
+end
+
+module.print_inside = function(instance)
+  -- return true if we are already inside printReplacement
+  val = module.insidePrintInstances[instance]
+  return val and val > 0
+end
+  
 local originalPrint = print
 local printReplacement = function(...)
     originalPrint(...)
-    for _,v in pairs(module.__registeredCLIInstances) do
+    for id,v in pairs(module.__registeredCLIInstances) do
         if v._cli.console and v.print and not v._cli.quietMode then
---            v.print(...)
--- make it more obvious what is console output versus the command line's
+          if module.print_inside(id) then
+            log.w(string.format("Instance of [%s] already recursing, refusing request.", id))
+          else
+            module.print_enter(id)
+            --            v.print(...)
+            -- make it more obvious what is console output versus the command line's
             local things = table.pack(...)
             local stdout = (things.n > 0) and tostring(things[1]) or ""
             for i = 2, things.n do
-                stdout = stdout .. "\t" .. tostring(things[i])
+              stdout = stdout .. "\t" .. tostring(things[i])
             end
             v._cli.remote:sendMessage(stdout .. "\n", MSG_ID.CONSOLE)
+            module.print_exit(id)
+          end
         end
     end
 end