From 7ba81f52df48e396ade17f5fde4116afa47d8b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= Date: Sat, 19 Sep 2020 11:02:41 +0300 Subject: [PATCH] Remove doubled parts and fix compile for systems without pipewire SPA_DATA_DmaBuf checking was written twice which needs on pipewire --- framebuffers/pipewire/pw_framebuffer.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/framebuffers/pipewire/pw_framebuffer.cpp b/framebuffers/pipewire/pw_framebuffer.cpp index a5f8650..0beb4f3 100644 --- a/framebuffers/pipewire/pw_framebuffer.cpp +++ b/framebuffers/pipewire/pw_framebuffer.cpp @@ -718,14 +718,10 @@ void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer) { auto *spaBuffer = pwBuffer->buffer; void *src = spaBuffer->datas[0].data; - if (!src && spaBuffer->datas->type != SPA_DATA_DmaBuf) { - qCDebug(KRFB_FB_PIPEWIRE) << "discarding null buffer"; - return; - } #if PW_CHECK_VERSION(0, 2, 90) - if (spaBuffer->datas->type != SPA_DATA_DmaBuf) { - qDebug() << "discarding null buffer"; + if (!src && spaBuffer->datas->type != SPA_DATA_DmaBuf) { + qCDebug(KRFB_FB_PIPEWIRE) << "discarding null buffer"; return; } #endif