diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2011-12-28 15:55:32 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2011-12-29 15:43:02 +0100 |
commit | b7e748007bbe0b16fa8a8a089c6cc8fe43bc7aac (patch) | |
tree | e93f5912113ad4d611944648d7f9746e009a0d9b /AudioManagerDaemon/src | |
parent | 6b583365d1f0f5c7ff613ecfc323c4d1eba1699d (diff) | |
download | audiomanager-b7e748007bbe0b16fa8a8a089c6cc8fe43bc7aac.tar.gz |
* assert on empty busname (routinginterface)ver-0.0.1
* added busname for DbusroutingSender
* rework of sockethandlertests
* small changes on compilerflags
* new default error messages on dummy controller plugin
* new plugin Asynchronous including tests
Diffstat (limited to 'AudioManagerDaemon/src')
-rw-r--r-- | AudioManagerDaemon/src/RoutingSender.cpp | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/src/SocketHandler.cpp | 3 | ||||
-rw-r--r-- | AudioManagerDaemon/src/main.cpp | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/AudioManagerDaemon/src/RoutingSender.cpp b/AudioManagerDaemon/src/RoutingSender.cpp index a6de266..3b5bdad 100644 --- a/AudioManagerDaemon/src/RoutingSender.cpp +++ b/AudioManagerDaemon/src/RoutingSender.cpp @@ -27,6 +27,7 @@ #include <dirent.h> #include <dlfcn.h> #include <dlt/dlt.h> +#include <assert.h> #include "PluginTemplate.h" using namespace am; @@ -123,6 +124,7 @@ RoutingSender::RoutingSender(const std::vector<std::string>& listOfPluginDirecto //here, the busname is saved together with the interface. Later The domains will register with the name and sinks, sources etc with the domain.... router->returnBusName(routerInterface.busName); + assert(!routerInterface.busName.empty()); mListInterfaces.push_back(routerInterface); mListLibraryHandles.push_back(tempLibHandle); } diff --git a/AudioManagerDaemon/src/SocketHandler.cpp b/AudioManagerDaemon/src/SocketHandler.cpp index 1785b46..10e0f98 100644 --- a/AudioManagerDaemon/src/SocketHandler.cpp +++ b/AudioManagerDaemon/src/SocketHandler.cpp @@ -32,6 +32,8 @@ #include <features.h> //todo: implement ppoll +//todo: signal handling here +//todo: implement time correction if timer was interrupted by call #include <iostream> //todo remove @@ -43,6 +45,7 @@ SocketHandler::SocketHandler() mListActiveTimer(), mNextTimer(), mLastInsertedHandle(0), + mLastInsertedPollHandle(0), mDispatch(true), mRecreatePollfds(true) { diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 5edc6cb..74a412c 100644 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -110,6 +110,7 @@ int main(int argc, char *argv[]) //the controller should startup the interfaces - this is just for testing iCommandSender.startupInterface(&iCommandReceiver); iRoutingSender.startupRoutingInterface(&iRoutingReceiver); + iRoutingSender.routingInterfacesReady(); #ifdef WITH_SOCKETHANDLER_LOOP iSocketHandler.start_listenting(); |