Issue #305 - better handling of empty audio devices

cortex-lab · Sep 8, 2020 · 51c13f8 · 51c13f8
1 parent ba26da5
commit 51c13f8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/+eui/SignalsTest.m b/+eui/SignalsTest.m
@@ -196,10 +196,21 @@
 
         InitializePsychSound
         d = PsychPortAudio('GetDevices');
-        d = d([d.NrOutputChannels] == 2);
-        [~,I] = min([d.LowOutputLatency]);
-        obj.Hardware.audioDevices = d(I);
-        obj.Hardware.audioDevices.DeviceName = 'default';
+
+        % Keep output devices
+        d = d([d.NrOutputChannels] > 0);
+        obj.Hardware.audioDevices = d([d.NrOutputChannels] > 0);
+
+        % Select the lowest latency stereo output as the default
+        stereo = [d.NrOutputChannels] == 2;
+        [~,I] = min([d(stereo).LowOutputLatency]);
+        I = I + sum(~stereo(1:I));
+        if isempty(I)
+          warning('Rigbox:eui:SignalsTest:NoStereoOutput', ...
+            'No stereo output audio devices detected; default unassigned')
+        else
+          obj.Hardware.audioDevices(I).DeviceName = 'default';
+        end
       else
         obj.Hardware = rig;
       end

diff --git a/alyx-matlab b/alyx-matlab
diff --git a/docs/scripts/release_notes_v260.m b/docs/scripts/release_notes_v260.m
@@ -78,6 +78,8 @@
 % * |git.listVersions| - Lists the previous versions of Rigbox availiable 
 % * |git.switchVersion| - Allows you to switched between Rigbox versions
 % * |git.repoVersion| - Returns release tag of repository, if available
+% * |eui.SignalsTest| - Warning instead of error when no stereo output
+% device found
 %
 % *Tests*
 %
+7 −6		@Alyx/newExp.m
+2 −1		CHANGELOG.md
+3 −3		README.md
+17 −29		docs/AlyxMatlabPrimer.m
+38 −13		tests/Alyx_test.m