- added comments in XML description

- fixed bug in Dbus signal sending
- corrected namespace usage

3 files changed, 26 insertions, 17 deletions

diff --git a/PluginCommandInterfaceDbus/include/CommandReceiverShadow.h b/PluginCommandInterfaceDbus/include/CommandReceiverShadow.h
index c05a0ad..b558d0c 100644
--- a/PluginCommandInterfaceDbus/include/CommandReceiverShadow.h
+++ b/PluginCommandInterfaceDbus/include/CommandReceiverShadow.h
@@ -26,19 +26,20 @@
 #ifndef COMMANDRECEIVERSHADOW_H_
 #define COMMANDRECEIVERSHADOW_H_
 
-#include "DBusMessageHandler.h"
-
 #include <command/CommandReceiveInterface.h>
 #include <dbus/dbus.h>
 #include <dlt/dlt.h>
 #include <map>
+#include "DBusWrapper.h"
+#include "DBusMessageHandler.h"
+
+namespace am {
 
-DLT_IMPORT_CONTEXT(DBusCommandPlugin)
 
 #define INTROSPECTION_XML_FILE "/home/christian/workspace/gitserver/dbusIncludes/CommandInterface.xml"
 
+
 class CommandReceiverShadow;
-using namespace am;
 
 typedef void (CommandReceiverShadow::*CallBackMethod)(DBusConnection *connection, DBusMessage *message);
 
@@ -107,4 +108,6 @@ private:
 	functionMap_t createMap();
 };
 
+}
+
 #endif /* COMMANDRECEIVERSHADOW_H_ */
diff --git a/PluginCommandInterfaceDbus/include/DBusCommandSender.h b/PluginCommandInterfaceDbus/include/DBusCommandSender.h
index 724f412..d3d058e 100644
--- a/PluginCommandInterfaceDbus/include/DBusCommandSender.h
+++ b/PluginCommandInterfaceDbus/include/DBusCommandSender.h
@@ -27,17 +27,19 @@
 #ifndef DBUSCOMMANDSENDER_H_
 #define DBUSCOMMANDSENDER_H_
 
-#include "DBusMessageHandler.h"
-#include "CommandReceiverShadow.h"
-#include "DBusWrapper.h"
+#ifdef UNIT_TEST
+#include  "../test/DbusCommandInterfaceBackdoor.h"
+#endif
 
 #include <command/CommandSendInterface.h>
 #include <dbus/dbus.h>
 #include <map>
+#include "DBusMessageHandler.h"
+#include "CommandReceiverShadow.h"
+#include "DBusWrapper.h"
 
-using namespace am;
+namespace am {
 
-#define DLT_CONTEXT DBusCommandPlugin
 const char MY_NODE[]="CommandInterface";
 
 /**
@@ -65,6 +67,10 @@ public:
 	void cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState) ;
 	void cbSystemPropertyChanged(const am_SystemProperty_s& SystemProperty) ;
 	void cbTimingInformationChanged(const am_mainConnectionID_t mainConnection, const am_timeSync_t time) ;
+
+#ifdef UNIT_TEST
+    friend class DbusCommandInterfaceBackdoor;
+#endif
 private:
 	DBusMessageHandler mDBUSMessageHandler;
 	CommandReceiverShadow mCommandReceiverShadow;
@@ -105,4 +111,6 @@ private:
 
 };
 
+}
+
 #endif /* DBUSCOMMANDSENDER_H_ */
diff --git a/PluginCommandInterfaceDbus/include/DBusMessageHandler.h b/PluginCommandInterfaceDbus/include/DBusMessageHandler.h
index 75955a8..d874fb0 100644
--- a/PluginCommandInterfaceDbus/include/DBusMessageHandler.h
+++ b/PluginCommandInterfaceDbus/include/DBusMessageHandler.h
@@ -28,18 +28,15 @@
 
 
 #include <audiomanagertypes.h>
+#include <dbus/dbus.h>
+#include <dlt/dlt.h>
 #include <vector>
 #include <sstream>
-using std::stringstream;
-
 #include <string>
-using std::string;
-
-#include <dbus/dbus.h>
 #include <list>
-#include <dlt/dlt.h>
 
-DLT_IMPORT_CONTEXT(DBusCommandPlugin)
+namespace am {
+
 
 /**
  * handles DBus Messages, is used to extract & append parameters and send messages
@@ -114,7 +111,6 @@ public:
     void append(const std::vector<am::am_SinkClass_s>& listSinkClasses);
     void append(const std::vector<am::am_SystemProperty_s>& listSystemProperties);
 
-
 private:
 
     DBusMessageIter mDBusMessageIter;
@@ -127,4 +123,6 @@ private:
     DBusConnection* mDBusConnection;
 };
 
+}
+
 #endif // _DBUSMESSAGEWRAPPER_H_