[windows] #5, #18, #20

ffiirree · Mar 22, 2023 · d36584b · d36584b
1 parent 2f6f340
commit d36584b
Show file tree

Hide file tree

Showing 21 changed files with 687 additions and 226 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-find_package(Qt5 COMPONENTS Widgets Gui Multimedia LinguistTools REQUIRED)
+find_package(Qt5 COMPONENTS Widgets Gui LinguistTools REQUIRED)
 find_package(FFmpeg COMPONENTS avutil avcodec avformat avdevice avfilter REQUIRED)
 
 if(WIN32)
@@ -68,7 +68,6 @@ target_link_libraries(${PROJECT_NAME}
         FFmpeg::avutil FFmpeg::avcodec FFmpeg::avformat FFmpeg::avdevice FFmpeg::avfilter
         $<$<PLATFORM_ID:Windows>:dwmapi>
         $<$<PLATFORM_ID:Windows>:strmiids>
-        $<$<PLATFORM_ID:Windows>:Qt5::Multimedia>
         $<$<PLATFORM_ID:Linux>:Qt5::X11Extras>
         $<$<PLATFORM_ID:Linux>:Libv4l2::Libv4l2>
         $<$<PLATFORM_ID:Linux>:${PULSEAUDIO_LIBRARY}>

diff --git a/languages/capturer_en_US.ts b/languages/capturer_en_US.ts
@@ -208,7 +208,7 @@
 <context>
     <name>ScreenRecorder</name>
     <message>
-        <location filename="../src/record/screenrecorder.cpp" line="223"/>
+        <location filename="../src/record/screenrecorder.cpp" line="254"/>
         <source>Path: </source>
         <translation></translation>
     </message>

diff --git a/languages/capturer_zh_CN.ts b/languages/capturer_zh_CN.ts
@@ -208,7 +208,7 @@
 <context>
     <name>ScreenRecorder</name>
     <message>
-        <location filename="../src/record/screenrecorder.cpp" line="223"/>
+        <location filename="../src/record/screenrecorder.cpp" line="254"/>
         <source>Path: </source>
         <translation>路径：</translation>
     </message>

diff --git a/src/media/devices.cpp b/src/media/devices.cpp
@@ -7,8 +7,8 @@
 #include "linux-v4l2/linux-v4l2.h"
 
 #elif _WIN32
-#include <QCameraInfo>
-#include <QAudioDeviceInfo>
+#include "win-wasapi/enum-wasapi.h"
+#include "win-dshow/enum-devices.h"
 #endif
 
 QList<QString> Devices::cameras() {
@@ -19,8 +19,8 @@ QList<QString> Devices::cameras() {
         cameras.insert(QString::fromStdString(device.name_));
     }
 #elif _WIN32
-    for (const auto& info : QCameraInfo::availableCameras()) {
-        cameras.insert(info.description());
+    for (const auto& [name, id] : enum_video_devices()) {
+        cameras.insert(QString::fromStdWString(name));
     }
 #endif
 
@@ -38,8 +38,8 @@ QList<QString> Devices::microphones() {
     }
     pulse_unref();
 #elif _WIN32
-    for (const auto &info: QAudioDeviceInfo::availableDevices(QAudio::AudioInput)) {
-        microphones.insert(info.deviceName());
+    for (const auto& [name, id] : enum_audio_endpoints(true)) {
+        microphones.insert(name);
     }
 #endif
     return microphones.values();
@@ -57,8 +57,8 @@ QList<QString> Devices::speakers() {
     }
     pulse_unref();
 #elif _WIN32
-    for (const auto &info: QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)) {
-        speakers.insert(info.deviceName());
+    for (const auto& [name, id] : enum_audio_endpoints(false)) {
+        speakers.insert(name);
     }
 #endif
     return speakers.values();