From b4ad245212208cca8808c0976d07595c9df71750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 10 Aug 2023 10:15:02 +0800 Subject: [PATCH] Monitor (Linux): detect monitor name --- src/detection/monitor/monitor_linux.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/detection/monitor/monitor_linux.c b/src/detection/monitor/monitor_linux.c index 9bbc7f6b7..cca0c7de3 100644 --- a/src/detection/monitor/monitor_linux.c +++ b/src/detection/monitor/monitor_linux.c @@ -39,17 +39,11 @@ const char* ffDetectMonitor(FFlist* results) ffEdidGetPhysicalResolution(edidData, &width, &height); if (width != 0 && height != 0) { - const char* plainName = entry->d_name; - if (ffStrStartsWith(plainName, "card")) - { - const char* tmp = strchr(plainName + strlen("card"), '-'); - if (tmp) plainName = tmp + 1; - } - FFMonitorResult* display = (FFMonitorResult*) ffListAdd(results); display->width = width; display->height = height; - ffStrbufInitS(&display->name, plainName); + ffStrbufInit(&display->name); + ffEdidGetName(edidData, &display->name); ffEdidGetPhysicalSize(edidData, &display->physicalWidth, &display->physicalHeight); }