diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-29 13:27:27 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-29 13:27:27 +0100 |
commit | d3ccf97331935b181041394b80be20dca282ea71 (patch) | |
tree | f85e7b649c8a6d58c11e9728b2442cdcff53826d /AudioManagerDaemon/include | |
parent | aa93713377d28a8ce7821466ef828f79a18e982d (diff) | |
download | audiomanager-d3ccf97331935b181041394b80be20dca282ea71.tar.gz |
* [ performance] for classes that do not need to be derived from, removed virtual desctructor
* implemented confirmation of routing ready in RoutingReceiver
* [Sockethandler] automatically set gDispatchDone to 0 when starting mainloop
* fixed unit text to work with latest changes (expect Dbus command interface)
* [GAM-4] added way to do synchronous calling on interfaces with the help of CAmSerializer.h
* reworked AsyncRoutingPlugin to work with CAmSerializer.h
* reworked AsyncRoutingPlugin to register elemtes in thread using CAmSerializer.h
* reworked AsncPlugin Tests to work with remodelled Plugin
Diffstat (limited to 'AudioManagerDaemon/include')
-rw-r--r-- | AudioManagerDaemon/include/CommandReceiver.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/CommandSender.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/ControlReceiver.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/ControlSender.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/DatabaseHandler.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/DatabaseObserver.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/Router.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/RoutingReceiver.h | 6 | ||||
-rw-r--r-- | AudioManagerDaemon/include/RoutingSender.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/TelnetServer.h | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/AudioManagerDaemon/include/CommandReceiver.h b/AudioManagerDaemon/include/CommandReceiver.h index a8f7400..5279a31 100644 --- a/AudioManagerDaemon/include/CommandReceiver.h +++ b/AudioManagerDaemon/include/CommandReceiver.h @@ -44,7 +44,7 @@ class CommandReceiver: public CommandReceiveInterface public: CommandReceiver(DatabaseHandler* iDatabaseHandler, ControlSender* iControlSender, SocketHandler* iSocketHandler); CommandReceiver(DatabaseHandler* iDatabaseHandler, ControlSender* iControlSender, SocketHandler* iSocketHandler, DBusWrapper* iDBusWrapper); - virtual ~CommandReceiver(); + ~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); am_Error_e setVolume(const am_sinkID_t sinkID, const am_mainVolume_t volume); diff --git a/AudioManagerDaemon/include/CommandSender.h b/AudioManagerDaemon/include/CommandSender.h index 57362f0..0a8d2b2 100644 --- a/AudioManagerDaemon/include/CommandSender.h +++ b/AudioManagerDaemon/include/CommandSender.h @@ -45,7 +45,7 @@ class CommandSender { public: CommandSender(const std::vector<std::string>& listOfPluginDirectories); - virtual ~CommandSender(); + ~CommandSender(); am_Error_e startupInterfaces(CommandReceiver* iCommandReceiver); void setCommandReady(); void setCommandRundown(); diff --git a/AudioManagerDaemon/include/ControlReceiver.h b/AudioManagerDaemon/include/ControlReceiver.h index 03e36d8..dfb0695 100644 --- a/AudioManagerDaemon/include/ControlReceiver.h +++ b/AudioManagerDaemon/include/ControlReceiver.h @@ -44,7 +44,7 @@ class ControlReceiver: public ControlReceiveInterface { public: ControlReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, CommandSender *iCommandSender, SocketHandler *iSocketHandler, Router* iRouter); - virtual ~ControlReceiver(); + ~ControlReceiver(); am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList); am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID); am_Error_e disconnect(am_Handle_s& handle, const am_connectionID_t connectionID); diff --git a/AudioManagerDaemon/include/ControlSender.h b/AudioManagerDaemon/include/ControlSender.h index cb9ff36..6e04d48 100644 --- a/AudioManagerDaemon/include/ControlSender.h +++ b/AudioManagerDaemon/include/ControlSender.h @@ -41,7 +41,7 @@ class ControlSender { public: ControlSender(std::string controlPluginFile); - virtual ~ControlSender(); + ~ControlSender(); am_Error_e startupController(ControlReceiveInterface* controlreceiveinterface) ; void setControllerReady() ; void setControllerRundown() ; diff --git a/AudioManagerDaemon/include/DatabaseHandler.h b/AudioManagerDaemon/include/DatabaseHandler.h index 550c13d..964bbbe 100644 --- a/AudioManagerDaemon/include/DatabaseHandler.h +++ b/AudioManagerDaemon/include/DatabaseHandler.h @@ -53,7 +53,7 @@ class DatabaseHandler { public: DatabaseHandler(std::string databasePath); - virtual ~DatabaseHandler(); + ~DatabaseHandler(); am_Error_e enterDomainDB(const am_Domain_s& domainData, am_domainID_t& domainID); am_Error_e enterMainConnectionDB(const am_MainConnection_s& mainConnectionData, am_mainConnectionID_t& connectionID); am_Error_e enterSinkDB(const am_Sink_s& sinkData, am_sinkID_t& sinkID); diff --git a/AudioManagerDaemon/include/DatabaseObserver.h b/AudioManagerDaemon/include/DatabaseObserver.h index 0657b9d..3862a79 100644 --- a/AudioManagerDaemon/include/DatabaseObserver.h +++ b/AudioManagerDaemon/include/DatabaseObserver.h @@ -46,7 +46,7 @@ class DatabaseObserver public: DatabaseObserver(CommandSender *iCommandSender, RoutingSender *iRoutingSender, SocketHandler *iSocketHandler); DatabaseObserver(CommandSender *iCommandSender, RoutingSender *iRoutingSender, SocketHandler *iSocketHandler, TelnetServer *iTelnetServer); - virtual ~DatabaseObserver(); + ~DatabaseObserver(); void numberOfSinkClassesChanged(); void numberOfSourceClassesChanged(); void newSink(const am_Sink_s& sink); diff --git a/AudioManagerDaemon/include/Router.h b/AudioManagerDaemon/include/Router.h index 5af0cf7..11a5634 100644 --- a/AudioManagerDaemon/include/Router.h +++ b/AudioManagerDaemon/include/Router.h @@ -38,7 +38,7 @@ class Router public: Router(DatabaseHandler* iDatabaseHandler, ControlSender* iSender); am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList); - virtual ~Router(); + ~Router(); private: am_Error_e findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, std::vector<am_RoutingElement_s>& listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator); diff --git a/AudioManagerDaemon/include/RoutingReceiver.h b/AudioManagerDaemon/include/RoutingReceiver.h index 3803ff4..ae964ff 100644 --- a/AudioManagerDaemon/include/RoutingReceiver.h +++ b/AudioManagerDaemon/include/RoutingReceiver.h @@ -45,7 +45,7 @@ class RoutingReceiver: public RoutingReceiveInterface public: RoutingReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, ControlSender *iControlSender, SocketHandler *iSocketHandler); RoutingReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, ControlSender *iControlSender, SocketHandler *iSocketHandler, DBusWrapper *iDBusWrapper); - virtual ~RoutingReceiver(); + ~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); void ackSetSinkVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error); @@ -83,8 +83,8 @@ public: am_Error_e getDBusConnectionWrapper(DBusWrapper*& dbusConnectionWrapper) const; am_Error_e getSocketHandler(SocketHandler*& socketHandler) const; void getInterfaceVersion(std::string& version) const; - void confirmRoutingReady(const uint16_t handle) const; - void confirmRoutingRundown(const uint16_t handle) const; + void confirmRoutingReady(const uint16_t handle); + void confirmRoutingRundown(const uint16_t handle); uint16_t getStartupHandle(); //!< returns a startup handle uint16_t getRundownHandle(); //!< returns a rundown handle diff --git a/AudioManagerDaemon/include/RoutingSender.h b/AudioManagerDaemon/include/RoutingSender.h index 308d5e5..f445313 100644 --- a/AudioManagerDaemon/include/RoutingSender.h +++ b/AudioManagerDaemon/include/RoutingSender.h @@ -44,7 +44,7 @@ class RoutingSender { public: RoutingSender(const std::vector<std::string>& listOfPluginDirectories); - virtual ~RoutingSender(); + ~RoutingSender(); /** * removes a handle from the list diff --git a/AudioManagerDaemon/include/TelnetServer.h b/AudioManagerDaemon/include/TelnetServer.h index f06e171..f95bd84 100644 --- a/AudioManagerDaemon/include/TelnetServer.h +++ b/AudioManagerDaemon/include/TelnetServer.h @@ -58,7 +58,7 @@ public: unsigned int servPort, unsigned int maxConnections); - virtual ~TelnetServer(); + ~TelnetServer(); void connectSocket(const pollfd pfd, const sh_pollHandle_t handle, void* userData); void disconnectClient(int filedescriptor); void receiveData(const pollfd pfd, const sh_pollHandle_t handle, void* userData); |