From b7e748007bbe0b16fa8a8a089c6cc8fe43bc7aac Mon Sep 17 00:00:00 2001 From: christian mueller Date: Wed, 28 Dec 2011 15:55:32 +0100 Subject: * assert on empty busname (routinginterface) * added busname for DbusroutingSender * rework of sockethandlertests * small changes on compilerflags * new default error messages on dummy controller plugin * new plugin Asynchronous including tests --- AudioManagerDaemon/src/RoutingSender.cpp | 2 ++ AudioManagerDaemon/src/SocketHandler.cpp | 3 +++ AudioManagerDaemon/src/main.cpp | 1 + 3 files changed, 6 insertions(+) (limited to 'AudioManagerDaemon/src') 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 #include #include +#include #include "PluginTemplate.h" using namespace am; @@ -123,6 +124,7 @@ RoutingSender::RoutingSender(const std::vector& 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 //todo: implement ppoll +//todo: signal handling here +//todo: implement time correction if timer was interrupted by call #include //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(); -- cgit v1.2.1