Merge pull request #126 from Remi-Gau/remi-audio_defaults

Remi-Gau · web-flow · commit 8edca58d38e3 · 2020-10-14T12:18:06.000+02:00
let setDefaultsPTB take care of... setting the audio defaults...
diff --git a/src/initPTB.m b/src/initPTB.m
@@ -168,9 +168,6 @@ function initDebug(cfg)
 
         InitializePsychSound(1);
 
-        cfg.audio.devIdx = [];
-        cfg.audio.playbackMode = 1;
-
         if isfield(cfg.audio, 'useDevice')
 
             % get audio device list
diff --git a/src/utils/setDefaultsPTB.m b/src/utils/setDefaultsPTB.m
@@ -48,6 +48,9 @@
 
     if isfield(cfg, 'audio') && cfg.audio.do
 
+        fieldsToSet.audio.devIdx = [];
+        fieldsToSet.audio.playbackMode = 1;
+
         fieldsToSet.audio.fs = 44800;
         fieldsToSet.audio.channels = 2;
         fieldsToSet.audio.initVolume = 1;
diff --git a/tests/test_setDefaultsPTB.m b/tests/test_setDefaultsPTB.m
@@ -44,6 +44,8 @@ function test_setDefaultsPtbAudio()
     expectedCfg = returnExpectedCFG();
     expectedCfg.audio = struct( ...
                                'do', true, ...
+                               'devIdx', [], ...
+                               'playbackMode', 1, ...
                                'fs', 44800, ...
                                'channels', 2, ...
                                'initVolume', 1, ...
