portaudio: selection by name - filter out unusable

do not return not usable deviecs - eg. "Microsoft Sound Mapper" doesn't
return "Microsoft Sound Mapper - Input" device if playback wanted but
"- Output" one.

Author: MartinPulec

src/audio/capture/portaudio.c

@@ -203,7 +203,8 @@ static void * audio_cap_portaudio_init(struct module *parent, const char *cfg)
 
 	// default device
         if (strlen(input_device_name) > 0) {
-                input_device_idx = portaudio_select_device_by_name(input_device_name);
+                input_device_idx = portaudio_select_device_by_name(
+                    input_device_name, PORTAUDIO_IN);
         }
         if (input_device_idx == -1) {
                 log_msg(LOG_LEVEL_NOTICE, MOD_NAME "Using default input audio device: %s\n",

src/audio/playback/portaudio.c

@@ -196,7 +196,8 @@ audio_play_portaudio_init(const struct audio_playback_opts *opts)
         }
 
         if (strlen(output_device_name) > 0) {
-                output_device_idx = portaudio_select_device_by_name(output_device_name);
+                output_device_idx = portaudio_select_device_by_name(
+                    output_device_name, PORTAUDIO_OUT);
         }
 
         struct state_portaudio_playback *s = calloc(1, sizeof *s);

src/audio/portaudio_common.c

@@ -94,6 +94,17 @@ portaudio_get_device_details(PaDeviceIndex                   device,
         return buffer;
 }
 
+static bool
+has_channels(const PaDeviceInfo *device_info, enum portaudio_device_direction dir)
+{
+
+        if ((dir == PORTAUDIO_IN && device_info->maxInputChannels == 0) ||
+            device_info->maxOutputChannels == 0) {
+                return false;
+        }
+        return true;
+}
+
 void
 portaudio_print_help(enum portaudio_device_direction kind, bool full)
 {
@@ -138,8 +149,7 @@ portaudio_print_help(enum portaudio_device_direction kind, bool full)
                 const char *highlight = TERM_BOLD;
                 const PaDeviceInfo *device_info = Pa_GetDeviceInfo(i);
                 // filter out (or differently highlight in verbose mode) unusable devices
-                if ((device_info->maxInputChannels == 0 && kind == PORTAUDIO_IN) ||
-                                (device_info->maxOutputChannels == 0 && kind == PORTAUDIO_OUT)) {
+                if (has_channels(device_info, kind)) {
                         if (log_level < LOG_LEVEL_VERBOSE) {
                                 continue;
                         } else {
@@ -231,14 +241,19 @@ void portaudio_print_version() {
  * @retval -2  device selection failed
  * @retval >=0 selected device
  */
-int portaudio_select_device_by_name(const char *name) {
+int
+portaudio_select_device_by_name(const char                     *name,
+                                enum portaudio_device_direction dir)
+{
         for (int i = 0; i < Pa_GetDeviceCount(); i++) {
                 const PaDeviceInfo *device_info = Pa_GetDeviceInfo(i);
+                if (!has_channels(device_info, dir)) {
+                        continue;
+                }
                 if (strstr(device_info->name, name)) {
                         return i;
                 }
         }
         log_msg(LOG_LEVEL_ERROR, MOD_NAME "No device named \"%s\" was found!\n", name);
         return -2;
 }
-

src/audio/portaudio_common.h

@@ -56,7 +56,8 @@ const char *portaudio_get_device_name(PaDeviceIndex device);
 void audio_portaudio_probe(struct device_info **available_devices, int *count, enum portaudio_device_direction);
 void portaudio_print_version(void);
 // documented at definition
-int portaudio_select_device_by_name(const char *name);
+int portaudio_select_device_by_name(const char                     *name,
+                                    enum portaudio_device_direction dir);
 
 #ifdef __cplusplus
 }