Skip to content
Snippets Groups Projects
Unverified Commit de0b7978 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

sinkclient: add the ability to disable shm via libwrap

This allow to generate jamid for dbus usage and client-qt with
libwrap.

Change-Id: Ia23a0cec2efb4347166e0123c662da6c134c2238
GitLab: jami-project#1312
parent cc8fb024
No related branches found
No related tags found
No related merge requests found
...@@ -278,6 +278,9 @@ SinkClient::start() noexcept ...@@ -278,6 +278,9 @@ SinkClient::start() noexcept
{ {
if (not shm_) { if (not shm_) {
try { try {
char* envvar = getenv("JAMI_DISABLE_SHM");
if (envvar) // Do not use SHM if set
return true;
shm_ = std::make_shared<ShmHolder>(); shm_ = std::make_shared<ShmHolder>();
JAMI_DBG("[Sink:%p] Shared memory [%s] created", this, openedName().c_str()); JAMI_DBG("[Sink:%p] Shared memory [%s] created", this, openedName().c_str());
} catch (const std::runtime_error& e) { } catch (const std::runtime_error& e) {
...@@ -426,6 +429,7 @@ SinkClient::update(Observable<std::shared_ptr<MediaFrame>>* /*obs*/, ...@@ -426,6 +429,7 @@ SinkClient::update(Observable<std::shared_ptr<MediaFrame>>* /*obs*/,
return; return;
} }
#if HAVE_SHM #if HAVE_SHM
if (shm_)
shm_->renderFrame(*frame); shm_->renderFrame(*frame);
#endif #endif
if (target_.pull) { if (target_.pull) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment