diff options
Diffstat (limited to 'measure.py')
| -rw-r--r-- | measure.py | 34 |
1 files changed, 3 insertions, 31 deletions
@@ -49,24 +49,6 @@ log = logging.getLogger('Measure') log.setLevel(logging.DEBUG) logging.basicConfig() -def _get_hardware(): - # This is so horribly convoluted :-( - bus = dbus.SystemBus() - - comp_obj = bus.get_object('org.freedesktop.Hal', \ - '/org/freedesktop/Hal/devices/computer') - dev = dbus.Interface (comp_obj, 'org.freedesktop.Hal.Device') - if dev.PropertyExists('system.hardware.vendor') and \ - dev.PropertyExists('system.hardware.version'): - if dev.GetProperty ('system.hardware.vendor') == 'OLPC': - if dev.GetProperty('system.hardware.version') == '1.5': - return 'xo1.5' - elif dev.GetProperty('system.hardware.version') == '1.0': - return 'xo1' - elif 'olpc' in dev.GetProperty('system.kernel.version'): # this is not good - return 'xo1' - else: - return 'unknown' class MeasureActivity(activity.Activity): @@ -100,19 +82,9 @@ class MeasureActivity(activity.Activity): self.ji = JournalInteraction(self._jobject.file_path, self.existing) self.wave = DrawWaveform() - hw = _get_hardware() - if hw == 'xo1.5': - self.audiograb = \ - audiograb.AudioGrab_XO_1_5(self.wave.new_buffer, self.ji) - elif hw == 'xo1': - self.audiograb = \ - audiograb.AudioGrab_XO_1(self.wave.new_buffer, self.ji) - else: - 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.audiograb = audiograb.AudioGrab(self.wave.new_buffer, self.ji) + + self.side_toolbar = SideToolbar(self.wave, self.audiograb) self.text_box = TextBox() self.box3 = gtk.HBox(False, 0) |