Current version of Psi+ is 1.5.1729

It is based on: * psi: 65aed7cb * plugins: 3c71dec * psimedia: d1041c0 * resources: 2ef1865
psi-plus · Mar 30, 2024 · b19bfb1 · b19bfb1
1 parent 2f49f3b
commit b19bfb1
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/plugins/generic/psimedia/CMakeLists.txt b/plugins/generic/psimedia/CMakeLists.txt
@@ -11,29 +11,39 @@ set( CMAKE_MODULE_PATH
     ${PROJECT_SOURCE_DIR}/cmake/modules
 )
 #Detect MXE cross-compilation
-if( (CMAKE_CROSSCOMPILING) AND (DEFINED MSYS) )
-    message(STATUS "MXE environment detected")
-    option(USE_MXE "Use MXE toolkit" ON)
-    message(STATUS "MXE root path: ${CMAKE_PREFIX_PATH}")
+if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
+    string(TOLOWER ${CMAKE_TOOLCHAIN_FILE} TOOLCHAIN_FILE)
+    string(REGEX MATCH "mxe-conf" MXE_DETECTED "${TOOLCHAIN_FILE}")
+    if(MXE_DETECTED)
+        message(STATUS "MXE environment detected")
+        option(USE_MXE "Use MXE toolkit" ON)
+        message(STATUS "MXE root path: ${CMAKE_PREFIX_PATH}")
+    endif()
+endif()
+
+if(POLICY CMP0053)
+    cmake_policy(SET CMP0053 NEW)
 endif()
 
 # On Windows debug library should have 'd' postfix.
 if(WIN32)
+    unset(GST_SDK)
     set(CMAKE_DEBUG_POSTFIX "d")
     if(NOT USE_MXE)
         if(CMAKE_SIZEOF_VOID_P MATCHES "8")
             if(MSVC)
-                set(GST_SDK $ENV{GSTREAMER_1_0_ROOT_MSVC_X86_64} CACHE STRING "Path to gstreamer SDK")
+                set(GST_SDK_PATH $ENV{GSTREAMER_1_0_ROOT_MSVC_X86_64} CACHE STRING "Path to gstreamer SDK")
             else()
-                set(GST_SDK $ENV{GSTREAMER_1_0_ROOT_X86_64}  CACHE STRING "Path to gstreamer SDK")
+                set(GST_SDK_PATH $ENV{GSTREAMER_1_0_ROOT_X86_64}  CACHE STRING "Path to gstreamer SDK")
             endif()
         else()
             if(MSVC)
-                set(GST_SDK $ENV{GSTREAMER_1_0_ROOT_MSVC_X86} CACHE STRING "Path to gstreamer SDK")
+                set(GST_SDK_PATH $ENV{GSTREAMER_1_0_ROOT_MSVC_X86} CACHE STRING "Path to gstreamer SDK")
             else()
-                set(GST_SDK $ENV{GSTREAMER_1_0_ROOT_x86}  CACHE STRING "Path to gstreamer SDK")
+                set(GST_SDK_PATH $ENV{GSTREAMER_1_0_ROOT_x86}  CACHE STRING "Path to gstreamer SDK")
             endif()
         endif()
+        string(REPLACE "\\" "/" GST_SDK ${GST_SDK_PATH})
         message(STATUS "GST_SDK: ${GST_SDK}")
         if(GST_SDK)
             set(ENV{PKG_CONFIG_PATH} "${GST_SDK}/lib/pkgconfig")
@@ -125,8 +135,8 @@ endif()
 if(BUILD_DEMO)
     add_subdirectory(demo)
     add_subdirectory(gstplugin)
-    add_subdirectory(gstprovider)
 endif()
 if(BUILD_PSIPLUGIN)
     add_subdirectory(psiplugin)
 endif()
+add_subdirectory(gstprovider)
diff --git a/plugins/generic/psimedia/gstplugin/CMakeLists.txt b/plugins/generic/psimedia/gstplugin/CMakeLists.txt
@@ -21,6 +21,8 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_LIST_DIR}
     ${ABS_GPLUG_PARENT_DIR}/psimedia
+    ${ABS_GPLUG_PARENT_DIR}/gstprovider
+    ${ABS_GPLUG_PARENT_DIR}/gstprovider/devices
 )
 
 set(SOURCES
@@ -42,5 +44,7 @@ target_link_libraries(
     ${PLUGIN}
     ${QT_DEPLIBS}
 )
+add_dependencies(${PLUGIN} gstprovidersrc)
 target_link_libraries(${PLUGIN} gstprovidersrc)
 install(TARGETS ${PLUGIN} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+
diff --git a/plugins/generic/psimedia/gstprovider/CMakeLists.txt b/plugins/generic/psimedia/gstprovider/CMakeLists.txt
@@ -128,6 +128,10 @@ endif()
 set(PROVIDERLIB gstprovidersrc)
 add_library(${PROVIDERLIB} STATIC ${SOURCES})
 
+if(${QT_DEFAULT_MAJOR_VERSION} GREATER_EQUAL 6)
+    set_target_properties(${PROVIDERLIB} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+endif()
+
 target_include_directories(${PROVIDERLIB}
                            PUBLIC
                            ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/plugins/generic/psimedia/gstprovider/devices.cpp b/plugins/generic/psimedia/gstprovider/devices.cpp
@@ -188,7 +188,7 @@ class DeviceMonitor::Private {
         }
 
         gchar *name = gst_device_get_display_name(gdev);
-        d.name      = QString::fromUtf8(name);
+        d.name      = QString::fromLocal8Bit(name);
         g_free(name);
 
         if (gst_device_has_classes(gdev, "Audio/Source")) {

diff --git a/plugins/generic/psimedia/gstprovider/gstthread.cpp b/plugins/generic/psimedia/gstprovider/gstthread.cpp
@@ -242,10 +242,10 @@ class GstSession {
 
 class GstMainLoop::Private {
 public:
-    typedef struct {
+    struct BridgeQueueSource{
         GSource               parent;
         GstMainLoop::Private *d = nullptr;
-    } BridgeQueueSource;
+    };
 
     GstMainLoop                                        *q = nullptr;
     QString                                             pluginPath;

diff --git a/plugins/generic/psimedia/psiplugin/CMakeLists.txt b/plugins/generic/psimedia/psiplugin/CMakeLists.txt
@@ -19,7 +19,6 @@ get_filename_component(ABS_PLUGINS_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOL
 set(PLUGINS_ROOT_DIR "${ABS_PLUGINS_ROOT_DIR}" CACHE STRING "Plugins root path. Path where include directory placed")
 
 if(NOT BUILD_DEMO)
-    include(${ABS_PLUGINS_ROOT_DIR}/gstprovider/CMakeLists.txt)
     include_directories(
         ${ABS_PLUGINS_ROOT_DIR}/gstprovider
         ${ABS_PLUGINS_ROOT_DIR}/gstprovider/devices