summaryrefslogtreecommitdiff
path: root/PluginRoutingInterfaceAsync
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-02-09 17:20:18 +0100
committerchristian mueller <christian.ei.mueller@bmw.de>2012-02-09 17:20:18 +0100
commite124310a45e6e7798a077fa44ef3ee518193b2cf (patch)
tree5fb3b14934438d567ee76f9dc978a326542ddbd7 /PluginRoutingInterfaceAsync
parent2ddacca29eccd4192add2b17ad6af357b52ea29b (diff)
downloadaudiomanager-e124310a45e6e7798a077fa44ef3ee518193b2cf.tar.gz
* modify RoutingSender Async to match with TestHMI
* modify ControlSenderPlugin to have dummy behaviour
Diffstat (limited to 'PluginRoutingInterfaceAsync')
-rw-r--r--PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp b/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
index 0b0b027..5027452 100644
--- a/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
+++ b/PluginRoutingInterfaceAsync/src/RoutingSenderAsync.cpp
@@ -247,7 +247,7 @@ pPool(pool), //
//a timeout happened
if(errno == ETIMEDOUT)
{
- logError("Worker::timedWait timeout waiting error");
+ logInfo("Worker::timedWait timed out - no bug !");
return (false);
}
else //failure in waiting, nevertheless, we quit the thread...
@@ -768,12 +768,12 @@ std::vector<am_Sink_s> AsyncRoutingSender::createSinkTable()
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
am_MainSoundProperty_s msp;
- msp.type=MSP_BASS;
- msp.value=5;
+ msp.type = MSP_BASS;
+ msp.value = 5;
listMainSoundProperties.push_back(msp);
- msp.type=MSP_MID;
+ msp.type = MSP_MID;
listMainSoundProperties.push_back(msp);
- msp.type=MSP_TREBLE;
+ msp.type = MSP_TREBLE;
listMainSoundProperties.push_back(msp);
for (int16_t i = 0; i <= 10; i++)
{
@@ -787,11 +787,11 @@ std::vector<am_Sink_s> AsyncRoutingSender::createSinkTable()
item.available.availability = A_AVAILABLE;
item.available.availabilityReason = AR_UNKNOWN;
item.listSoundProperties.push_back(sp);
- item.listMainSoundProperties=listMainSoundProperties;
+ item.listMainSoundProperties = listMainSoundProperties;
item.visible = true;
item.listConnectionFormats.push_back(CF_ANALOG);
- item.muteState=MS_MUTED;
- item.mainVolume=0;
+ item.muteState = MS_MUTED;
+ item.mainVolume = 0;
table.push_back(item);
}
return (table);
@@ -831,7 +831,7 @@ void AsyncRoutingSender::insertConnectionSafe(am_connectionID_t connectionID, am
void AsyncRoutingSender::removeHandleSafe(uint16_t handle)
{
pthread_mutex_lock(&mMapHandleWorkerMutex);
- if (mMapHandleWorker.erase(handle))
+ if (!mMapHandleWorker.erase(handle))
{
logError("AsyncRoutingSender::removeHandle could not remove handle");
}
@@ -841,7 +841,7 @@ void AsyncRoutingSender::removeHandleSafe(uint16_t handle)
void AsyncRoutingSender::removeConnectionSafe(am_connectionID_t connectionID)
{
pthread_mutex_lock(&mMapConnectionMutex);
- if (mMapConnectionIDRoute.erase(connectionID))
+ if (!mMapConnectionIDRoute.erase(connectionID))
{
logError("AsyncRoutingSender::removeConnectionSafe could not remove connection");
}