Clean up the text.

1 files changed, 10 insertions, 8 deletions

diff --git a/aataaj.lua b/aataaj.lua
index e08373b..c9f10c2 100755
--- a/aataaj.lua
+++ b/aataaj.lua
@@ -182,7 +182,7 @@ for  i,l in ipairs(cards.lines) do
                     local m = c:match('.*pcm(%d+).*')
                     Cards[n]['captureDevs'][j] = m
                     Cards[n]['devs'][m] = m
-                    print('\tFound capture device: ' .. Cards[n]['name'] .. '\tDEVICE: ' .. Cards[n]['captureDevs'][j] .. ', sub device ' .. m)
+----                print('Found capture  DEVICE: ' .. Cards[n].card - 1 .. '\tSUB: ' .. m .. '  \t' .. Cards[n]['name'])
 --                  io.flush()
                 end
                 Cards[n]['playback'] = __('ls -d1 ' .. l .. '/pcm[0-9]*p*'):noErr():Do()
@@ -190,7 +190,7 @@ for  i,l in ipairs(cards.lines) do
                     local m = p:match('.*pcm(%d+).*')
                     Cards[n]['playbackDevs'][j] = m
                     Cards[n]['devs'][m] = m
-                    print('\tFound playback device ' .. Cards[n].card - 1 .. ' : ' .. Cards[n]['name'] .. '\tDEVICE: ' .. Cards[n]['playbackDevs'][j] .. ', sub device ' .. m)
+                    print('Found playback DEVICE: ' .. Cards[n].card - 1 .. '\tSUB: ' .. m .. '  \t' .. Cards[n]['name'])
 --                  io.flush()
                     if 'JACK' ~= cmd then
 --                      print('\t\tALSA_CARD=' .. Cards[n].card - 1 .. ' ' .. speaker .. ' "Found playback device ' .. Cards[n].card - 1 .. ' : ' .. Cards[n]['name'] .. ' DEVICE: ' .. Cards[n]['playbackDevs'][j] .. ' ' .. m .. '"')
@@ -221,8 +221,7 @@ local speak = function(card, subdevice, device, words, printIt, forkIt, ...)
         s = 'aplay -q --device=hw:' .. device .. subdevice
         for i, v in ipairs(files) do s = s .. ' /usr/local/share/doc/aataaj/' .. v .. '.wav' end
     end
-print(s)
-    if printIt then print(words) end
+    if printIt then print(words .. '\t' .. card) end
     if forkIt then
         __(s):fork()
     else
@@ -236,6 +235,7 @@ end
 if 'start' == cmd then
     print('Your  ' .. cnt .. '  audio devices are - ')
 
+print('  being turned on and volume maxed - ')
     for k = 0, cnt do
         -- Turn on IEC958 for everything, they seem to default to off, so can't hear them.
         for l, m in ipairs(__("amixer -c " .. k .. " scontrols | grep 'IEC958' | cut -d ',' -f 2"):noErr():Do().lines) do
@@ -247,18 +247,20 @@ if 'start' == cmd then
         end
     end
 
+print('  being spoken through all at once - ')
     for  k,C in pairs(Cards) do
         for  j,c in ipairs(C['playbackDevs']) do
-            speak(C.name, nil,                  C.card - 1, 'Your  ' .. cnt .. '  audio devices are - ', false, true, 'your', numbers[cnt], 'devices')
+----        speak(C.name, nil,                  C.card - 1, 'Your  ' .. cnt .. '  audio devices are - ', false, true, 'your', numbers[cnt], 'devices')
             speak(C.name, C['playbackDevs'][j], C.card - 1, 'Your  ' .. cnt .. '  audio devices are - ', false, true, 'your', numbers[cnt], 'devices')
         end
     end
     -- TODO - should do a proper "wait for speakers to finish" here.  Have fork(write a file), think that's what :wait(file) does.
     __'sleep 6':Do()
     for  k,C in pairs(Cards) do
+print('  being spoken through one at a time - ')
         for  j,c in ipairs(C['playbackDevs']) do
-            speak(C.name, nil,                  C.card - 1, 'Device number ' .. C.card - 1 .. ', sub device ' .. C['playbackDevs'][j] .. ' : ' .. C.name, true, false, 'device', numbers[C.card - 1], 'sub', numbers[tonumber(C['playbackDevs'][j])])
-            speak(C.name, C['playbackDevs'][j], C.card - 1, 'Device number ' .. C.card - 1 .. ', sub device ' .. C['playbackDevs'][j] .. ' : ' .. C.name, true, false, 'device', numbers[C.card - 1], 'sub', numbers[tonumber(C['playbackDevs'][j])])
+----        speak(C.name, nil,                  C.card - 1, 'Device number ' .. C.card - 1 .. ', sub device ' .. C['playbackDevs'][j], false, false, 'device', numbers[C.card - 1], 'sub', numbers[tonumber(C['playbackDevs'][j])])
+            speak(C.name, C['playbackDevs'][j], C.card - 1, 'Device number ' .. C.card - 1 .. ', sub device ' .. C['playbackDevs'][j], true, false, 'device', numbers[C.card - 1], 'sub', numbers[tonumber(C['playbackDevs'][j])])
         end
         __'sleep 1':Do()
     end
@@ -267,7 +269,7 @@ if 'start' == cmd then
     print('Please type the device number you heard best - ')
     for  k,C in pairs(Cards) do
         for  j,c in ipairs(C['playbackDevs']) do
-            speak(C.name, nil,                  C.card - 1, 'Please type the device number you heard best - ', false, true, 'best')
+----        speak(C.name, nil,                  C.card - 1, 'Please type the device number you heard best - ', false, true, 'best')
             speak(C.name, C['playbackDevs'][j], C.card - 1, 'Please type the device number you heard best - ', false, true, 'best')
         end
     end