Merged master into improved auto detection

Author: chaosparrot

lib/record_data.py

@@ -63,7 +63,7 @@ def record_controls( key_poller, recordQueue=None ):
                     if index == 0:
                         main_state = recorders[mic_index].get_detection_state()
                     else:
-                        secondary_states[index - 1] = secondary_states[index - 1].get_detection_state()
+                        secondary_states[index - 1] = recorders[mic_index].get_detection_state()
                     index += 1
                     print_status(main_state, secondary_states)
 
@@ -145,7 +145,7 @@ def record_controls( key_poller, recordQueue=None ):
                                 if index == 0:
                                     main_state = recorders[mic_index].get_detection_state()
                                 else:
-                                    secondary_states[index - 1] = secondary_states[index - 1].get_detection_state()
+                                    secondary_states[index - 1] = recorders[mic_index].get_detection_state()
                                 index += 1
                                 print_status(main_state, secondary_states)
                             main_state.state = "paused"

lib/stream_recorder.py

@@ -108,7 +108,10 @@ def resume(self):
 
     def pause(self):
         self.stream.stop_stream()
+        
         self.index -= len(self.total_audio_frames)
+        if self.index != 0 and len(self.total_audio_frames) > 0:
+            self.detection_frames = self.detection_frames[:-len(self.total_audio_frames)]
         self.total_audio_frames = []
         self.audio_frames = []
 
@@ -126,14 +129,14 @@ def clear(self, seconds: float) -> bool:
         self.current_occurrence = []
         self.false_occurrence = []
 
-        self.detection_frames = self.detection_frames[:-frames_to_remove]        
+        self.detection_frames = self.detection_frames[:-frames_to_remove]
         self.detection_state.ms_recorded = len(self.detection_frames) * ms_per_frame
         for label in self.detection_state.labels:
             label.ms_detected = 0
             for frame in self.detection_frames:
                 if frame.label == label.label:
                     label.ms_detected += ms_per_frame
-
+        
         # Just completely overwrite the file if we go back to the start for simplicities sake
         if clear_file:
             totalWaveFile = wave.open(self.total_wav_filename, 'wb')

lib/wav.py

@@ -89,7 +89,10 @@ def load_wav_data_from_srt(srt_file: str, source_file: str, feature_engineering_
     halfframe_offset = round( frames_to_read * number_channels * 0.5 )
     start_offsets = [0, -halfframe_offset] if with_offset else [0]
 
-    transition_events = parse_srt_file(srt_file, ms_per_frame)    
+    transition_events = parse_srt_file(srt_file, ms_per_frame)
+    if len(transition_events) < 2:
+        print( "Empty .SRT file for " + source_file + " - Consider deleting " + srt_file + " to resegment the audio file" )
+        
     for index, transition_event in enumerate(transition_events):
         next_event_index = total_frames / frames_to_read if index + 1 >= len(transition_events) else transition_events[index + 1].start_index
         audioFrames = []
@@ -108,6 +111,8 @@ def load_wav_data_from_srt(srt_file: str, source_file: str, feature_engineering_
                         raw_wav = wf.readframes(frames_to_read * number_channels)
                     except RuntimeError:
                     	raw_wav = ""
+                        print( "Error loading in all of the .SRT file for " + source_file + " - Consider deleting " + srt_file + " to resegment the audio file" )
+                        keep_collecting = False
 
                     # Reached the end of wav - do not keep collecting
                     if (len(raw_wav) != SLIDING_WINDOW_AMOUNT * frames_to_read * number_channels ):