[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 8c3917981c87ebd320ca47b277b6922b03e2fce6
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Dec 4 23:47:28 2008 +0100

    ogsmd: implement org.freesmartphone.GSM.Device.[Get|Set]MicrophoneMuted()

diff --git a/ChangeLog b/ChangeLog
index 91693b9..8438a11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2008-12-04	Michael Lauer	<mickey at openmoko.org>
 
-	* Add necessary methods for a clean system -> subsystems -> objects shutdown.
-	* [ousaged] Disable resource on shutdown.
+	* Added necessary methods for a clean system -> subsystems -> objects shutdown.
+	* [ousaged] Disabled resource on shutdown.
+	* [ogsmd] Implemented org.freesmartphone.GSM.Device.[Get|Set]MicrophoneMuted
 
 2008-12-02	Michael Lauer	<mickey at openmoko.org>
 
diff --git a/framework/subsystems/ogsmd/device.py b/framework/subsystems/ogsmd/device.py
index c893317..d6a0d5c 100644
--- a/framework/subsystems/ogsmd/device.py
+++ b/framework/subsystems/ogsmd/device.py
@@ -11,7 +11,7 @@ Module: device
 """
 
 MODULE_NAME = "ogsmd.device"
-__version__ = "0.9.6"
+__version__ = "0.9.7"
 
 from framework import resource
 from modems import modemFactory, allModems, setCurrentModem
@@ -161,6 +161,18 @@ class Device( resource.Resource ):
     def SetSpeakerVolume( self, modem_volume, dbus_ok, dbus_error ):
         mediator.DeviceSetSpeakerVolume( self, dbus_ok, dbus_error, modem_volume=modem_volume )
 
+    @dbus.service.method( DBUS_INTERFACE_DEVICE, "", "b",
+                          async_callbacks=( "dbus_ok", "dbus_error" ) )
+    @resource.checkedmethod
+    def GetMicrophoneMuted( self, dbus_ok, dbus_error ):
+        mediator.DeviceGetMicrophoneMuted( self, dbus_ok, dbus_error )
+
+    @dbus.service.method( DBUS_INTERFACE_DEVICE, "b", "",
+                          async_callbacks=( "dbus_ok", "dbus_error" ) )
+    @resource.checkedmethod
+    def SetMicrophoneMuted( self, muted, dbus_ok, dbus_error ):
+        mediator.DeviceSetMicrophoneMuted( self, dbus_ok, dbus_error, muted=muted )
+
     #
     # dbus org.freesmartphone.GSM.SIM
     #
diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index 56a0262..7dd22bc 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -407,6 +407,26 @@ class DeviceSetSpeakerVolume( DeviceMediator ):
         else:
             self._error( error.InvalidParameter( "Volume needs to be within [ 0, 100 ]." ) )
 
+#=========================================================================#
+class DeviceGetMicrophoneMuted( DeviceMediator ):
+#=========================================================================#
+    def trigger( self ):
+        self._commchannel.enqueue( "+CMUT?", self.responseFromChannel, self.errorFromChannel )
+
+    @logged
+    def responseFromChannel( self, request, response ):
+        if response[-1] == "OK" and response[0].startswith( "+CMUT" ):
+            value = int( self._rightHandSide( response[0] ) )
+            self._ok( value == 1 )
+        else:
+            DeviceMediator.responseFromChannel( self, request, response )
+
+#=========================================================================#
+class DeviceSetMicrophoneMuted( DeviceMediator ):
+#=========================================================================#
+    def trigger( self ):
+            self._commchannel.enqueue( "+CMUT=%d" % self.muted, self.responseFromChannel, self.errorFromChannel )
+
 #
 # SIM Mediators
 #

-- 
FSO frameworkd Debian packaging