diff options
Diffstat (limited to 'AudioManagerDaemon/src')
-rw-r--r-- | AudioManagerDaemon/src/CommandReceiver.cpp | 5 | ||||
-rw-r--r-- | AudioManagerDaemon/src/RoutingReceiver.cpp | 19 | ||||
-rw-r--r-- | AudioManagerDaemon/src/RoutingSender.cpp | 8 | ||||
-rw-r--r-- | AudioManagerDaemon/src/SocketHandler.cpp | 1 |
4 files changed, 19 insertions, 14 deletions
diff --git a/AudioManagerDaemon/src/CommandReceiver.cpp b/AudioManagerDaemon/src/CommandReceiver.cpp index 74b819b..21e19d9 100644 --- a/AudioManagerDaemon/src/CommandReceiver.cpp +++ b/AudioManagerDaemon/src/CommandReceiver.cpp @@ -27,7 +27,6 @@ #include "ControlSender.h" #include "DLTWrapper.h" #include <SocketHandler.h> -#include <config.h> #include <cassert> #include <algorithm> @@ -211,12 +210,12 @@ uint16_t CommandReceiver::getRundownHandle() return handle; } -void am::CommandReceiver::waitOnStartup(bool startup) +void CommandReceiver::waitOnStartup(bool startup) { mWaitStartup = startup; } -void am::CommandReceiver::waitOnRundown(bool rundown) +void CommandReceiver::waitOnRundown(bool rundown) { mWaitRundown = rundown; } diff --git a/AudioManagerDaemon/src/RoutingReceiver.cpp b/AudioManagerDaemon/src/RoutingReceiver.cpp index fb160b0..715fa36 100644 --- a/AudioManagerDaemon/src/RoutingReceiver.cpp +++ b/AudioManagerDaemon/src/RoutingReceiver.cpp @@ -24,14 +24,14 @@ */ #include "RoutingReceiver.h" -#include <SocketHandler.h> -#ifdef WITH_DBUS_WRAPPER -#include <dbus/DBusWrapper.h> -#endif #include "DatabaseHandler.h" #include "RoutingSender.h" #include "ControlSender.h" +#include "DLTWrapper.h" +#include <SocketHandler.h> #include <cassert> +#include <algorithm> + using namespace am; @@ -342,13 +342,18 @@ void RoutingReceiver::getInterfaceVersion(std::string & version) const version = RoutingReceiveVersion; } -void RoutingReceiver::confirmRoutingReady(const uint16_t handle) const +void RoutingReceiver::confirmRoutingReady(const uint16_t handle) { - + mListStartupHandles.erase(std::remove(mListStartupHandles.begin(), mListStartupHandles.end(), handle), mListStartupHandles.end()); + if (mWaitStartup && mListStartupHandles.empty()) + mControlSender->confirmRoutingReady(); } -void RoutingReceiver::confirmRoutingRundown(const uint16_t handle) const +void RoutingReceiver::confirmRoutingRundown(const uint16_t handle) { + mListRundownHandles.erase(std::remove(mListRundownHandles.begin(), mListRundownHandles.end(), handle), mListRundownHandles.end()); + if (mWaitRundown && mListRundownHandles.empty()) + mControlSender->confirmCommandRundown(); } uint16_t am::RoutingReceiver::getStartupHandle() diff --git a/AudioManagerDaemon/src/RoutingSender.cpp b/AudioManagerDaemon/src/RoutingSender.cpp index 76c671d..c59641d 100644 --- a/AudioManagerDaemon/src/RoutingSender.cpp +++ b/AudioManagerDaemon/src/RoutingSender.cpp @@ -300,7 +300,7 @@ am_Error_e RoutingSender::asyncSetSourceSoundProperty(am_Handle_s& handle, const return (E_NON_EXISTENT); } -am_Error_e am::RoutingSender::asyncSetSourceSoundProperties(am_Handle_s& handle, const std::vector<am_SoundProperty_s> & listSoundProperties, const am_sourceID_t sourceID) +am_Error_e RoutingSender::asyncSetSourceSoundProperties(am_Handle_s& handle, const std::vector<am_SoundProperty_s> & listSoundProperties, const am_sourceID_t sourceID) { am_handleData_c handleData; SourceInterfaceMap::iterator iter = mMapSourceInterface.begin(); @@ -314,7 +314,7 @@ am_Error_e am::RoutingSender::asyncSetSourceSoundProperties(am_Handle_s& handle, return (E_NON_EXISTENT); } -am_Error_e am::RoutingSender::asyncSetSinkSoundProperties(am_Handle_s& handle, const std::vector<am_SoundProperty_s> & listSoundProperties, const am_sinkID_t sinkID) +am_Error_e RoutingSender::asyncSetSinkSoundProperties(am_Handle_s& handle, const std::vector<am_SoundProperty_s> & listSoundProperties, const am_sinkID_t sinkID) { am_handleData_c handleData; SinkInterfaceMap::iterator iter = mMapSinkInterface.begin(); @@ -493,7 +493,7 @@ RoutingSender::am_handleData_c RoutingSender::returnHandleData(const am_Handle_s return (it->second); } -void am::RoutingSender::setRoutingReady() +void RoutingSender::setRoutingReady() { mRoutingReceiver->waitOnStartup(false); std::vector<InterfaceNamePairs>::iterator iter = mListInterfaces.begin(); @@ -505,7 +505,7 @@ void am::RoutingSender::setRoutingReady() mRoutingReceiver->waitOnStartup(true); } -void am::RoutingSender::setRoutingRundown() +void RoutingSender::setRoutingRundown() { mRoutingReceiver->waitOnRundown(false); std::vector<InterfaceNamePairs>::iterator iter = mListInterfaces.begin(); diff --git a/AudioManagerDaemon/src/SocketHandler.cpp b/AudioManagerDaemon/src/SocketHandler.cpp index d9fdc3a..444289f 100644 --- a/AudioManagerDaemon/src/SocketHandler.cpp +++ b/AudioManagerDaemon/src/SocketHandler.cpp @@ -64,6 +64,7 @@ SocketHandler::~SocketHandler() */ void SocketHandler::start_listenting() { + gDispatchDone=0; int16_t pollStatus; std::list<int16_t> hitList; |