From e951f926b9d4248922cf5d702b3a1e69c8eb1e77 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Tue, 08 Apr 2014 14:55:57 +0000
Subject: code consolidation

---
diff --git a/plugins/audio_sensors/audio_sensors.py b/plugins/audio_sensors/audio_sensors.py
index 32a56bd..3f30be9 100644
--- a/plugins/audio_sensors/audio_sensors.py
+++ b/plugins/audio_sensors/audio_sensors.py
@@ -282,17 +282,7 @@ class Audio_sensors(Plugin):
         if not self._status:
             return 0
 
-        if not self._sound_init:
-            mode, bias, gain, boost = self.PARAMETERS[SENSOR_AC_BIAS]
-            self.audiograb = AudioGrab(self.new_buffer, self,
-                                       mode, bias, gain, boost)
-            self._channels = self.audiograb.channels
-            for i in range(self._channels):
-                self.ringbuffer.append(RingBuffer1d(self.max_samples,
-                                                    dtype='int16'))
-                self.audiograb.start_grabbing()
-                self.audio_started = True
-                self._sound_init = True
+        self._init_sound()
 
         self._prim_sound(0)
         # Return average of both channels if sampling in stereo
@@ -302,6 +292,19 @@ class Audio_sensors(Plugin):
         else:
             return self._sound[0]
 
+    def _init_sound(self):
+        if not self._sound_init:
+            mode, bias, gain, boost = self.PARAMETERS[SENSOR_AC_BIAS]
+            self.audiograb = AudioGrab(self.new_buffer, self,
+                                       mode, bias, gain, boost)
+            self._channels = self.audiograb.channels
+            for i in range(self._channels):
+                self.ringbuffer.append(RingBuffer1d(self.max_samples,
+                                                    dtype='int16'))
+            self.audiograb.start_grabbing()
+            self.audio_started = True
+            self._sound_init = True
+
     def _prim_sound(self, channel):
         ''' return raw mic in value '''
         buf = self.ringbuffer[channel].read(None, self.input_step)
@@ -318,17 +321,7 @@ class Audio_sensors(Plugin):
         if not self._status:
             return 0
 
-        if not self._sound_init:
-            mode, bias, gain, boost = self.PARAMETERS[SENSOR_AC_BIAS]
-            self.audiograb = AudioGrab(self.new_buffer, self,
-                                       mode, bias, gain, boost)
-            self._channels = self.audiograb.channels
-            for i in range(self._channels):
-                self.ringbuffer.append(RingBuffer1d(self.max_samples,
-                                                    dtype='int16'))
-                self.audiograb.start_grabbing()
-                self.audio_started = True
-                self._sound_init = True
+        self._init_sound()
 
         self._prim_volume(0)
         # Return average of both channels if sampling in stereo
@@ -354,17 +347,7 @@ class Audio_sensors(Plugin):
         if not self._status:
             return 0
 
-        if not self._sound_init:
-            mode, bias, gain, boost = self.PARAMETERS[SENSOR_AC_BIAS]
-            self.audiograb = AudioGrab(self.new_buffer, self,
-                                       mode, bias, gain, boost)
-            self._channels = self.audiograb.channels
-            for i in range(self._channels):
-                self.ringbuffer.append(RingBuffer1d(self.max_samples,
-                                                    dtype='int16'))
-                self.audiograb.start_grabbing()
-                self.audio_started = True
-                self._sound_init = True
+        self._init_sound()
 
         self._prim_pitch(0)
         # Return average of both channels if sampling in stereo
@@ -407,9 +390,9 @@ class Audio_sensors(Plugin):
             for i in range(self._channels):
                 self.ringbuffer.append(RingBuffer1d(self.max_samples,
                                                     dtype='int16'))
-                self.audiograb.start_grabbing()
-                self.audio_started = True
-                self._resistance_init = True
+            self.audiograb.start_grabbing()
+            self.audio_started = True
+            self._resistance_init = True
 
         if self.hw in [XO1, XO4]:
             self._prim_resistance(0)
@@ -483,9 +466,9 @@ class Audio_sensors(Plugin):
             for i in range(self._channels):
                 self.ringbuffer.append(RingBuffer1d(self.max_samples,
                                                     dtype='int16'))
-                self.audiograb.start_grabbing()
-                self.audio_started = True
-                self._voltage_init = True
+            self.audiograb.start_grabbing()
+            self.audio_started = True
+            self._voltage_init = True
 
         if self.hw in [XO1, XO4]:
             self._prim_voltage(0)
--
cgit v0.9.1