acap,aplay/wasapi: prefer dev name with d=

Author: MartinPulec

src/audio/capture/wasapi.cpp

@@ -195,9 +195,9 @@ string wasapi_get_default_device_id(EDataFlow dataFlow, IMMDeviceEnumerator *enu
 }
 
 static void show_help() {
-        col() << "Usage:\n" <<
-                SBOLD(SRED("\t-s wasapi") << "[:<index>|:<ID>|:<name>]") <<
-                "\n\nAvailable devices:\n";
+        col() << "Usage:\n"
+              << SBOLD(SRED("\t-s wasapi") << "[:d[evice]=<index>|<ID>|<name>]")
+              << "\n\nAvailable devices:\n";
 
         IMMDeviceEnumerator *enumerator = nullptr;
         IMMDeviceCollection *pEndpoints = nullptr;
@@ -248,6 +248,10 @@ parse_fmt(const char *cfg, int *req_index, char *req_dev_name,
                 return;
         }
 
+        if (IS_KEY_PREFIX(cfg, "device")) {
+                cfg = strchr(cfg, '=') + 1;
+        }
+
         if (isdigit(cfg[0])) {
                 *req_index = atoi(cfg);
         } else if (strcmp(cfg, "loopback") == 0) {

src/audio/playback/wasapi.cpp

@@ -165,13 +165,11 @@ static void audio_play_wasapi_probe(struct device_info **available_devices, int
 }
 
 static void audio_play_wasapi_help() {
-        col()
-            << "Usage:\n"
-            << SBOLD(
-                   SRED("\t-r wasapi")
-                   << "[:<index>|:<ID>|:<name>] --param audio-buffer-len=<ms>")
-            << "\n"
-            << "\nAvailable devices:\n";
+        col() << "Usage:\n"
+              << SBOLD(SRED("\t-r wasapi") << "[:d[evice]=<index>|<ID>|<name>] "
+                                              "--param audio-buffer-len=<ms>")
+              << "\n"
+              << "\nAvailable devices:\n";
 
         bool com_initialized = false;
         if (!com_initialize(&com_initialized, MOD_NAME)) {
@@ -218,6 +216,10 @@ parse_fmt(const char *cfg, int *req_index, char *req_dev_name,
                 return;
         }
 
+        if (IS_KEY_PREFIX(cfg, "device")) {
+                cfg = strchr(cfg, '=') + 1;
+        }
+
         if (isdigit(cfg[0])) {
                 *req_index = atoi(cfg);
         } else if (cfg[0] == '{') { // ID