aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvs12024-10-28 23:31:54 +1000
committerdvs12024-10-28 23:31:54 +1000
commit3841428eebaa4b5e9f30b35501802e5c1664b5ef (patch)
tree2e1824b753d03c52655271cddb9feafd489f65b7
parentVarious minor tweaks and cleanups. (diff)
downloadJackOnAllDevices-3841428eebaa4b5e9f30b35501802e5c1664b5ef.zip
JackOnAllDevices-3841428eebaa4b5e9f30b35501802e5c1664b5ef.tar.gz
JackOnAllDevices-3841428eebaa4b5e9f30b35501802e5c1664b5ef.tar.bz2
JackOnAllDevices-3841428eebaa4b5e9f30b35501802e5c1664b5ef.tar.xz
More clean ups.
Diffstat (limited to '')
-rwxr-xr-xaataaj.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/aataaj.lua b/aataaj.lua
index d48ec94..e044ed1 100755
--- a/aataaj.lua
+++ b/aataaj.lua
@@ -182,7 +182,7 @@ for i,C in pairs(Cards) do
182end 182end
183 183
184print('Your ' .. cnt .. ' audio devices are ') 184print('Your ' .. cnt .. ' audio devices are ')
185for i,C in pairs(Cards) do 185for k,C in pairs(Cards) do
186 print('' .. C.card - 1 .. ' : ' .. C.name) 186 print('' .. C.card - 1 .. ' : ' .. C.name)
187 __('ALSA_CARD=' .. C.card - 1 .. ' ' .. speaker .. ' "Your ' .. cnt .. ' audio devices are "'):log():noErr():noOut():fork() 187 __('ALSA_CARD=' .. C.card - 1 .. ' ' .. speaker .. ' "Your ' .. cnt .. ' audio devices are "'):log():noErr():noOut():fork()
188end 188end
@@ -190,7 +190,7 @@ end
190__'sleep 6':Do() 190__'sleep 6':Do()
191print('') 191print('')
192io.flush() 192io.flush()
193for i,C in pairs(Cards) do 193for k,C in pairs(Cards) do
194 print('' .. C.card - 1 .. ' : ' .. C.name) 194 print('' .. C.card - 1 .. ' : ' .. C.name)
195 __('echo "' .. C.card - 1 .. ' : ' .. C.name .. '"') 195 __('echo "' .. C.card - 1 .. ' : ' .. C.name .. '"')
196 __('ALSA_CARD=' .. C.card - 1 .. ' ' .. speaker .. ' "Device ' .. C.card - 1 .. ' ' .. C.name .. '"'):log():noErr():noOut():Do() 196 __('ALSA_CARD=' .. C.card - 1 .. ' ' .. speaker .. ' "Device ' .. C.card - 1 .. ' ' .. C.name .. '"'):log():noErr():noOut():Do()
@@ -204,7 +204,7 @@ io.flush()
204if 'start' == arg[1] then 204if 'start' == arg[1] then
205 __('mkdir -p ' .. options.asoundrcPath.value):Do() 205 __('mkdir -p ' .. options.asoundrcPath.value):Do()
206 local a, e = io.open(options.asoundrcPath.value .. '/jack-plumbing', 'w') 206 local a, e = io.open(options.asoundrcPath.value .. '/jack-plumbing', 'w')
207 if nil == a then print('Could not open ' .. options.asoundrcPath.value .. '/jack-plumbing') else 207 if nil == a then print('Could not open ' .. options.asoundrcPath.value .. '/jack-plumbing - ' .. e) else
208 a:write([[ 208 a:write([[
209(connect "system:capture_1" "ploop:playback_1") 209(connect "system:capture_1" "ploop:playback_1")
210(connect "system:capture_2" "ploop:playback_2") 210(connect "system:capture_2" "ploop:playback_2")
@@ -410,7 +410,7 @@ elseif 'JACK' == arg[1] then
410 if _.runnable'zita-j2a' then AOUT = 'zita-j2a' end 410 if _.runnable'zita-j2a' then AOUT = 'zita-j2a' end
411 411
412 print('Basic ALSA sound devices converted to JACK.') 412 print('Basic ALSA sound devices converted to JACK.')
413 for i,C in pairs(options.aliases.value) do 413 for k,C in pairs(options.aliases.value) do
414 print('HW playback: ' .. C['name'] .. '\tDEVICE: ' .. C['dev']) 414 print('HW playback: ' .. C['name'] .. '\tDEVICE: ' .. C['dev'])
415 __(AOUT .. ' -j ' .. C['name'] .. ' -d ' .. C['dev']):fork() 415 __(AOUT .. ' -j ' .. C['name'] .. ' -d ' .. C['dev']):fork()
416 end 416 end
@@ -430,7 +430,7 @@ elseif 'JACK' == arg[1] then
430 print('') 430 print('')
431 431
432 print('Rest of ALSA sound devices converted to JACK.') 432 print('Rest of ALSA sound devices converted to JACK.')
433 for i,C in pairs(Cards) do 433 for k,C in pairs(Cards) do
434 for j,c in ipairs(C['playbackDevs']) do 434 for j,c in ipairs(C['playbackDevs']) do
435 print('HW playback: ' .. C['name'] .. '\tDEVICE: ' .. C['playbackDevs'][j]) 435 print('HW playback: ' .. C['name'] .. '\tDEVICE: ' .. C['playbackDevs'][j])
436 __(AOUT .. ' -j ' .. C['name'] .. '_' .. C['playbackDevs'][j] .. '-in -d ' .. C['name'] .. C['playbackDevs'][j]):fork() 436 __(AOUT .. ' -j ' .. C['name'] .. '_' .. C['playbackDevs'][j] .. '-in -d ' .. C['name'] .. C['playbackDevs'][j]):fork()