diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-04-18 14:37:36 +0200 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-05-24 13:40:22 +0200 |
| commit | a74d588f039b4d7b583de5b4be108c98bd242642 (patch) | |
| tree | 10e4772bdda715eb9ee19479687e839239d40244 /PluginRoutingInterfaceDbus | |
| parent | 96d72c5be3cd6fab92914aa0eb076263a382eb95 (diff) | |
| download | audiomanager-a74d588f039b4d7b583de5b4be108c98bd242642.tar.gz | |
* changes for enabling the demo @AMM
Signed-off-by: christian mueller <christian.ei.mueller@bmw.de>
Diffstat (limited to 'PluginRoutingInterfaceDbus')
| -rw-r--r-- | PluginRoutingInterfaceDbus/include/RoutingReceiver.xml | 4 | ||||
| -rw-r--r-- | PluginRoutingInterfaceDbus/include/RoutingSender.xml | 10 | ||||
| -rw-r--r-- | PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp | 20 |
3 files changed, 13 insertions, 21 deletions
diff --git a/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml b/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml index a263966..711e166 100644 --- a/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml +++ b/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml @@ -17,12 +17,12 @@ </method> <method name="ackSetSinkVolume"> <arg name="handle" type="q" direction="in" /> - <arg name="volume" type="i" direction="in" /> + <arg name="volume" type="n" direction="in" /> <arg name="error" type="q" direction="in" /> </method> <method name="ackSetSourceVolume"> <arg name="handle" type="q" direction="in" /> - <arg name="volume" type="i" direction="in" /> + <arg name="volume" type="n" direction="in" /> <arg name="error" type="q" direction="in" /> </method> <method name="ackSetSourceState"> diff --git a/PluginRoutingInterfaceDbus/include/RoutingSender.xml b/PluginRoutingInterfaceDbus/include/RoutingSender.xml index 7841218..d6fb2ea 100644 --- a/PluginRoutingInterfaceDbus/include/RoutingSender.xml +++ b/PluginRoutingInterfaceDbus/include/RoutingSender.xml @@ -4,11 +4,11 @@ "http://standards.freedesktop.org/dbus/1.0/introspect.dtd"> <node> - <interface name='org.pulseaudio.genivi.RoutingSender'> + <interface name='org.pulseaudio.genivi.RoutingSend'> <method name='asyncAbort'> <arg name='handle' type='q' direction='in' /> <arg name='error' type='n' direction='out' /> - </method> + </method> <method name='asyncConnect'> <arg name='handle' type='q' direction='in' /> <arg name='connectionID' type='q' direction='in' /> @@ -22,7 +22,7 @@ <arg name='connectionID' type='q' direction='in' /> <arg name='error' type='n' direction='out' /> </method> - <method name='setSinkVolume'> + <method name='asyncSetSinkVolume'> <arg name='handle' type='q' direction='in' /> <arg name='sinkID' type='q' direction='in' /> <arg name='volume' type='n' direction='in' /> @@ -30,7 +30,7 @@ <arg name='time' type='q' direction='in' /> <arg name='error' type='n' direction='out' /> </method> - <method name='setSourceVolume'> + <method name='asyncSetSourceVolume'> <arg name='handle' type='q' direction='in' /> <arg name='sourceID' type='q' direction='in' /> <arg name='volume' type='n' direction='in' /> @@ -81,5 +81,5 @@ <arg name='domainState' type='q' direction='in' /> <arg name='error' type='n' direction='out' /> </method> -</interface> + </interface> </node> diff --git a/PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp b/PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp index 0f02ab3..cca1cd7 100644 --- a/PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp +++ b/PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp @@ -116,25 +116,17 @@ void CAmRoutingDbusSend::append(am_SoundProperty_s soundProperty) am_Error_e CAmRoutingDbusSend::send() { - am_Error_e error; + int16_t error; DBusMessage* reply(dbus_connection_send_with_reply_and_block(mpDbusConnection, mpDbusMessage, -1, &mDBusError)); if (!reply) { log(&routingDbus, DLT_LOG_ERROR, "CAmRoutingDbusSend::send failed, dbus error", mDBusError.message); return (E_UNKNOWN); } - if (!dbus_message_iter_init(reply, &mDbusMessageIter)) - { - log(&routingDbus, DLT_LOG_ERROR, "DBusMessageHandler::send DBus Message has no arguments!"); - } - if (DBUS_TYPE_INT16 != dbus_message_iter_get_arg_type(&mDbusMessageIter)) - { - log(&routingDbus, DLT_LOG_ERROR, "DBusMessageHandler::getBool DBUS handler argument is no error!"); - } - else - { - dbus_message_iter_get_basic(&mDbusMessageIter, &error); - } - return (error); + if(!dbus_message_get_args(reply, &mDBusError, // + DBUS_TYPE_INT16, &error, // + DBUS_TYPE_INVALID)) + return (E_UNKNOWN); + return (static_cast<am_Error_e>(error)); } } |