diff options
| author | Christian Mueller <christian.ei.mueller@bmw.de> | 2012-05-21 19:03:24 +0200 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-05-24 13:40:23 +0200 |
| commit | 12ee422d7a997a423615518f0132e646b9e8b5dc (patch) | |
| tree | 2de2ee6f1fe36c86fd8ee40debda1d177cced108 | |
| parent | 3f65139b2825e654dd0cc36d1cee055b7ac959d9 (diff) | |
| download | audiomanager-12ee422d7a997a423615518f0132e646b9e8b5dc.tar.gz | |
* [GAM-78] Using the AudioManager with Sessionbus does not work fixed
Signed-off-by: Christian Mueller <christian.ei.mueller@bmw.de>
| -rw-r--r-- | AudioManagerDaemon/src/CAmDbusWrapper.cpp | 8 | ||||
| -rw-r--r-- | include/shared/CAmDbusWrapper.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/AudioManagerDaemon/src/CAmDbusWrapper.cpp b/AudioManagerDaemon/src/CAmDbusWrapper.cpp index 76290ee..015bafe 100644 --- a/AudioManagerDaemon/src/CAmDbusWrapper.cpp +++ b/AudioManagerDaemon/src/CAmDbusWrapper.cpp @@ -56,13 +56,14 @@ CAmDbusWrapper::CAmDbusWrapper(CAmSocketHandler* socketHandler, DBusBusType type mDBusError(), // mListNodes(), // mpListTimerhandles(), // - mpSocketHandler(socketHandler) + mpSocketHandler(socketHandler), // + mDbusType(type) { assert(mpSocketHandler!=0); dbus_error_init(&mDBusError); logInfo("DBusWrapper::DBusWrapper Opening DBus connection"); - mpDbusConnection = dbus_bus_get(type, &mDBusError); + mpDbusConnection = dbus_bus_get(mDbusType, &mDBusError); if (dbus_error_is_set(&mDBusError)) { logError("DBusWrapper::DBusWrapper Error while getting the DBus"); @@ -96,6 +97,7 @@ CAmDbusWrapper::CAmDbusWrapper(CAmSocketHandler* socketHandler, DBusBusType type //register callback for Introspectio mObjectPathVTable.message_function = CAmDbusWrapper::cbRootIntrospection; + logInfo("dbusconnection ",mpDbusConnection); dbus_connection_register_object_path(mpDbusConnection, DBUS_SERVICE_OBJECT_PATH, &mObjectPathVTable, this); int ret = dbus_bus_request_name(mpDbusConnection, DBUS_SERVICE_PREFIX, DBUS_NAME_FLAG_DO_NOT_QUEUE, &mDBusError); if (dbus_error_is_set(&mDBusError)) @@ -137,7 +139,7 @@ void CAmDbusWrapper::registerCallback(const DBusObjectPathVTable* vtable, const std::string completePath = std::string(DBUS_SERVICE_OBJECT_PATH) + "/" + path; dbus_error_init(&mDBusError); - mpDbusConnection = dbus_bus_get(DBUS_BUS_SESSION, &mDBusError); + mpDbusConnection = dbus_bus_get(mDbusType, &mDBusError); dbus_connection_register_object_path(mpDbusConnection, completePath.c_str(), vtable, userdata); if (dbus_error_is_set(&mDBusError)) { diff --git a/include/shared/CAmDbusWrapper.h b/include/shared/CAmDbusWrapper.h index 4deaf88..603cc00 100644 --- a/include/shared/CAmDbusWrapper.h +++ b/include/shared/CAmDbusWrapper.h @@ -81,6 +81,7 @@ private: 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 + DBusBusType mDbusType; }; } |