lee/Recordly
1
0
Fork 0
mirror of https://github.com/webadderallorg/Recordly.git synced 2026-09-24 23:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows): preserve full monitor ids for native capture

Browse Source
This commit is contained in:
webadderall
2026-03-23 17:51:52 +11:00
parent eb4bfd7b7e
commit db89b4f00e
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
electron/native/wgc-capture/src/main.cpp
+2 -2
View File
@@ -24,7 +24,7 @@ static std::mutex g_stopMutex;
static std::condition_variable g_stopCv;
struct CaptureConfig {
int displayId = 0;
int64_t displayId = 0;
int64_t windowHandle = 0;
std::string outputPath;
std::string audioOutputPath;
@@ -96,7 +96,7 @@ static bool parseSimpleJson(const std::string& json, CaptureConfig& config) {
config.outputPath = findString("outputPath");
if (config.outputPath.empty()) return false;
int displayId = findInt("displayId");
int64_t displayId = findInt64("displayId");
if (displayId >= 0) config.displayId = displayId;
int64_t windowHandle = findInt64("windowHandle");
electron/native/wgc-capture/src/monitor_utils.cpp
+2 -2
View File
@@ -27,11 +27,11 @@ std::vector<MonitorInfo> enumerateMonitors() {
}
// Electron uses the HMONITOR handle value cast to a number as the display ID.
HMONITOR findMonitorByDisplayId(int displayId) {
HMONITOR findMonitorByDisplayId(int64_t displayId) {
auto monitors = enumerateMonitors();
for (const auto& m : monitors) {
if (static_cast<int>(reinterpret_cast<intptr_t>(m.handle)) == displayId) {
if (static_cast<int64_t>(reinterpret_cast<intptr_t>(m.handle)) == displayId) {
return m.handle;
}
}
electron/native/wgc-capture/src/monitor_utils.h
+2 -1
View File
@@ -1,5 +1,6 @@
#pragma once
#include <cstdint>
#include <windows.h>
#include <string>
#include <vector>
@@ -14,5 +15,5 @@ struct MonitorInfo {
};
std::vector<MonitorInfo> enumerateMonitors();
HMONITOR findMonitorByDisplayId(int displayId);
HMONITOR findMonitorByDisplayId(int64_t displayId);
MonitorInfo getMonitorInfo(HMONITOR monitor);
electron/native/windows-capture/src/main.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ static std::mutex g_stopMutex;
static std::condition_variable g_stopCv;
struct CaptureConfig {
int displayId = 0;
int64_t displayId = 0;
int64_t windowHandle = 0;
std::string outputPath;
std::string audioOutputPath;
@@ -93,7 +93,7 @@ static bool parseSimpleJson(const std::string& json, CaptureConfig& config) {
config.outputPath = findString("outputPath");
if (config.outputPath.empty()) return false;
int displayId = findInt("displayId");
int64_t displayId = findInt64("displayId");
if (displayId >= 0) config.displayId = displayId;
int64_t windowHandle = findInt64("windowHandle");
electron/native/windows-capture/src/monitor_utils.cpp
+2 -2
View File
@@ -27,11 +27,11 @@ std::vector<MonitorInfo> enumerateMonitors() {
}
// Electron uses the HMONITOR handle value cast to a number as the display ID.
HMONITOR findMonitorByDisplayId(int displayId) {
HMONITOR findMonitorByDisplayId(int64_t displayId) {
auto monitors = enumerateMonitors();
for (const auto& m : monitors) {
if (static_cast<int>(reinterpret_cast<intptr_t>(m.handle)) == displayId) {
if (static_cast<int64_t>(reinterpret_cast<intptr_t>(m.handle)) == displayId) {
return m.handle;
}
}
electron/native/windows-capture/src/monitor_utils.h
+2 -1
View File
@@ -1,5 +1,6 @@
#pragma once
#include <cstdint>
#include <windows.h>
#include <string>
#include <vector>
@@ -14,5 +15,5 @@ struct MonitorInfo {
};
std::vector<MonitorInfo> enumerateMonitors();
HMONITOR findMonitorByDisplayId(int displayId);
HMONITOR findMonitorByDisplayId(int64_t displayId);
MonitorInfo getMonitorInfo(HMONITOR monitor);