* rework of buildsystem

* now everything depends on a toplevel CMakefile
* cleanup of makefiles and compiler options

3 files changed, 34 insertions, 7 deletions

diff --git a/AudioManagerDaemon/include/CommandReceiver.h b/AudioManagerDaemon/include/CommandReceiver.h
index 7a4fdc8..6d9201f 100644
--- a/AudioManagerDaemon/include/CommandReceiver.h
+++ b/AudioManagerDaemon/include/CommandReceiver.h
@@ -26,8 +26,12 @@
 #define COMMANDRECEIVER_H_
 
 #include <command/CommandReceiveInterface.h>
+#include <config.h>
+#ifdef WITH_DBUS_WRAPPER
+#include <dbus/DBusWrapper.h>
+#endif
+#include <SocketHandler.h>
 #include "DatabaseHandler.h"
-#include "DBusWrapper.h"
 #include "ControlSender.h"
 
 namespace am {
@@ -37,7 +41,9 @@ namespace am {
  */
 class CommandReceiver: public  CommandReceiveInterface {
 public:
-	CommandReceiver(DatabaseHandler* iDatabaseHandler, DBusWrapper* iDBusWrapper, ControlSender* iControlSender);
+	CommandReceiver(DatabaseHandler* iDatabaseHandler, ControlSender* iControlSender,DBusWrapper* iDBusWrapper);
+	CommandReceiver(DatabaseHandler* iDatabaseHandler, ControlSender* iControlSender,SocketHandler* iSocketHandler);
+	CommandReceiver(DatabaseHandler* iDatabaseHandler, ControlSender* iControlSender,SocketHandler* iSocketHandler,DBusWrapper* iDBusWrapper);
 	virtual ~CommandReceiver();
 	am_Error_e connect(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID) ;
 	am_Error_e disconnect(const am_mainConnectionID_t mainConnectionID) ;
@@ -57,11 +63,13 @@ public:
 	am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const ;
 	am_Error_e getTimingInformation(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay) const ;
 	am_Error_e getDBusConnectionWrapper(DBusWrapper*& dbusConnectionWrapper) const ;
+	am_Error_e getSocketHandler(SocketHandler*& socketHandler) const;
 
 private:
 	DatabaseHandler* mDatabaseHandler; //!< pointer to the databasehandler
 	DBusWrapper* mDBusWrapper; //!< pointer to the dbuswrapper
 	ControlSender* mControlSender; //!< pointer to the control sender
+	SocketHandler* mSocketHandler; //!< pointer to the SocketHandler
 };
 
 }
diff --git a/AudioManagerDaemon/include/ControlReceiver.h b/AudioManagerDaemon/include/ControlReceiver.h
index 7692a10..303d675 100644
--- a/AudioManagerDaemon/include/ControlReceiver.h
+++ b/AudioManagerDaemon/include/ControlReceiver.h
@@ -26,6 +26,11 @@
 #define CONTRONLRECEIVER_H_
 
 #include <control/ControlReceiveInterface.h>
+#include <SocketHandler.h>
+#include <config.h>
+#ifdef WITH_DBUS_WRAPPER
+#include <dbus/DBusWrapper.h>
+#endif
 #include "DatabaseHandler.h"
 #include "RoutingSender.h"
 #include "CommandSender.h"
@@ -37,6 +42,7 @@ namespace am {
  */
 class ControlReceiver: public ControlReceiveInterface {
 public:
+	ControlReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, CommandSender *iCommandSender, SocketHandler *iSocketHandler);
 	ControlReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, CommandSender *iCommandSender);
 	virtual ~ControlReceiver();
 	am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList) ;
@@ -100,11 +106,13 @@ public:
 	am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const ;
 	void setRoutingReady() ;
 	void setCommandReady() ;
