diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-27 08:43:02 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-27 08:43:02 +0100 |
commit | 02b17a992e900ad82df8edf02e5e51e750ece36b (patch) | |
tree | fa120bebb20f6e41e4b6c9c6492af092f2cd7324 | |
parent | d3a64a702f984175386d20d35d24b54a6a85d7e2 (diff) | |
download | audiomanager-02b17a992e900ad82df8edf02e5e51e750ece36b.tar.gz |
* removed simple DBus Loop from DBusWrapper - is not needed anymore since Sockethandler is mandatory
-rw-r--r-- | AudioManagerDaemon/src/DBusWrapper.cpp | 10 | ||||
-rw-r--r-- | includes/dbus/DBusWrapper.h | 6 |
2 files changed, 0 insertions, 16 deletions
diff --git a/AudioManagerDaemon/src/DBusWrapper.cpp b/AudioManagerDaemon/src/DBusWrapper.cpp index 5a310ce..bfe6706 100644 --- a/AudioManagerDaemon/src/DBusWrapper.cpp +++ b/AudioManagerDaemon/src/DBusWrapper.cpp @@ -187,16 +187,6 @@ DBusHandlerResult DBusWrapper::cbRootIntrospection(DBusConnection *conn, DBusMes } } -void DBusWrapper::dbusMainLoop() -{ - logInfo("DBusWrapper::dbusMainLoop Entering MainLoop"); - - while (dbus_connection_read_write_dispatch(mDbusConnection, -1)) - { - - } -} - void DBusWrapper::getDBusConnection(DBusConnection *& connection) const { connection = mDbusConnection; diff --git a/includes/dbus/DBusWrapper.h b/includes/dbus/DBusWrapper.h index 24b2795..76fd2c1 100644 --- a/includes/dbus/DBusWrapper.h +++ b/includes/dbus/DBusWrapper.h @@ -40,7 +40,6 @@ namespace am class DBusWrapper { public: - DBusWrapper(); DBusWrapper(SocketHandler* socketHandler); virtual ~DBusWrapper(); @@ -59,11 +58,6 @@ public: */ void getDBusConnection(DBusConnection*& connection) const; - /** - * If Dbus is used, this MainLoop must be called as mainloop, otherwise the messages are not dispatched. - */ - void dbusMainLoop(); - static dbus_bool_t addWatch(DBusWatch *watch, void *userData); static void removeWatch(DBusWatch *watch, void *userData); static void toogleWatch(DBusWatch *watch, void *userData); |