opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2474 from WizardCM/named-display-monitors

Browse Source 
Show friendly monitor names on Display Capture on Windows & Projectors
This commit is contained in:
Jim
2020-03-09 06:26:52 -07:00
committed by GitHub
parent 43d5691c03 9931f22ff4
commit 519b3096aa
5 changed files with 106 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/win-capture/duplicator-monitor-capture.c
+21 -2
View File
@@ -273,13 +273,32 @@ static bool get_monitor_props(obs_property_t *monitor_list, int monitor_idx)
if (!gs_get_duplicator_monitor_info(monitor_idx, &info))
return false;
dstr_catf(&monitor_desc, "%s %d: %ldx%ld @ %ld,%ld", TEXT_MONITOR,
monitor_idx + 1, info.cx, info.cy, info.x, info.y);
struct dstr format_str = {0};
dstr_copy(&format_str, "%s: %ldx%ld @ %ld,%ld");
struct dstr m = {0};
dstr_copy(&m, info.monitor_name);
if (dstr_is_empty(&m)) {
// Fallback
struct dstr d = {0};
dstr_catf(&d, "%s %d", TEXT_MONITOR, monitor_idx + 1);
dstr_free(&m);
dstr_copy_dstr(&m, &d);
dstr_free(&d);
}
if (info.flags & MONITORINFOF_PRIMARY)
dstr_catf(&format_str, " (%s)", TEXT_PRIMARY_MONITOR);
dstr_catf(&monitor_desc, format_str.array, m.array, info.cx, info.cy,
info.x, info.y);
obs_property_list_add_int(monitor_list, monitor_desc.array,
monitor_idx);
dstr_free(&monitor_desc);
dstr_free(&format_str);
dstr_free(&m);
return true;
}
plugins/win-capture/monitor-capture.c
+29 -4
View File
@@ -1,4 +1,5 @@
#include <util/dstr.h>
#include <util/platform.h>
#include "dc-capture.h"
/* clang-format off */
@@ -176,7 +177,7 @@ static BOOL CALLBACK enum_monitor_props(HMONITOR handle, HDC hdc, LPRECT rect,
UNUSED_PARAMETER(rect);
obs_property_t *monitor_list = (obs_property_t *)param;
MONITORINFO mi;
MONITORINFOEX mi;
size_t monitor_id = 0;
struct dstr monitor_desc = {0};
struct dstr resolution = {0};
@@ -187,18 +188,40 @@ static BOOL CALLBACK enum_monitor_props(HMONITOR handle, HDC hdc, LPRECT rect,
mi.cbSize = sizeof(mi);
GetMonitorInfo(handle, &mi);
DISPLAY_DEVICE ddev;
ddev.cb = sizeof(ddev);
EnumDisplayDevices(mi.szDevice, 0, &ddev, 1);
char *devname = NULL;
#ifdef UNICODE
os_wcs_to_utf8_ptr(ddev.DeviceString, 128, &devname);
#else
devname = (char *)bstrdup(ddev.DeviceString);
#endif
dstr_catf(&resolution, "%dx%d @ %d,%d",
mi.rcMonitor.right - mi.rcMonitor.left,
mi.rcMonitor.bottom - mi.rcMonitor.top, mi.rcMonitor.left,
mi.rcMonitor.top);
dstr_copy(&format_string, "%s %d: %s");
dstr_copy(&format_string, "%s: %s");
if (mi.dwFlags == MONITORINFOF_PRIMARY) {
dstr_catf(&format_string, " (%s)", TEXT_PRIMARY_MONITOR);
}
dstr_catf(&monitor_desc, format_string.array, TEXT_MONITOR,
monitor_id + 1, resolution.array);
struct dstr m = {0};
dstr_copy(&m, devname);
dstr_replace(&m, "(", " (");
if (dstr_is_empty(&m)) {
struct dstr d = {0};
dstr_catf(&d, "%s %d", TEXT_MONITOR, monitor_id + 1);
dstr_free(&m);
dstr_copy_dstr(&m, &d);
dstr_free(&d);
}
dstr_catf(&monitor_desc, format_string.array, m.array,
resolution.array);
obs_property_list_add_int(monitor_list, monitor_desc.array,
(int)monitor_id);
@@ -206,6 +229,8 @@ static BOOL CALLBACK enum_monitor_props(HMONITOR handle, HDC hdc, LPRECT rect,
dstr_free(&monitor_desc);
dstr_free(&resolution);
dstr_free(&format_string);
dstr_free(&m);
bfree(devname);
return TRUE;
}