diff options
author | GENIVI Audio Manager Maintainer <genivi-maint-audiomanager@smtp1.genivi.org> | 2017-05-02 15:23:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-02 15:23:36 +0200 |
commit | 8f2387e42641c7c2b967553a4c578f0e87549fb6 (patch) | |
tree | 304e30980de90f791a39f009e67c20dfd82c9b0b /AudioManagerUtilities/src | |
parent | 71eab93f9cd67b2e0343700552adf988c420f174 (diff) | |
parent | cfe230db3654094c4c098eea2736c71dd97396d0 (diff) | |
download | audiomanager-8f2387e42641c7c2b967553a4c578f0e87549fb6.tar.gz |
Merge pull request #15 from JensLorenz/boundary_fix
AMCore Enhancements and Fixes
Diffstat (limited to 'AudioManagerUtilities/src')
-rw-r--r-- | AudioManagerUtilities/src/CAmDbusWrapper.cpp | 18 | ||||
-rw-r--r-- | AudioManagerUtilities/src/CAmDltWrapper.cpp | 9 |
2 files changed, 18 insertions, 9 deletions
diff --git a/AudioManagerUtilities/src/CAmDbusWrapper.cpp b/AudioManagerUtilities/src/CAmDbusWrapper.cpp index b87d3a5..1f1d5a6 100644 --- a/AudioManagerUtilities/src/CAmDbusWrapper.cpp +++ b/AudioManagerUtilities/src/CAmDbusWrapper.cpp @@ -293,18 +293,18 @@ dbus_bool_t CAmDbusWrapper::addWatchDelegate(DBusWatch * watch, void* userData) event |= POLLIN; if (flags & DBUS_WATCH_WRITABLE) event |= POLLOUT; - } - logInfo("DBusWrapper::addWatchDelegate entered new watch, fd=", dbus_watch_get_unix_fd(watch), "event flag=", event); - am_Error_e error = mpSocketHandler->addFDPoll(dbus_watch_get_unix_fd(watch), event, &pDbusPrepareCallback, &pDbusFireCallback, &pDbusCheckCallback, &pDbusDispatchCallback, watch, handle); + logInfo("DBusWrapper::addWatchDelegate entered new watch, fd=", dbus_watch_get_unix_fd(watch), "event flag=", event); + am_Error_e error = mpSocketHandler->addFDPoll(dbus_watch_get_unix_fd(watch), event, &pDbusPrepareCallback, &pDbusFireCallback, &pDbusCheckCallback, &pDbusDispatchCallback, watch, handle); - //if everything is alright, add the watch and the handle to our map so we know this relationship - if (error == E_OK && handle != 0) - { - mMapHandleWatch.insert(std::make_pair(watch, handle)); - return (true); + //if everything is alright, add the watch and the handle to our map so we know this relationship + if (error == E_OK && handle != 0) + { + mMapHandleWatch.insert(std::make_pair(watch, handle)); + return (true); + } + logError("DBusWrapper::addWatchDelegate entering watch failed"); } - logError("DBusWrapper::addWatchDelegate entering watch failed"); return (true); } diff --git a/AudioManagerUtilities/src/CAmDltWrapper.cpp b/AudioManagerUtilities/src/CAmDltWrapper.cpp index dc594af..37a5ff0 100644 --- a/AudioManagerUtilities/src/CAmDltWrapper.cpp +++ b/AudioManagerUtilities/src/CAmDltWrapper.cpp @@ -157,6 +157,15 @@ CAmDltWrapper* CAmDltWrapper::instanctiateOnce(const char *appid, const char * d CAmDltWrapper* CAmDltWrapper::instance() { + if (!mpDLTWrapper) + { + // an application seems not to use our CAmDltWrapper class therefore create default + std::ostringstream description; + description << "PID=" << getpid() << " _=" << getenv("_"); + mpDLTWrapper = new CAmDltWrapper("AMDL", description.str().c_str()); + std::cerr << "Application doesn't call CAmDltWrapper::instanciateOnce!!!" << std::endl; + std::cerr << "-> CAmDltWrapper::instance registers DLT application [ AMDL | " << description.str() << " ]" << std::endl; + } return mpDLTWrapper; } |