fixed sounddevice

dev-jam · Jun 2, 2022 · 74ec45f · 74ec45f
1 parent 7aa6f51
commit 74ec45f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 36 deletions.
diff --git a/opensesame_plugins/audio_low_latency_play/audio_low_latency_play.py b/opensesame_plugins/audio_low_latency_play/audio_low_latency_play.py
@@ -239,9 +239,6 @@ def play_file(self, stream, wav_file, chunk, delay):
                 self.clock.sleep(delay)
                 self.show_message(u'Delay done')
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.start()
-
         start_time = self.set_stimulus_onset()
 
         self.show_message(u'Starting audio playback')
@@ -275,9 +272,6 @@ def play_file(self, stream, wav_file, chunk, delay):
                     self.show_message(u'Audio stopped, duration exceeded')
                     break
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.stop()
-
         self.set_stimulus_offset()
 
         wav_file.close()
@@ -293,9 +287,6 @@ def play_data(self, stream, wav_data, chunk, delay):
                 self.clock.sleep(delay)
                 self.show_message(u'Delay done')
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.start()
-
         start_time = self.set_stimulus_onset()
 
         self.show_message(u'Starting audio playback')
@@ -326,9 +317,6 @@ def play_data(self, stream, wav_data, chunk, delay):
                     self.show_message(u'Audio stopped, duration exceeded')
                     break
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.stop()
-
         self.set_stimulus_offset()
 
         self.show_message(u'Finished audio playback')

diff --git a/opensesame_plugins/audio_low_latency_play_init/audio_low_latency_play_init.py b/opensesame_plugins/audio_low_latency_play_init/audio_low_latency_play_init.py
@@ -321,6 +321,8 @@ def prepare(self):
                     raise osexception(
                         u'Could not start audio device', exception=e)
 
+                self.device.start()
+
             elif self.module == self.experiment.oss4_module_name:
                 import ossaudiodev
                 self.device = ossaudiodev.open('w')

diff --git a/opensesame_plugins/audio_low_latency_play_start/audio_low_latency_play_start.py b/opensesame_plugins/audio_low_latency_play_start/audio_low_latency_play_start.py
@@ -251,9 +251,6 @@ def play_file(self, stream, wav_file, chunk, delay):
                 self.clock.sleep(delay)
                 self.show_message(u'Delay done')
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.start()
-
         start_time = self.set_stimulus_onset()
 
         self.show_message(u'Starting audio playback')
@@ -281,9 +278,6 @@ def play_file(self, stream, wav_file, chunk, delay):
                     self.show_message(u'Audio playback stopped, duration exceeded')
                     break
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.stop()
-
         self.set_stimulus_offset()
 
         wav_file.close()
@@ -302,9 +296,6 @@ def play_data(self, stream, wav_data, chunk, delay):
                 self.clock.sleep(delay)
                 self.show_message(u'Delay done')
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.start()
-
         start_time = self.set_stimulus_onset()
 
         self.show_message(u'Starting audio playback')
@@ -329,9 +320,6 @@ def play_data(self, stream, wav_data, chunk, delay):
                     self.show_message(u'Audio stopped, duration exceeded')
                     break
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.stop()
-
         self.set_stimulus_offset()
 
         self.show_message(u'Finished audio playback')

diff --git a/opensesame_plugins/audio_low_latency_record/audio_low_latency_record.py b/opensesame_plugins/audio_low_latency_record/audio_low_latency_record.py
@@ -231,9 +231,6 @@ def record(self, stream, wav_file, chunk, delay_start, delay_stop):
                 self.clock.sleep(delay_start)
                 self.show_message(u'Delay done')
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.start()
-
         start_time = self.set_stimulus_onset()
 
         while True:
@@ -267,9 +264,6 @@ def record(self, stream, wav_file, chunk, delay_start, delay_stop):
         if self.ram_cache == u'yes':
             wav_file.writeframes(b''.join(frames))
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.stop()
-
         wav_file.close()
 
         self.show_message(u'Finished audio recording')

diff --git a/opensesame_plugins/audio_low_latency_record_init/audio_low_latency_record_init.py b/opensesame_plugins/audio_low_latency_record_init/audio_low_latency_record_init.py
@@ -321,6 +321,8 @@ def prepare(self):
                     raise osexception(
                         u'Could not start audio device', exception=e)
 
+                self.device.start()
+
             elif self.module == self.experiment.oss4_module_name:
                 import ossaudiodev
                 self.device = ossaudiodev.open('r')

diff --git a/opensesame_plugins/audio_low_latency_record_start/audio_low_latency_record_start.py b/opensesame_plugins/audio_low_latency_record_start/audio_low_latency_record_start.py
@@ -239,9 +239,6 @@ def record(self, stream, wav_file, chunk, delay_start, delay_stop):
                 self.clock.sleep(delay_start)
                 self.show_message(u'Delay done')
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.start()
-
         start_time = self.set_stimulus_onset()
 
         while True:
@@ -275,9 +272,6 @@ def record(self, stream, wav_file, chunk, delay_start, delay_stop):
         if self.ram_cache == u'yes':
             wav_file.writeframes(b''.join(frames))
 
-        if self.module == self.experiment.sounddevice_module_name:
-            stream.stop()
-
         wav_file.close()
 
         self.show_message(u'Finished audio recording')