compilation: fix video deactivation

Qtwrapper was enabling video by default
This was hiding a lot of warning in videomanager_wrap.h

Issue: #70631
Change-Id: Ic1434c9999ebc7c43de7fab63efbf74e54918c73

CMakeLists.txt

@@ -20,9 +20,7 @@ INCLUDE(GNUInstallDirs)
 INCLUDE(CMakePackageConfigHelpers)
 INCLUDE(GenerateExportHeader)
 
-
 ADD_DEFINITIONS("-std=c++1y")
-
 ADD_DEFINITIONS(
    ${QT_DEFINITIONS}
    -fexceptions
@@ -50,8 +48,14 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LOCAL_CMAKE_MODULE_PATH})
 SET(QT5_MODULE_PATH ${QT5_PATH}/lib/cmake)
 
 FIND_PACKAGE(Ring REQUIRED)
+FIND_PACKAGE(Qt5Core REQUIRED)
+FIND_PACKAGE(Qt5LinguistTools) # translations
 
-
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT ENABLE_LIBWRAP)
+   FIND_PACKAGE(Qt5DBus)
+ELSE()
+   SET(ENABLE_LIBWRAP true)
+ENDIF()
 
 # Enable some useful warnings
 ADD_DEFINITIONS(
@@ -143,7 +147,6 @@ endif()
 
 # OS X
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-   SET(ENABLE_LIBWRAP true)
 
    SET(CMAKE_MACOSX_RPATH ON)
    SET(CMAKE_SKIP_BUILD_RPATH FALSE)
@@ -162,7 +165,7 @@ IF(${ENABLE_LIBWRAP} MATCHES true)
    ADD_DEFINITIONS(-DENABLE_LIBWRAP=true) # Use native calls (no dbus)
    ADD_DEFINITIONS(-Wno-unknown-pragmas)
    SET(ENABLE_QT5 true) # Use Qt5
-   MESSAGE("Compiling for OS X: LibWrap enabled, Qt5 enabled.")
+   MESSAGE("Compiling with qtwrapper enabled, Qt5 enabled.")
 
    INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/qtwrapper/)
 
@@ -182,9 +185,6 @@ IF(NOT (${ENABLE_VIDEO} MATCHES false))
    add_definitions( -DENABLE_VIDEO=true )
 ENDIF(NOT (${ENABLE_VIDEO} MATCHES false))
 
-FIND_PACKAGE(Qt5Core REQUIRED)
-FIND_PACKAGE(Qt5DBus)
-FIND_PACKAGE(Qt5LinguistTools) # translations
 # ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=1)
 
 SET(GENERIC_LIB_VERSION "0.4.0")

src/call.cpp

@@ -984,6 +984,7 @@ void CallPrivate::registerRenderer(Video::Renderer* renderer)
       emit q_ptr->videoStopped(renderer);
    });
    #else
+   Q_UNUSED(renderer)
    return;
    #endif
 }

src/qtwrapper/CMakeLists.txt

@@ -6,14 +6,12 @@ ENDIF(POLICY CMP0022)
 
 PROJECT(qtwrapper)
 
+MESSAGE("Compiling with qtwrapper")
+
 SET(ENABLE_LIBWRAP true)
 ADD_DEFINITIONS(-DENABLE_LIBWRAP=true)
 ADD_DEFINITIONS("-std=c++0x")
 
-MESSAGE("VIDEO enabled")
-ADD_DEFINITIONS(-DENABLE_VIDEO=true)
-SET(ENABLE_VIDEO 1 CACHE BOOLEAN "Enable video")
-
 SET(LOCAL_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../cmake/)
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LOCAL_CMAKE_MODULE_PATH})
 
@@ -26,11 +24,17 @@ ENDIF()
 FIND_PACKAGE(Qt5Core REQUIRED)
 FIND_PACKAGE(Ring REQUIRED)
 
-set(libqtwrapper_LIB_SRCS
+SET(libqtwrapper_LIB_SRCS
    instancemanager.cpp
    videomanager_wrap.cpp
 )
 
+IF(NOT (${ENABLE_VIDEO} MATCHES "false"))
+   MESSAGE("VIDEO enabled")
+   ADD_DEFINITIONS(-DENABLE_VIDEO=true)
+   SET(ENABLE_VIDEO 1 CACHE BOOLEAN "Enable video")
+ENDIF(NOT (${ENABLE_VIDEO} MATCHES "false"))
+
 INCLUDE_DIRECTORIES(SYSTEM ${Qt5Core_INCLUDE_DIRS} )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${ring_INCLUDE_DIRS})

src/qtwrapper/videomanager_wrap.h

@@ -98,6 +98,9 @@ public Q_SLOTS: // METHODS
 #ifdef ENABLE_VIDEO
         DRing::applySettings(
             name.toStdString(), convertMap(settings));
+#else
+        Q_UNUSED(name)
+        Q_UNUSED(settings)
 #endif
     }
 
@@ -116,6 +119,8 @@ public Q_SLOTS: // METHODS
             }
             ret[QString(x.first.c_str())] = ytemp;
         }
+#else
+        Q_UNUSED(name)
 #endif
         return ret;
     }
@@ -123,12 +128,10 @@ public Q_SLOTS: // METHODS
     QString getDefaultDevice()
     {
 #ifdef ENABLE_VIDEO
-        QString temp(
-            DRing::getDefaultDevice().c_str());
+        return QString::fromStdString(DRing::getDefaultDevice().c_str());
 #else
-        QString temp;
+        return QString();
 #endif
-        return temp;
     }
 
     QStringList getDeviceList()
@@ -148,6 +151,7 @@ public Q_SLOTS: // METHODS
         MapStringString temp =
             convertMap(DRing::getSettings(device.toStdString()));
 #else
+        Q_UNUSED(device)
         MapStringString temp;
 #endif
         return temp;
@@ -166,6 +170,8 @@ public Q_SLOTS: // METHODS
     {
 #ifdef ENABLE_VIDEO
         DRing::setDefaultDevice(name.toStdString());
+#else
+        Q_UNUSED(name)
 #endif
     }
 
@@ -188,6 +194,7 @@ public Q_SLOTS: // METHODS
 #ifdef ENABLE_VIDEO
         return DRing::switchInput(resource.toStdString());
 #else
+        Q_UNUSED(resource)
         return false;
 #endif
     }
@@ -197,6 +204,9 @@ public Q_SLOTS: // METHODS
     {
 #ifdef ENABLE_VIDEO
         DRing::registerSinkTarget(sinkID.toStdString(), target);
+#else
+    Q_UNUSED(sinkID)
+    Q_UNUSED(target)
 #endif
     }