summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-04-27 14:41:10 +0200
committerchristian mueller <christian.ei.mueller@bmw.de>2012-05-24 13:40:22 +0200
commit2612866aa6ff673a60e80100b3d63b83903240f1 (patch)
treeb6d0e446fb326094b31d9ee8d81afcde7050d942
parenta74d588f039b4d7b583de5b4be108c98bd242642 (diff)
downloadaudiomanager-2612866aa6ff673a60e80100b3d63b83903240f1.tar.gz
* [GAM-72] change type std::list to std::vector in DbusWrapper
Signed-off-by: christian mueller <christian.ei.mueller@bmw.de>
-rw-r--r--AudioManagerDaemon/src/CAmDbusWrapper.cpp8
-rw-r--r--include/shared/CAmDbusWrapper.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/AudioManagerDaemon/src/CAmDbusWrapper.cpp b/AudioManagerDaemon/src/CAmDbusWrapper.cpp
index 0f511e2..592d58e 100644
--- a/AudioManagerDaemon/src/CAmDbusWrapper.cpp
+++ b/AudioManagerDaemon/src/CAmDbusWrapper.cpp
@@ -158,13 +158,13 @@ DBusHandlerResult CAmDbusWrapper::cbRootIntrospection(DBusConnection *conn, DBus
logInfo("DBusWrapper::~cbRootIntrospection called:");
mpReference = (CAmDbusWrapper*) reference;
- std::list<std::string> nodesList = mpReference->mListNodes;
+ std::vector<std::string> nodesList = mpReference->mListNodes;
DBusMessage * reply;
DBusMessageIter args;
dbus_uint32_t serial = 0;
if (dbus_message_is_method_call(msg, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
{
- std::list<std::string>::iterator nodeIter = nodesList.begin();
+ std::vector<std::string>::iterator nodeIter = nodesList.begin();
const char *xml = ROOT_INTROSPECT_XML;
std::stringstream introspect;
introspect << std::string(xml);
@@ -323,7 +323,7 @@ dbus_bool_t CAmDbusWrapper::addTimeoutDelegate(DBusTimeout *timeout, void* userD
//save timeout in Socket context
userData = timeout;
- logInfo("DBusWrapper::addTimeoutDelegate a timeout was added");
+ logInfo("DBusWrapper::addTimeoutDelegate a timeout was added, timeout",localTimeout," handle ", *handle);
return (true);
}
@@ -437,13 +437,13 @@ void CAmDbusWrapper::toggleTimeoutDelegate(DBusTimeout *timeout, void* userData)
void CAmDbusWrapper::dbusTimerCallback(sh_timerHandle_t handle, void *userData)
{
+ logInfo("DBusWrapper::dbusTimerCallback was called");
assert(userData!=NULL);
if (dbus_timeout_get_enabled((DBusTimeout*) userData))
{
mpSocketHandler->restartTimer(handle);
}
dbus_timeout_handle((DBusTimeout*) userData);
- logInfo("DBusWrapper::dbusTimerCallback was called");
}
}
diff --git a/include/shared/CAmDbusWrapper.h b/include/shared/CAmDbusWrapper.h
index 46b758a..4deaf88 100644
--- a/include/shared/CAmDbusWrapper.h
+++ b/include/shared/CAmDbusWrapper.h
@@ -77,7 +77,7 @@ private:
DBusObjectPathVTable mObjectPathVTable; //!< the vpathtable
DBusConnection* mpDbusConnection; //!< pointer to the dbus connection used
DBusError mDBusError; //!< dbuserror
- std::list<std::string> mListNodes; //!< holds a list of all nodes of the dbus
+ std::vector<std::string> mListNodes; //!< holds a list of all nodes of the dbus
std::vector<sh_timerHandle_t*> mpListTimerhandles; //!< pointer to the timer handles
CAmSocketHandler *mpSocketHandler; //!< pointer to the sockethandler
std::map<DBusWatch*, sh_pollHandle_t> mMapHandleWatch; //!< map to the handle watches