Delete excess files, now I've combined them.

1 files changed, 0 insertions, 237 deletions

diff --git a/jackonall b/jackonall
deleted file mode 100755
index e786188..0000000
--- a/jackonall
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/usr/bin/env luajit
-
---[[
-This is part of the JackOnAllDevices project, JOAD for short.
-
-NOTE - Seems both ALSA and JACK are per user.
-
-]]
-
-
--- CHANGE these to suit.
---local GUI = 'qjackctl'
-local GUI = 'catia'
-local alias = {
-        {name='Screen', dev='HDMI9'},
-    }
-
-
--- This APT stuff was copied from apt-panopticon.
-local APT = {}
-
-APT.readCmd = function(cmd)
-    local result = {}
-    local output = io.popen(cmd)
-    if nil ~= output then
-        for l in output:lines() do
-            table.insert(result, l)
-        end
-    end
-    return result
-end
-
-
-APT.exe = function(c)
-    local exe = {status = 0, result = '', lines = {}, log = true, cmd = c .. ' ', command = c}
-
-    function exe:log()
-        self.log = true
-        return self
-    end
-    function exe:Nice(c)
-        if nil == c then
-            self.cmd = 'ionice -c3 nice -n 19 ' .. self.cmd
-        else
-            self.cmd = self.cmd .. 'ionice -c3 nice -n 19 ' .. c .. ' '
-        end
-        return self
-    end
-    function exe:timeout(c)
-        -- timeout returns a status of - command status if --preserve-status; "128+9" (actually 137) if --kill-after ends up being done; 124 if it had to TERM; command status if all went well.
-        -- --kill-after means "send KILL after TERM fails.
-        if nil == c then
-            self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd
-        else
-            self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd
-        end
-        return self
-    end
-    function exe:also(c)
-        if nil == c then c = '' else c = ' ' .. c end
-        self.cmd = self.cmd .. ';' .. c .. ' '
-        return self
-    end
-    function exe:And(c)
-        if nil == c then c = '' else c = ' ' .. c end
-        self.cmd = self.cmd .. '&&' .. c .. ' '
-        return self
-    end
-    function exe:Or(c)
-        if nil == c then c = '' end
-        self.cmd = self.cmd .. '|| ' .. c .. ' '
-        return self
-    end
-    function exe:noErr()
-        self.cmd = self.cmd .. '2>/dev/null '
-        return self
-    end
-    function exe:wait(w)
-        self.cmd = self.cmd .. '&& touch ' .. w .. ' '
-        return self
-    end
-    function exe:Do()
-    --[[    "The condition expression of a control structure can return any
-            value. Both false and nil are considered false. All values different
-            from nil and false are considered true (in particular, the number 0
-            and the empty string are also true)."
-        says the docs, I beg to differ.]]
-        if true == self.log then D("  executing - &nbsp; <code>" .. self.cmd .. "</code>") end
-        --[[ Damn os.execute()
-            Lua 5.1 says it returns "a status code, which is system-dependent"
-            Lua 5.2 says it returns true/nil, "exit"/"signal", the status code.
-            I'm getting 7168 or 0.  No idea what the fuck that is.
-        local ok, rslt, status = os.execute(s)
-        ]]
-        local f = APT.readCmd(self.cmd, 'r')
-        -- The last line will be the command's returned status, collect everything else in result.
-        self.status = ''        -- Otherwise the result starts with 0.
-        self.result = '\n'
-        self.lines = f
-        for i,l in ipairs(f) do
-            self.result = self.result .. l .. "\n"
-        end
-        f = APT.readCmd('echo "$?"', 'r')
-        for i,l in ipairs(f) do
-            self.status = tonumber(l)
-            if (137 == self.status) or (124 == self.status) then
-                print("timeout killed " .. self.status .. ' ' .. self.command)
-                E("timeout killed " .. self.status .. ' ' .. self.command)
-            elseif (0 ~= self.status) then
-                print("status |" .. self.status .. '| ' .. self.command)
-                E("status |" .. self.status .. '| ' .. self.command)
-            end
-        end
-        return self
-    end
-    function exe:fork(host)
-        if nil ~= host then self.cmd = self.cmd .. ';  r=$?; if [ $r -ge 124 ]; then echo "$r ' .. host .. ' failed forked command ' .. string.gsub(self.cmd, '"', "'") .. '"; fi' end
-        self.cmd = '{ ' .. self.cmd .. '; } &'
-        if true == self.log then D("  forking - &nbsp; <code>" .. self.cmd .. "</code>") end
-        os.execute(self.cmd)
-        return self
-    end
-    return exe
-end
-
-
-
-local Cards = {}
-
-print('Scanning for audio devices.')
-local cards = APT.exe('ls -d1 /proc/asound/card[0-9]*'):noErr():Do()
-for  i,l in ipairs(cards.lines) do
-    local f, e = io.open(l .. '/id', "r")
-    if nil == f then print("Could not open " .. l .. '/id') else
-        Cards[l] = {path = l, name = f:read("*a"):sub(1, -2), devs = {}, captureDevs = {}, playbackDevs = {}}
-        if "Loopback" ~= Cards[l]['name'] then
-            Cards[l]['capture'] = APT.exe('ls -d1 ' .. l .. '/pcm[0-9]*c*'):noErr():Do()
-            for  j,c in ipairs(Cards[l]['capture'].lines) do
-                local n = c:match(".*pcm(%d+).*")
-                Cards[l]['captureDevs'][j] = n
-                Cards[l]['devs'][n] = n
-                print("\tFound capture device: " .. Cards[l]['name'] .. "\tDEVICE: " .. Cards[l]['captureDevs'][j] .. ' ' .. n)
-            end
-            Cards[l]['playback'] = APT.exe('ls -d1 ' .. l .. '/pcm[0-9]*p*'):noErr():Do()
-            for  j,p in ipairs(Cards[l]['playback'].lines) do
-                local n = p:match(".*pcm(%d+).*")
-                Cards[l]['playbackDevs'][j] = n
-                Cards[l]['devs'][n] = n
-                print("\tFound playback device: " .. Cards[l]['name'] .. "\tDEVICE: " .. Cards[l]['playbackDevs'][j] .. ' ' .. n)
-            end
-        end
-    end
-end
-
-
-print('')
-print("Start up JACK and friends.")
-print("jack_control")
-APT.exe('jack_control start'):Do()
-APT.exe('jack_control ds alsa'):Do()
---jack_control dps device hw:RIG,0
-print("sleep 5")
-APT.exe('sleep 5'):Do()
-if nil ~= GUI then
-    print(GUI)
-    APT.exe(GUI):fork()
-end
-print("jack-plumbing")
-APT.exe('jack-plumbing -q 2>/dev/null'):fork()
--- Bridge ALSA ports to JACK ports.  Only handles MIDI.
--- MIDI via a2jmidid.  The --ehw enables hardware ports as well, equal to using the seq MIDI drivare according to https://freeshell.de/~murks/posts/ALSA_and_JACK_MIDI_explained_(by_a_dummy_for_dummies)/
---a2j_control actually starts a2jmidid.
-----a2jmidid -e -u &
--- I think the jack_control start and my current alsa config means a2jmidid gets started anyway.  But seem to need this bit to get the joystick covered.
-print("a2j_control")
-APT.exe('a2j_control --ehw && a2j_control --start'):Do()
-print("sleep 2")
-APT.exe('sleep 2'):Do()
-print("")
-
-
---local AIN = "alsa_in"
-local AIN = "zita-a2j"
---local AOUT = "alsa_out"
-local AOUT = "zita-j2a"
-
-print("Basic ALSA sound devices converted to JACK.")
-for  i,C in pairs(alias) do
-    print('HW playback: ' .. C['name'] .. '\tDEVICE: ' .. C['dev'])
-    APT.exe('alsa_out -j ' .. C['name'] .. ' -d ' .. C['dev']):fork()
-    APT.exe('sleep 1'):Do()
-end
-print("HW playback: cloop\tDEVICE: cloop")
--- No idea why, cloop wont work with zita-a2j.
-APT.exe('alsa_in  -j cloop  -d cloop'):fork()
-APT.exe('sleep 1'):Do()
-APT.exe('jack_connect cloop:capture_1 system:playback_1'):Do()
-APT.exe('jack_connect cloop:capture_2 system:playback_2'):Do()
-print("HW playback: ploop\tDEVICE: ploop")
-APT.exe('alsa_out -j ploop  -d ploop'):fork()
-APT.exe('sleep 1'):Do()
-APT.exe('jack_connect system:capture_1 ploop:playback_1'):Do()
-APT.exe('jack_connect system:capture_2 ploop:playback_2'):Do()
-
-
-print("")
-
-print("Rest of ALSA sound devices converted to JACK.")
-for  i,C in pairs(Cards) do
-    for  j,c in ipairs(C['playbackDevs']) do
-        print("HW playback: " .. C['name'] .. "\tDEVICE: " .. C['playbackDevs'][j])
-        APT.exe(AOUT .. ' -j ' .. C['name'] .. "_" .. C['playbackDevs'][j] .. '-in -d ' .. C['name'] .. C['playbackDevs'][j]):fork()
---      APT.exe('sleep 1'):Do()
-    end
-    for  j,c in ipairs(C['captureDevs']) do
-        print("HW capture: " .. C['name'] .. "\tDEVICE: " .. C['captureDevs'][j])
-        APT.exe(AIN .. ' -j ' .. C['name'] .. "_" .. C['captureDevs'][j] .. '-out -d ' .. C['name'] .. C['captureDevs'][j]):fork()
---      APT.exe('sleep 1'):Do()
-    end
-end
-print("")
-
-print("Scanning for joysticks.")
-local sticks = APT.exe('ls -1 /dev/input/js[0-9]*'):noErr():Do()
-for  i,l in ipairs(sticks.lines) do
-    print("aseqjoy " .. l)
-    -- Buttons switch to that numbered MIDI channel, defaults to 1.
-    -- Axis are mapped to MIDI controllers 10 - 15
-    -- -r means to use high resolution MIDI values.
-    APT.exe('aseqjoy -d ' .. l:sub(-1,-1) .. ' -r'):fork()
---    print("sleep 1")
---    APT.exe('sleep 1'):Do()
-end
-print("")
-
-
-