[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Michael 'Mickey' Lauer]

The following commit has been merged in the debian branch:
commit 93edef6673e1b25fc334470121b501a68b41ddfe
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Sat Sep 5 13:25:54 2009 +0200

    odeviced: fix org.freesmartphone.Device.Audio.GetInfo() implementation

diff --git a/framework/subsystems/odeviced/audio.py b/framework/subsystems/odeviced/audio.py
index c93efa2..dc0a942 100644
--- a/framework/subsystems/odeviced/audio.py
+++ b/framework/subsystems/odeviced/audio.py
@@ -2,7 +2,7 @@
 """
 Open Device Daemon - A plugin for audio device peripherals
 
-(C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2008-2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
 (C) 2008 Openmoko, Inc.
 GPLv2 or later
 
@@ -11,7 +11,7 @@ Module: audio
 """
 
 MODULE_NAME = "odeviced.audio"
-__version__ = "0.5.9.10"
+__version__ = "0.5.9.11"
 
 from framework.config import config
 from framework.patterns import asyncworker, processguard
@@ -485,10 +485,17 @@ class Audio( dbus.service.Object ):
     #
     # dbus info methods
     #
-    @dbus.service.method( DBUS_INTERFACE, "", "s",
+    @dbus.service.method( DBUS_INTERFACE, "", "a{sv}",
                           async_callbacks=( "dbus_ok", "dbus_error" ) )
     def GetInfo( self, dbus_ok, dbus_error ):
-        dbus_ok( self.player.__class__.__name__ )
+        info = {}
+        formats = []
+        for player in self.players.values():
+            formats += player.supportedFormats()
+        info["name"] = "Default Audio Device"
+        info["formats"] = list( set( formats ) )
+        info["scenario"] = self.scenario.getScenario()
+        dbus_ok( info )
 
     #
     # dbus sound methods

-- 
FSO frameworkd Debian packaging