wasapi: show IDs only in fullhelp

the IDs shlighlyt mess up the output and may not be necessary needed to
use (name is also an option now if user wants stable identifier)

Author: MartinPulec

src/audio/capture/wasapi.cpp

@@ -97,7 +97,7 @@ struct state_acap_wasapi {
 enum { IDX_LOOP = -2, IDX_DFL = -1 };
 
 string wasapi_get_name(IMMDevice *pDevice);
-static void show_help();
+static void show_help(bool full);
 string wasapi_get_default_device_id(EDataFlow dataFlow, IMMDeviceEnumerator *enumerator);
 
 #define SAFE_RELEASE(u) \
@@ -197,10 +197,11 @@ string wasapi_get_default_device_id(EDataFlow dataFlow, IMMDeviceEnumerator *enu
         return ret;
 }
 
-static void show_help() {
+static void show_help(bool full) {
         col() << "Usage:\n"
-              << SBOLD(SRED("\t-s wasapi") << "[:d[evice]=<index>|<ID>|<name>]")
-              << "\n\nAvailable devices:\n";
+              << SBOLD(SRED("\t-s wasapi") << "[:d[evice]=<index>|<ID>|<name>]") << "\n"
+              << SBOLD("\t-s wasapi:[full]help") << "\n"
+              << "\nAvailable devices:\n";
 
         IMMDeviceEnumerator *enumerator = nullptr;
         IMMDeviceCollection *pEndpoints = nullptr;
@@ -225,10 +226,13 @@ static void show_help() {
                                 string dev_id = win_wstr_to_str(pwszID);
                                 color_printf(
                                     "%s\t" TBOLD("%2d") ") " TBOLD(
-                                        "%s") " (ID: %s)\n",
+                                        "%s"),
                                     (dev_id == default_dev_id ? "(*)" : ""), i,
-                                    wasapi_get_name(pDevice).c_str(),
-                                    dev_id.c_str());
+                                    wasapi_get_name(pDevice).c_str());
+                                if (full) {
+                                        color_printf(" (ID: %s)", dev_id.c_str());
+                                }
+                                color_printf("\n");
                         } catch (ug_runtime_error &e) {
                                 LOG(LOG_LEVEL_WARNING) << MOD_NAME << "Device " << i << ": " << e.what() << "\n";
                         }
@@ -241,6 +245,9 @@ static void show_help() {
         SAFE_RELEASE(pEndpoints);
         com_uninitialize(&com_initialized);
         col() << "  " << SBOLD("loopback") << ") " << SBOLD("computer audio output") << " (ID: loopback)\n";
+        if (!full) {
+                printf("(use \"fullhelp\" to show device IDs)\n");
+        }
         printf("\nDevice " TBOLD("name") " can be a substring (selects first matching device).\n");
 }
 
@@ -272,8 +279,9 @@ parse_fmt(const char *cfg, int *req_index, char *req_dev_name,
 
 static void * audio_cap_wasapi_init(struct module *parent, const char *cfg)
 {
-        if (strcmp(cfg, "help") == 0) {
-                show_help();
+        if (strcmp(cfg, "help") == 0 ||
+                strcmp(cfg, "fullhelp") == 0) {
+                show_help(strcmp(cfg, "fullhelp") == 0);
                 return INIT_NOERR;
         }
         UNUSED(parent);

src/audio/playback/wasapi.cpp

@@ -147,11 +147,11 @@ static void audio_play_wasapi_probe(struct device_info **available_devices, int
         com_uninitialize(&com_initialized);
 }
 
-static void audio_play_wasapi_help() {
+static void audio_play_wasapi_help(bool full) {
         col() << "Usage:\n"
               << SBOLD(SRED("\t-r wasapi") << "[:d[evice]=<index>|<ID>|<name>] "
-                                              "--param audio-buffer-len=<ms>")
-              << "\n"
+                                              "--param audio-buffer-len=<ms>") << "\n"
+              << SBOLD("\t-r wasapi:[full]help") << "\n"
               << "\nAvailable devices:\n";
 
         bool com_initialized = false;
@@ -178,8 +178,11 @@ static void audio_play_wasapi_help() {
                                 string dev_id = win_wstr_to_str(pwszID);
                                 col() << (dev_id == default_dev_id ? "(*)" : "")
                                       << "\t" << SBOLD(i) << ") "
-                                      << SBOLD(wasapi_get_name(pDevice))
-                                      << " (ID: " << dev_id << ")\n";
+                                      << SBOLD(wasapi_get_name(pDevice));
+                                if (full) {
+                                        col() << " (ID: " << dev_id  << ")";
+                                }
+                                col() << "\n";
                         } catch (ug_runtime_error &e) {
                                 LOG(LOG_LEVEL_WARNING) << MOD_NAME << "Device " << i << ": " << e.what() << "\n";
                         }
@@ -191,6 +194,9 @@ static void audio_play_wasapi_help() {
         SAFE_RELEASE(enumerator);
         SAFE_RELEASE(pEndpoints);
         com_uninitialize(&com_initialized);
+        if (!full) {
+                printf("(use \"fullhelp\" to show device IDs)\n");
+        }
         printf("\nDevice " TBOLD("name") " can be a substring (selects first matching device).\n");
 }
 
@@ -223,8 +229,9 @@ parse_fmt(const char *cfg, int *req_index, char *req_dev_name,
 static void *
 audio_play_wasapi_init(const struct audio_playback_opts *opts)
 {
-        if (strcmp(opts->cfg, "help") == 0) {
-                audio_play_wasapi_help();
+        if (strcmp(opts->cfg, "help") == 0 ||
+            strcmp(opts->cfg, "fullhelp") == 0) {
+                audio_play_wasapi_help(strcmp(opts->cfg, "fullhelp") == 0);
                 return INIT_NOERR;
         }