diff options
author | dvs1 | 2024-10-19 15:38:19 +1000 |
---|---|---|
committer | dvs1 | 2024-10-19 15:38:19 +1000 |
commit | 6d5fd322a0195cd1988c4f4d10019efac87cccab (patch) | |
tree | 431f662df5789d5eab4466744a701ed9f2c6a534 | |
parent | Use the new exists function to decide what to do, and how. (diff) | |
download | JackOnAllDevices-6d5fd322a0195cd1988c4f4d10019efac87cccab.zip JackOnAllDevices-6d5fd322a0195cd1988c4f4d10019efac87cccab.tar.gz JackOnAllDevices-6d5fd322a0195cd1988c4f4d10019efac87cccab.tar.bz2 JackOnAllDevices-6d5fd322a0195cd1988c4f4d10019efac87cccab.tar.xz |
Bit of code clean up.
Diffstat (limited to '')
-rwxr-xr-x | aataaj.lua | 17 |
1 files changed, 4 insertions, 13 deletions
@@ -229,8 +229,6 @@ if 0 ~= #args then | |||
229 | APT.exe("sleep 2"):Do() | 229 | APT.exe("sleep 2"):Do() |
230 | APT.exe("jack_control exit"):Do() | 230 | APT.exe("jack_control exit"):Do() |
231 | APT.exe("sleep 2"):Do() | 231 | APT.exe("sleep 2"):Do() |
232 | --APT.exe("a2j_control --stop; a2j_control --exit"):Do() | ||
233 | --APT.exe("sleep 2"):Do() | ||
234 | APT.killEmAll{'jmcore', 'qjackctl'} | 232 | APT.killEmAll{'jmcore', 'qjackctl'} |
235 | -- Catia is python, and no easy way to kill it. | 233 | -- Catia is python, and no easy way to kill it. |
236 | -- Also it keeps jackdbus alive, no matter how hard you kill it. | 234 | -- Also it keeps jackdbus alive, no matter how hard you kill it. |
@@ -484,11 +482,9 @@ elseif 'JACK' == args[1] then | |||
484 | --jack_control dps device hw:RIG,0 | 482 | --jack_control dps device hw:RIG,0 |
485 | local r = APT.exe('jack_control status'):Do().status | 483 | local r = APT.exe('jack_control status'):Do().status |
486 | while r ~= 0 do | 484 | while r ~= 0 do |
487 | -- if 0 ~= r then | 485 | print("Waiting for JACK - sleep 1") |
488 | print("Waiting for JACK - sleep 1") | 486 | APT.exe('sleep 1'):Do() |
489 | APT.exe('sleep 1'):Do() | 487 | r = APT.exe('jack_control status'):Do().status |
490 | r = APT.exe('jack_control status'):Do().status | ||
491 | -- end | ||
492 | end | 488 | end |
493 | if nil ~= GUI then | 489 | if nil ~= GUI then |
494 | print(GUI) | 490 | print(GUI) |
@@ -520,7 +516,7 @@ elseif 'JACK' == args[1] then | |||
520 | print("Basic ALSA sound devices converted to JACK.") | 516 | print("Basic ALSA sound devices converted to JACK.") |
521 | for i,C in pairs(alias) do | 517 | for i,C in pairs(alias) do |
522 | print('HW playback: ' .. C['name'] .. '\tDEVICE: ' .. C['dev']) | 518 | print('HW playback: ' .. C['name'] .. '\tDEVICE: ' .. C['dev']) |
523 | APT.exe('alsa_out -j ' .. C['name'] .. ' -d ' .. C['dev']):fork() | 519 | APT.exe(AOUT .. ' -j ' .. C['name'] .. ' -d ' .. C['dev']):fork() |
524 | end | 520 | end |
525 | print("HW playback: cloop\tDEVICE: cloop") | 521 | print("HW playback: cloop\tDEVICE: cloop") |
526 | -- No idea why, cloop wont work with zita-a2j. | 522 | -- No idea why, cloop wont work with zita-a2j. |
@@ -566,11 +562,6 @@ elseif 'JACK' == args[1] then | |||
566 | print("") | 562 | print("") |
567 | end | 563 | end |
568 | 564 | ||
569 | print('qsynth') | ||
570 | APT.exe('qsynth'):fork() | ||
571 | |||
572 | print("") | ||
573 | |||
574 | if APT.exists('jack-plumbing') then | 565 | if APT.exists('jack-plumbing') then |
575 | print('Stop our jack-plumbing, eventually.') | 566 | print('Stop our jack-plumbing, eventually.') |
576 | APT.exe('sleep 4'):Do() | 567 | APT.exe('sleep 4'):Do() |