fixed audiograb.py Gst settings

1 files changed, 31 insertions, 31 deletions

diff --git a/audiograb.py b/audiograb.py
index 87d6e7f..2e91c38 100644
--- a/audiograb.py
+++ b/audiograb.py
@@ -132,44 +132,44 @@ class AudioGrab():
         self.capture_gain = self.get_capture_gain()
         self.mic_boost = self.get_mic_boost()
 
-        # Set up Gstreamer pipeline
+        # Set up Gstreamer Pipeline
         self._pad_count = 0
         self.pads = []
         self.queue = []
         self.fakesink = []
-        self.pipeline = Gst.Pipeline('pipeline')
-        self.alsasrc = Gst.element_factory_make('alsasrc', 'alsa-source')
-        self.pipeline.add(self.alsasrc)
-        self.caps1 = Gst.element_factory_make('capsfilter', 'caps1')
-        self.pipeline.add(self.caps1)
+        self.Pipeline = Gst.Pipeline('Pipeline')
+        self.alsasrc = Gst.ElementFactory.make('alsasrc', 'alsa-source')
+        self.Pipeline.add(self.alsasrc)
+        self.caps1 = Gst.ElementFactory.make('capsfilter', 'caps1')
+        self.Pipeline.add(self.caps1)
         caps_str = 'audio/x-raw-int,rate=%d,channels=%d,depth=16' % (
             RATE, self.channels)
         self.caps1.set_property('caps', Gst.caps_from_string(caps_str))
         if self.channels == 1:
-            self.fakesink.append(Gst.element_factory_make('fakesink', 'fsink'))
-            self.pipeline.add(self.fakesink[0])
+            self.fakesink.append(Gst.ElementFactory.make('fakesink', 'fsink'))
+            self.Pipeline.add(self.fakesink[0])
             self.fakesink[0].connect('handoff', self.on_buffer, 0)
             self.fakesink[0].set_property('signal-handoffs', True)
             Gst.element_link_many(self.alsasrc, self.caps1, self.fakesink[0])
         else:
             if not hasattr(self, 'splitter'):
-                self.splitter = Gst.element_factory_make('deinterleave')
-                self.pipeline.add(self.splitter)
+                self.splitter = Gst.ElementFactory.make('deinterleave')
+                self.Pipeline.add(self.splitter)
                 self.splitter.set_properties('keep-positions=true', 'name=d')
                 self.splitter.connect('pad-added', self._splitter_pad_added)
                 Gst.element_link_many(self.alsasrc, self.caps1, self.splitter)
             for i in range(self.channels):
-                self.queue.append(Gst.element_factory_make('queue'))
-                self.pipeline.add(self.queue[i])
-                self.fakesink.append(Gst.element_factory_make('fakesink'))
-                self.pipeline.add(self.fakesink[i])
+                self.queue.append(Gst.ElementFactory.make('queue'))
+                self.Pipeline.add(self.queue[i])
+                self.fakesink.append(Gst.ElementFactory.make('fakesink'))
+                self.Pipeline.add(self.fakesink[i])
                 self.fakesink[i].connect('handoff', self.on_buffer, i)
                 self.fakesink[i].set_property('signal-handoffs', True)
 
     def _query_mixer(self):
-        self._mixer = Gst.element_factory_make('alsamixer')
-        rc = self._mixer.set_state(Gst.STATE_PAUSED)
-        assert rc == Gst.STATE_CHANGE_SUCCESS
+        self._mixer = Gst.ElementFactory.make('alsamixer')
+        rc = self._mixer.set_state(Gst.State_PAUSED)
+        assert rc == Gst.State_CHANGE_SUCCESS
 
         # Query the available controls
         tracks_list = self._mixer.list_tracks()
@@ -193,9 +193,9 @@ class AudioGrab():
             self._labels_available = False
 
     def _unlink_sink_queues(self):
-        ''' Build the sink pipelines '''
+        ''' Build the sink Pipelines '''
 
-        # If there were existing pipelines, unlink them
+        # If there were existing Pipelines, unlink them
         for i in range(self._pad_count):
             log.debug('unlinking old elements')
             try:
@@ -204,10 +204,10 @@ class AudioGrab():
             except:
                 traceback.print_exc()
 
-        # Build the new pipelines
+        # Build the new Pipelines
         self._pad_count = 0
         self.pads = []
-        log.debug('building new pipelines')
+        log.debug('building new Pipelines')
 
     def _splitter_pad_added(self, element, pad):
         ''' Seems to be the case that ring is right channel 0,
@@ -215,15 +215,15 @@ class AudioGrab():
         log.debug('splitter pad %d added' % (self._pad_count))
         self.pads.append(pad)
         if (self._pad_count < min(self.channels, MAX_GRAPHS)):
-            pad.link(self.queue[self._pad_count].get_pad('sink'))
-            self.queue[self._pad_count].get_pad('src').link(
-                self.fakesink[self._pad_count].get_pad('sink'))
+            pad.link(self.queue[self._pad_count].get_static('sink'))
+            self.queue[self._pad_count].get_static('src').link(
+                self.fakesink[self._pad_count].get_static('sink'))
             self._pad_count += 1
         else:
             log.debug('ignoring channels > %d' % (min(self.channels,
                                                       MAX_GRAPHS)))
         if self._pad_count == self.channels:
-            log.debug('pipeline added...')
+            log.debug('Pipeline added...')
             self.activity.sensor_toolbar.unlock_radio_buttons()
 
     def set_handoff_signal(self, handoff_state):
@@ -385,12 +385,12 @@ class AudioGrab():
     def start_sound_device(self):
         '''Start or Restart grabbing data from the audio capture'''
         Gst.event_new_flush_start()
-        self.pipeline.set_state(Gst.STATE_PLAYING)
+        self.Pipeline.set_state(Gst.State_PLAYING)
 
     def stop_sound_device(self):
         '''Stop grabbing data from capture device'''
         Gst.event_new_flush_stop()
-        self.pipeline.set_state(Gst.STATE_NULL)
+        self.Pipeline.set_state(Gst.State_NULL)
 
     def set_logging_params(self, start_stop=False, interval=0,
                            screenshot=True):
@@ -405,7 +405,7 @@ class AudioGrab():
                 self._log_this_sample = False
                 self._logging_counter = 0
         elif interval != 0:
-            self._make_timer()
+            self..make_timer()
         self._take_screenshot = screenshot
         self._busy = False
 
@@ -413,9 +413,9 @@ class AudioGrab():
         ''' Log the current sample now. This method is called from the
         _logging_timer object when the interval expires. '''
         self._log_this_sample = True
-        self._make_timer()
+        self..make_timer()
 
-    def _make_timer(self):
+    def .make_timer(self):
         ''' Create the next timer that will trigger data logging. '''
         self._logging_timer = Timer(self._logging_interval, self._sample_now)
         self._logging_timer.start()
@@ -870,7 +870,7 @@ class AudioGrab():
                 str(mode), str(bias), str(gain), str(boost)))
 
         if mode is not None:
-            # If we change to/from dc mode, we need to rebuild the pipelines
+            # If we change to/from dc mode, we need to rebuild the Pipelines
             log.debug('sensor mode has changed')
             self.stop_grabbing()
             if self.channels > 1: