From 6d5fd322a0195cd1988c4f4d10019efac87cccab Mon Sep 17 00:00:00 2001 From: dvs1 Date: Sat, 19 Oct 2024 15:38:19 +1000 Subject: Bit of code clean up. --- aataaj.lua | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/aataaj.lua b/aataaj.lua index 90749e2..5ba719b 100755 --- a/aataaj.lua +++ b/aataaj.lua @@ -229,8 +229,6 @@ if 0 ~= #args then APT.exe("sleep 2"):Do() APT.exe("jack_control exit"):Do() APT.exe("sleep 2"):Do() - --APT.exe("a2j_control --stop; a2j_control --exit"):Do() - --APT.exe("sleep 2"):Do() APT.killEmAll{'jmcore', 'qjackctl'} -- Catia is python, and no easy way to kill it. -- Also it keeps jackdbus alive, no matter how hard you kill it. @@ -484,11 +482,9 @@ elseif 'JACK' == args[1] then --jack_control dps device hw:RIG,0 local r = APT.exe('jack_control status'):Do().status while r ~= 0 do - -- if 0 ~= r then - print("Waiting for JACK - sleep 1") - APT.exe('sleep 1'):Do() - r = APT.exe('jack_control status'):Do().status - -- end + print("Waiting for JACK - sleep 1") + APT.exe('sleep 1'):Do() + r = APT.exe('jack_control status'):Do().status end if nil ~= GUI then print(GUI) @@ -520,7 +516,7 @@ elseif 'JACK' == args[1] then 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(AOUT .. ' -j ' .. C['name'] .. ' -d ' .. C['dev']):fork() end print("HW playback: cloop\tDEVICE: cloop") -- No idea why, cloop wont work with zita-a2j. @@ -566,11 +562,6 @@ elseif 'JACK' == args[1] then print("") end - print('qsynth') - APT.exe('qsynth'):fork() - - print("") - if APT.exists('jack-plumbing') then print('Stop our jack-plumbing, eventually.') APT.exe('sleep 4'):Do() -- cgit v1.1