Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter@walter-laptop.(none)>2009-11-20 18:48:12 (GMT)
committer Walter Bender <walter@walter-laptop.(none)>2009-11-20 18:48:12 (GMT)
commit4a82f57d4007b8723126a351e347f3f1d6eccb1d (patch)
treede623cdccd069cc4bf19e42e9760110b8c2deecb
parent5ceb1e9a6271e02e0bcb277eeaf2da5f8f071dfb (diff)
support for XO 1.5
-rw-r--r--audiograb.py5
-rw-r--r--measure.py4
2 files changed, 3 insertions, 6 deletions
diff --git a/audiograb.py b/audiograb.py
index b3fe027..801bf62 100644
--- a/audiograb.py
+++ b/audiograb.py
@@ -146,7 +146,6 @@ class AudioGrab:
gst.event_new_flush_start()
self.pipeline.set_state(gst.STATE_PLAYING)
-
def stop_sound_device(self):
"""Stop grabbing data from capture device"""
gst.event_new_flush_stop()
@@ -193,12 +192,10 @@ class AudioGrab:
self.caps1.set_property("caps", gst.caps_from_string(caps_str) )
self.resume_grabbing()
-
def get_sampling_rate(self):
"""Gets the sampling rate of the capture device"""
return int(self.caps1.get_property("caps")[0]['rate'] )
-
def set_callable1(self, callable1):
"""Sets the callable to the drawing function for giving the
data at the end of idle-add"""
@@ -218,7 +215,6 @@ class AudioGrab:
self.start_sound_device()
self.resume_state()
-
def stop_grabbing(self):
self.stop_sound_device()
self.set_handoff_signal(False)
@@ -398,7 +394,6 @@ class AudioGrab_XO_1(AudioGrab):
return True
else:
return False
-
def set_capture_gain(self, capture_val):
"""Sets the Capture gain slider settings
diff --git a/measure.py b/measure.py
index faf2ffb..5788a8e 100644
--- a/measure.py
+++ b/measure.py
@@ -108,7 +108,9 @@ class MeasureActivity(activity.Activity):
self.audiograb = \
audiograb.AudioGrab_XO_1(self.wave.new_buffer, self.ji)
else:
- log.error('Sorry, we do not support your hardware yet.')
+ self.audiograb = \
+ audiograb.AudioGrab_XO_1(self.wave.new_buffer, self.ji)
+ # log.error('Sorry, we do not support your hardware yet.')
self.side_toolbar = SideToolbar(self.wave)
self.text_box = TextBox()