Merge pull request #3689 from yh-luo/fix_truncated_sound

BF: fixed the bug that setSound() incorrectly truncate the sound file
psychopy · Mar 19, 2021 · 49cf52e · 49cf52e
2 parents b1d932e + 1b536af
commit 49cf52e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/psychopy/sound/backend_ptb.py b/psychopy/sound/backend_ptb.py
@@ -491,7 +491,7 @@ def _setSndFromArray(self, thisArray):
                               "stereo. Shape={}".format(self.sndArr.shape))
         self._nSamples = thisArray.shape[0]
         if self.stopTime == -1:
-            self.stopTime = self._nSamples / float(self.sampleRate)
+            self.duration = self._nSamples / float(self.sampleRate)
         # set to run from the start:
         self.seek(0)
         self.sourceType = "array"

diff --git a/psychopy/sound/backend_sounddevice.py b/psychopy/sound/backend_sounddevice.py
@@ -462,7 +462,7 @@ def _setSndFromArray(self, thisArray):
                               "stereo. Shape={}".format(self.sndArr.shape))
         self._nSamples = thisArray.shape[0]
         if self.stopTime == -1:
-            self.stopTime = self._nSamples/float(self.sampleRate)
+            self.duration = self._nSamples/float(self.sampleRate)
         # set to run from the start:
         self.seek(0)
         self.sourceType = "array"
@@ -508,7 +508,7 @@ def stop(self, reset=True):
     def _nextBlock(self):
         if self.status == STOPPED:
             return
-        samplesLeft = int((self.stopTime - self.t) * self.sampleRate)
+        samplesLeft = int((self.duration - self.t) * self.sampleRate)
         nSamples = min(self.blockSize, samplesLeft)
         if self.sourceType == 'file' and self.preBuffer == 0:
             # streaming sound block-by-block direct from file