packaging/0002-DBus-sending-routing-interface-bug-fixes.patch

   1 From 0cf6c971b40bb6b35d839d6c8124103b390950e0 Mon Sep 17 00:00:00 2001
   2 From: Jaska Uimonen <jaska.uimonen@helsinki.fi>
   3 Date: Wed, 6 Jun 2012 17:43:58 +0300
   4 Subject: [PATCH 2/8] DBus sending&routing interface bug fixes.
   5
   6 ---
   7  PluginRoutingInterfaceDbus/include/CAmDbusSend.h   |    2 +-
   8  PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp     |    2 +-
   9  .../src/CAmRoutingSenderDbus.cpp                   |   37 ++++++++++++++------
  10  3 files changed, 28 insertions(+), 13 deletions(-)
  11
  12 diff --git a/PluginRoutingInterfaceDbus/include/CAmDbusSend.h b/PluginRoutingInterfaceDbus/include/CAmDbusSend.h
  13 index 3f8f0a5..97e62fb 100644
  14 --- a/PluginRoutingInterfaceDbus/include/CAmDbusSend.h
  15 +++ b/PluginRoutingInterfaceDbus/include/CAmDbusSend.h
  16 @@ -32,7 +32,7 @@ namespace am
  17  class CAmRoutingDbusSend
  18  {
  19  public:
  20 -    CAmRoutingDbusSend(DBusConnection* conn, std::string bus_name, std::string  path, std::string  interface, std::string  method);
  21 +    CAmRoutingDbusSend(DBusConnection* conn, std::string& bus_name, std::string&  path, std::string&  interface, std::string&  method);
  22      virtual ~CAmRoutingDbusSend();
  23      void append(std::string string);
  24      void append(uint16_t integer);
  25 diff --git a/PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp b/PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp
  26 index 0f02ab3..b393569 100644
  27 --- a/PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp
  28 +++ b/PluginRoutingInterfaceDbus/src/CAmDbusSend.cpp
  29 @@ -25,7 +25,7 @@ namespace am
  30
  31  DLT_IMPORT_CONTEXT(routingDbus)
  32
  33 -CAmRoutingDbusSend::CAmRoutingDbusSend(DBusConnection* conn, std::string bus_name, std::string path, std::string interface, std::string method) :
  34 +CAmRoutingDbusSend::CAmRoutingDbusSend(DBusConnection* conn, std::string& bus_name, std::string& path, std::string& interface, std::string& method) :
  35          mpDbusMessage(NULL), //
  36          mpDbusConnection(conn), //
  37          mDbusMessageIter(), //
  38 diff --git a/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp
  39 index 360d61d..f95ec33 100644
  40 --- a/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp
  41 +++ b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp
  42 @@ -95,7 +95,8 @@ am_Error_e CAmRoutingSenderDbus::asyncAbort(const am_Handle_s handle)
  43      iter = mMapHandles.find(handle.handle);
  44      if (iter != mMapHandles.end())
  45      {
  46 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncAbort");
  47 +        std::string method("asyncAbort");
  48 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
  49          send.append(handle.handle);
  50          return (send.send());
  51      }
  52 @@ -111,7 +112,12 @@ am_Error_e CAmRoutingSenderDbus::asyncConnect(const am_Handle_s handle, const am
  53      iter = mMapSources.find(sourceID);
  54      if (iter != mMapSources.end())
  55      {
  56 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncConnect");
  57 +        std::string busname(iter->second.busname);
  58 +        std::string path(iter->second.path);
  59 +        std::string interface(iter->second.interface);
  60 +        std::string method("asyncConnect");
  61 +
  62 +        CAmRoutingDbusSend send(mpDBusConnection, busname, path, interface, method);
  63          send.append(handle.handle);
  64          send.append(connectionID);
  65          send.append(sourceID);
  66 @@ -132,7 +138,8 @@ am_Error_e CAmRoutingSenderDbus::asyncDisconnect(const am_Handle_s handle, const
  67      iter = mMapConnections.find(connectionID);
  68      if (iter != mMapConnections.end())
  69      {
  70 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncDisconnect");
  71 +        std::string method("asyncDisconnect");
  72 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
  73          send.append(handle.handle);
  74          send.append(connectionID);
  75          mMapHandles.insert(std::make_pair(handle.handle, iter->second));
  76 @@ -149,7 +156,8 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSinkVolume(const am_Handle_s handle, co
  77      iter = mMapSinks.find(sinkID);
  78      if (iter != mMapSinks.end())
  79      {
  80 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncSetSinkVolume");
  81 +        std::string method("asyncSetSinkVolume");
  82 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
  83          send.append(handle.handle);
  84          send.append(sinkID);
  85          send.append(volume);
  86 @@ -169,7 +177,8 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSourceVolume(const am_Handle_s handle,
  87      iter = mMapSources.find(sourceID);
  88      if (iter != mMapSources.end())
  89      {
  90 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncSetSourceVolume");
  91 +        std::string method("asyncSetSourceVolume");
  92 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
  93          send.append(handle.handle);
  94          send.append(sourceID);
  95          send.append(volume);
  96 @@ -189,7 +198,8 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSourceState(const am_Handle_s handle, c
  97      iter = mMapSources.find(sourceID);
  98      if (iter != mMapSources.end())
  99      {
 100 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncSetSourceState");
 101 +        std::string method("asyncSetSourceState");
 102 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
 103          send.append(handle.handle);
 104          send.append(sourceID);
 105          send.append(static_cast<int16_t>(state));
 106 @@ -207,7 +217,8 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSinkSoundProperties(const am_Handle_s h
 107      iter = mMapSinks.find(sinkID);
 108      if (iter != mMapSinks.end())
 109      {
 110 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncSetSinkSoundProperties");
 111 +        std::string method("asyncSetSinkSoundProperties");
 112 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
 113          send.append(handle.handle);
 114          send.append(sinkID);
 115          send.append(listSoundProperties);
 116 @@ -225,7 +236,8 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSinkSoundProperty(const am_Handle_s han
 117      iter = mMapSinks.find(sinkID);
 118      if (iter != mMapSinks.end())
 119      {
 120 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncSetSinkSoundProperty");
 121 +        std::string method("asyncSetSinkSoundProperty");
 122 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
 123          send.append(handle.handle);
 124          send.append(sinkID);
 125          send.append(soundProperty);
 126 @@ -243,7 +255,8 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSourceSoundProperties(const am_Handle_s
 127      iter = mMapSources.find(sourceID);
 128      if (iter != mMapSources.end())
 129      {
 130 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncSetSourceSoundProperties");
 131 +        std::string method("asyncSetSourceSoundProperties");
 132 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
 133          send.append(handle.handle);
 134          send.append(sourceID);
 135          send.append(listSoundProperties);
 136 @@ -261,7 +274,8 @@ am_Error_e CAmRoutingSenderDbus::asyncSetSourceSoundProperty(const am_Handle_s h
 137      iter = mMapSources.find(sourceID);
 138      if (iter != mMapSources.end())
 139      {
 140 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "asyncSetSourceSoundProperty");
 141 +        std::string method("asyncSetSourceSoundProperty");
 142 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
 143          send.append(handle.handle);
 144          send.append(sourceID);
 145          send.append(soundProperty);
 146 @@ -290,7 +304,8 @@ am_Error_e CAmRoutingSenderDbus::setDomainState(const am_domainID_t domainID, co
 147      iter = mMapDomains.find(domainID);
 148      if (iter != mMapDomains.end())
 149      {
 150 -        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, "setDomainState");
 151 +        std::string method("setDomainState");
 152 +        CAmRoutingDbusSend send(mpDBusConnection, iter->second.busname, iter->second.path, iter->second.interface, method);
 153          send.append(domainID);
 154          send.append(static_cast<int16_t>(domainState));
 155          return (send.send());
 156 --
 157 1.7.7.6
 158