From 149ae2a212289cd8e430ab474df8bf4da2dd5e28 Mon Sep 17 00:00:00 2001 From: amass <168062547@qq.com> Date: Wed, 2 Oct 2024 03:13:15 +0800 Subject: [PATCH] update for linux. --- Peripheral/DeviceDiscovery.cpp | 6 ++---- Peripheral/DeviceDiscovery.h | 6 +++++- UnitTest/CMakeLists.txt | 1 - UnitTest/LinuxDeviceEnums.cpp | 2 -- UnitTest/main.cpp | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Peripheral/DeviceDiscovery.cpp b/Peripheral/DeviceDiscovery.cpp index 3d16106..8770ab2 100644 --- a/Peripheral/DeviceDiscovery.cpp +++ b/Peripheral/DeviceDiscovery.cpp @@ -5,11 +5,9 @@ #include #include #include -#ifdef Q_OS_WIN +#ifdef WIN32 #include #include -#include -#include #else #include #include @@ -28,7 +26,7 @@ void SafeRelease(T **ppT) { DeviceDiscovery::DeviceDiscovery() { } -#ifdef Q_OS_WIN +#ifdef WIN32 static std::string deviceName(IMFActivate *device) { std::string ret; WCHAR *friendlyName = nullptr; diff --git a/Peripheral/DeviceDiscovery.h b/Peripheral/DeviceDiscovery.h index dda61cb..33996d4 100644 --- a/Peripheral/DeviceDiscovery.h +++ b/Peripheral/DeviceDiscovery.h @@ -5,6 +5,10 @@ #include #include #include +#ifdef WIN32 +#include +#include +#endif class DeviceDiscovery { constexpr static int32_t OtaSpecificWidth = 96; @@ -13,7 +17,7 @@ public: constexpr static auto DeviceName = "UVC Camera"; struct Device { ~Device(); -#ifdef Q_OS_WIN +#ifdef WIN32 Device(IMFMediaSource *source); IMFMediaSource *source = nullptr; IMFSourceReader *reader = nullptr; diff --git a/UnitTest/CMakeLists.txt b/UnitTest/CMakeLists.txt index 8f56a06..9e38d43 100644 --- a/UnitTest/CMakeLists.txt +++ b/UnitTest/CMakeLists.txt @@ -13,7 +13,6 @@ target_compile_definitions(UnitTest ) target_link_libraries(UnitTest - PRIVATE Boost::unit_test_framework PRIVATE DataStructure PRIVATE Peripheral PRIVATE Universal diff --git a/UnitTest/LinuxDeviceEnums.cpp b/UnitTest/LinuxDeviceEnums.cpp index 911f579..a9e6047 100644 --- a/UnitTest/LinuxDeviceEnums.cpp +++ b/UnitTest/LinuxDeviceEnums.cpp @@ -6,8 +6,6 @@ BOOST_AUTO_TEST_CASE(EnumDevice) { std::error_code error; DeviceDiscovery discovery; auto device = discovery.find("UVC Camera", error); - LOG(info) << device->name; - auto devices = discovery.devices(); for (int i = 0; i < devices.size(); i++) { LOG(info) << "device[" << i << "] " << devices.at(i); diff --git a/UnitTest/main.cpp b/UnitTest/main.cpp index 4cd512b..5999a36 100644 --- a/UnitTest/main.cpp +++ b/UnitTest/main.cpp @@ -1,2 +1,2 @@ #define BOOST_TEST_MODULE KylinLibraryTest -#include "boost/test/included/unit_test.hpp" +#include