fixup display-names/friendly

fix formatting
add interface-changes file

Author: BreadFish64

DOCS/interface-changes/display-name-friendly.txt

@@ -0,0 +1 @@
+add `display-name/friendly` property on Windows to obtain display names from EDID

player/command.c

@@ -2827,46 +2827,38 @@ static int get_display_names_subkey(struct vo *vo, int action,
                                     void *arg, enum mp_voctrl voctrl)
 {
     switch (action) {
-        case M_PROPERTY_GET_TYPE:
-            *(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING_LIST};
-            return M_PROPERTY_OK;
-        case M_PROPERTY_GET: {
-            char** display_names;
-            if (vo_control(vo, voctrl, &display_names) < 1)
-                return M_PROPERTY_UNAVAILABLE;
+    case M_PROPERTY_GET_TYPE:
+        *(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING_LIST};
+        return M_PROPERTY_OK;
+    case M_PROPERTY_GET: {
+        char **display_names;
+        if (vo_control(vo, voctrl, &display_names) < 1)
+            return M_PROPERTY_UNAVAILABLE;
 
-            *(char ***)arg = display_names;
-            return M_PROPERTY_OK;
-        }
+        *(char ***)arg = display_names;
+        return M_PROPERTY_OK;
+    }
     }
     return M_PROPERTY_NOT_IMPLEMENTED;
 }
 
 static int mp_property_display_names(void *ctx, struct m_property *prop,
                                      int action, void *arg)
 {
-    MPContext *const mpctx = ctx;
-    struct vo *const vo = mpctx->video_out;
+    MPContext *mpctx = ctx;
+    struct vo *vo = mpctx->video_out;
     if (!vo)
         return M_PROPERTY_UNAVAILABLE;
 
     if (action == M_PROPERTY_KEY_ACTION) {
         struct m_property_action_arg *const ka = arg;
-        if (!strcmp(ka->key, "friendly")) {
-            return get_display_names_subkey(
-                vo,
-                ka->action,
-                ka->arg,
-                VOCTRL_GET_DISPLAY_NAMES_FRIENDLY);
-        } else {
+        if (strcmp(ka->key, "friendly"))
             return M_PROPERTY_UNKNOWN;
-        }
+
+        return get_display_names_subkey(vo, ka->action, ka->arg,
+                                        VOCTRL_GET_DISPLAY_NAMES_FRIENDLY);
     }
-    return get_display_names_subkey(
-        vo,
-        action,
-        arg,
-        VOCTRL_GET_DISPLAY_NAMES);
+    return get_display_names_subkey(vo, action, arg, VOCTRL_GET_DISPLAY_NAMES);
 }
 
 static int mp_property_vo_configured(void *ctx, struct m_property *prop,

video/out/w32_common.c

@@ -2246,23 +2246,17 @@ struct disp_names_data {
     bool friendly;
 };
 
-static void disp_names_append(HMONITOR mon, struct disp_names_data* data)
+static void disp_names_append(HMONITOR mon, struct disp_names_data *data)
 {
     MONITORINFOEXW mi = { .cbSize = sizeof mi };
     if (GetMonitorInfoW(mon, (MONITORINFO*)&mi)) {
-        wchar_t* friendly_name = NULL;
+        wchar_t *friendly_name = NULL;
         if (data->friendly) {
-            friendly_name =
-                mp_w32_displayconfig_get_friendly_name_from_device(mi.szDevice);
-        }
-        if (friendly_name) {
-            MP_TARRAY_APPEND(NULL, data->names, data->count,
-                mp_to_utf8(NULL, friendly_name));
-            talloc_free(friendly_name);
-        } else {
-            MP_TARRAY_APPEND(NULL, data->names, data->count,
-                mp_to_utf8(NULL, mi.szDevice));
+            friendly_name = mp_w32_displayconfig_get_friendly_name_from_device(mi.szDevice);
         }
+        wchar_t *name = friendly_name ? friendly_name : mi.szDevice;
+        MP_TARRAY_APPEND(NULL, data->names, data->count, mp_to_utf8(NULL, name));
+        talloc_free(friendly_name);
     }
 }
 

video/out/win32/displayconfig.c

@@ -208,22 +208,22 @@ wchar_t *mp_w32_displayconfig_get_device_from_friendly_name(
     return gdi_device_name;
 }
 
-wchar_t* mp_w32_displayconfig_get_friendly_name_from_device(
+wchar_t *mp_w32_displayconfig_get_friendly_name_from_device(
     const wchar_t *device)
 {
     void *ctx = talloc_new(NULL);
-    wchar_t* monitor_friendly_device_name = NULL;
+    wchar_t *monitor_friendly_device_name = NULL;
 
     // Get the current display configuration
     UINT32 num_paths;
-    DISPLAYCONFIG_PATH_INFO* paths;
+    DISPLAYCONFIG_PATH_INFO *paths;
     UINT32 num_modes;
-    DISPLAYCONFIG_MODE_INFO* modes;
+    DISPLAYCONFIG_MODE_INFO *modes;
     if (get_config(ctx, &num_paths, &paths, &num_modes, &modes))
         goto end;
 
     // Get the path for the specified monitor
-    DISPLAYCONFIG_PATH_INFO* path;
+    DISPLAYCONFIG_PATH_INFO *path;
     if (!(path = get_path(num_paths, paths, device)))
         goto end;
 
@@ -242,10 +242,9 @@ wchar_t* mp_w32_displayconfig_get_friendly_name_from_device(
     if (!target.flags.friendlyNameFromEdid)
         goto end;
 
-    monitor_friendly_device_name = talloc_memdup(
-        NULL,
-        target.monitorFriendlyDeviceName,
-        sizeof(target.monitorFriendlyDeviceName));
+    monitor_friendly_device_name = talloc_memdup(NULL,
+                                                 target.monitorFriendlyDeviceName,
+                                                 sizeof(target.monitorFriendlyDeviceName));
 
 end:
     talloc_free(ctx);

video/out/win32/displayconfig.h

@@ -31,9 +31,9 @@ wchar_t *mp_w32_displayconfig_get_device_from_friendly_name(
     const wchar_t *monitor_friendly_device_name);
 
 // Given a GDI monitor device name, get a friendly monitor device name
-// using the Windows 7 DisplayConfig API. Returns NULL on failure.
+// using the DisplayConfig API. Returns NULL on failure.
 // The caller is responsible for releasing the result with talloc_free.
-wchar_t* mp_w32_displayconfig_get_friendly_name_from_device(
+wchar_t *mp_w32_displayconfig_get_friendly_name_from_device(
     const wchar_t *device);
 
 #endif