+	am_Error_e getSocketHandler(SocketHandler*& socketHandler);
 
 private:
 	DatabaseHandler* mDatabaseHandler; //!< pointer tto the databasehandler
 	RoutingSender* mRoutingSender; //!< pointer to the routing send interface.
 	CommandSender* mCommandSender; //!< pointer to the command send interface
+	SocketHandler* mSocketHandler; //!< pointer to the socketHandler
 };
 
 }
diff --git a/AudioManagerDaemon/include/RoutingReceiver.h b/AudioManagerDaemon/include/RoutingReceiver.h
index 01933d5..f3ba2fe 100644
--- a/AudioManagerDaemon/include/RoutingReceiver.h
+++ b/AudioManagerDaemon/include/RoutingReceiver.h
@@ -25,7 +25,12 @@
 #ifndef ROUTINGRECEIVER_H_
 #define ROUTINGRECEIVER_H_
 
-#include "routing/RoutingReceiveInterface.h"
+#include <routing/RoutingReceiveInterface.h>
+#include <SocketHandler.h>
+#include <config.h>
+#ifdef WITH_DBUS_WRAPPER
+#include <dbus/DBusWrapper.h>
+#endif
 #include "DatabaseHandler.h"
 #include "RoutingSender.h"
 #include "ControlSender.h"
@@ -37,7 +42,9 @@ namespace am {
  */
 class RoutingReceiver : public RoutingReceiveInterface {
 public:
-	RoutingReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, ControlSender *iControlSender);
+	RoutingReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, ControlSender *iControlSender, SocketHandler *iSocketHandler);
+	RoutingReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, ControlSender *iControlSender, DBusWrapper *iDBusWrapper);
+	RoutingReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, ControlSender *iControlSender,SocketHandler *iSocketHandler,DBusWrapper *iDBusWrapper);
 	virtual ~RoutingReceiver();
 	void ackConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error) ;
 	void ackDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error) ;
@@ -62,8 +69,8 @@ public:
 	am_Error_e deregisterSource(const am_sourceID_t sourceID) ;
 	am_Error_e registerCrossfader(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID) ;
 	am_Error_e deregisterCrossfader(const am_crossfaderID_t crossfaderID) ;
-	am_Error_e peekSinkClassID(const std::string& name, am_sourceClass_t& sourceClassID) ;
-	am_Error_e peekSourceClassID(const std::string& name, am_sinkClass_t& sinkClassID) ;
+	am_Error_e peekSinkClassID(const std::string name, const am_sinkClass_t& sinkClassID) ;
+	am_Error_e peekSourceClassID(const std::string name, const am_sourceClass_t& sourceClassID) ;
 	void hookInterruptStatusChange(const am_sourceID_t sourceID, const am_InterruptState_e interruptState) ;
 	void hookDomainRegistrationComplete(const am_domainID_t domainID) ;
 	void hookSinkAvailablityStatusChange(const am_sinkID_t sinkID, const am_Availability_s& availability) ;
@@ -71,11 +78,15 @@ public:
 	void hookDomainStateChange(const am_domainID_t domainID, const am_DomainState_e domainState) ;
 	void hookTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t delay) ;
 	am_Error_e sendChangedData(const std::vector<am_EarlyData_s>& earlyData) ;
-	am_Error_e getDBusConnectionWrapper(DBusWrapper* dbusConnectionWrapper) const ;
+	am_Error_e getDBusConnectionWrapper(DBusWrapper*& dbusConnectionWrapper) const ;
+	am_Error_e getSocketHandler(SocketHandler*& socketHandler) const;
+
 private:
 	DatabaseHandler *mDatabaseHandler; //!< pointer to the databaseHandler
 	RoutingSender *mRoutingSender; //!< pointer to the routingSender
 	ControlSender *mControlSender; //!< pointer to the controlSender
+	DBusWrapper *mDBusWrapper;	//!< pointer to dbuswrapper
+	SocketHandler *mSocketHandler; //!< pointer to sockethandler
 
 };