From 04e079ed72dc4cb87155a4ea54dcd3de3da6269b Mon Sep 17 00:00:00 2001 From: Mario Kleiner Date: Thu, 22 Feb 2024 03:45:10 +0000 Subject: [PATCH] PsychEyelinkDispatchCallback(): Keep all persistent variables grouped on top. --- .../PsychEyelinkDispatchCallback.m | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Psychtoolbox/PsychHardware/EyelinkToolbox/EyelinkBasic/PsychEyelinkDispatchCallback.m b/Psychtoolbox/PsychHardware/EyelinkToolbox/EyelinkBasic/PsychEyelinkDispatchCallback.m index 7dce011f0..7d364af3a 100644 --- a/Psychtoolbox/PsychHardware/EyelinkToolbox/EyelinkBasic/PsychEyelinkDispatchCallback.m +++ b/Psychtoolbox/PsychHardware/EyelinkToolbox/EyelinkBasic/PsychEyelinkDispatchCallback.m @@ -66,7 +66,7 @@ % previous comments where code was previously added, this % was done for easier reading of the code. -global eyelinkanimationtarget; +global eyelinkanimationtarget; %#ok % Cached texture handle and size for eyelink eye image and texture: persistent eyelinktex; @@ -90,6 +90,14 @@ persistent GL_RGBA8; persistent hostDataFormat; +% target & feedback beep waveforms and PsychPortAudio buffers +persistent audio_status; +persistent audio_devinfo; +persistent audio_n_chan; +persistent audio_fs; +%persistent audio_ppa_isSlave; +persistent beep_waveforms; + persistent inDrift; newImage = 0; @@ -146,12 +154,6 @@ return; end -% target & feedback beep waveforms and PsychPortAudio buffers -persistent audio_status; -persistent audio_devinfo; -persistent audio_n_chan; -persistent audio_fs; -%persistent audio_ppa_isSlave; if ~isempty(el.ppa_pahandle) && isempty(audio_status) audio_status = PsychPortAudio('GetStatus', el.ppa_pahandle); audio_devinfo = PsychPortAudio('GetDevices', [], audio_status.OutDeviceIndex); @@ -165,7 +167,7 @@ audio_n_chan = 1; audio_fs = Snd('DefaultRate'); end -persistent beep_waveforms; + if isempty(beep_waveforms) if el.targetbeep beep_waveforms{1} = repmat(MakeBeep(el.cal_target_beep(1), el.cal_target_beep(3), audio_fs) .* el.cal_target_beep(2), audio_n_chan, 1);