Allow specifying non-default audio target

Needed when there is more than one audio device. It would be nice
complementary functionality if we could actually configure the
default audio target.

Author: Jiri Svoboda

uspace/app/modplay/modplay.c

@@ -38,6 +38,7 @@
 #include <io/console.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <str_error.h>
 #include <trackmod.h>
 
@@ -66,6 +67,13 @@ static void modplay_event(cons_event_t *event)
 	}
 }
 
+static void print_syntax(void)
+{
+	printf("syntax: modplay [<options>] <filename.mod>\n");
+	printf("options:\n");
+	printf("\t-t <target>\tOutput to specified audio target.\n");
+}
+
 int main(int argc, char *argv[])
 {
 	trackmod_module_t *mod;
@@ -77,18 +85,43 @@ int main(int argc, char *argv[])
 	pcm_format_t format;
 	void *buffer;
 	size_t buffer_size;
+	const char *target = HOUND_DEFAULT_TARGET;
 	errno_t rc;
 
-	if (argc != 2) {
-		printf("syntax: modplay <filename.mod>\n");
+	++argv;
+	--argc;
+
+	while (argc > 0 && (*argv)[0] == '-') {
+		if (str_cmp(*argv, "-t") == 0) {
+			++argv;
+			--argc;
+
+			if (argc < 1) {
+				printf("Option '-t' requires an argument.\n");
+				print_syntax();
+				return 1;
+			}
+
+			target = *argv++;
+			--argc;
+			continue;
+		}
+
+		printf("Invalid option '%s'\n", *argv);
+		print_syntax();
+		return 1;
+	}
+
+	if (argc != 1) {
+		print_syntax();
 		return 1;
 	}
 
 	con = console_init(stdin, stdout);
 
-	rc = trackmod_module_load(argv[1], &mod);
+	rc = trackmod_module_load(argv[0], &mod);
 	if (rc != EOK) {
-		printf("Error loading %s.\n", argv[1]);
+		printf("Error loading %s.\n", argv[0]);
 		return 1;
 	}
 
@@ -113,9 +146,20 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	rc = hound_context_connect_target(hound, HOUND_DEFAULT_TARGET);
+	rc = hound_context_connect_target(hound, target);
 	if (rc != EOK) {
-		printf("Error connecting default audio target: %s.\n", str_error(rc));
+		printf("Error connecting audio target '%s': %s.\n",
+		    target, str_error(rc));
+
+		char **names = NULL;
+		size_t count = 0;
+		rc = hound_context_get_available_targets(hound, &names, &count);
+		if (rc == EOK) {
+			printf("Available targets:\n");
+			for (size_t i = 0; i < count; i++)
+				printf(" - %s\n", names[i]);
+		}
+
 		return 1;
 	}
 

uspace/app/wavplay/main.c

@@ -118,7 +118,7 @@ static errno_t hplay_ctx(hound_context_t *ctx, const char *filename)
  * @param filename File to play.
  * @return Error code
  */
-static errno_t hplay(const char *filename)
+static errno_t hplay(const char *filename, const char *target)
 {
 	printf("Hound playback: %s\n", filename);
 	FILE *source = fopen(filename, "rb");
@@ -157,10 +157,20 @@ static errno_t hplay(const char *filename)
 		return ENOMEM;
 	}
 
-	ret = hound_context_connect_target(hound, HOUND_DEFAULT_TARGET);
+	ret = hound_context_connect_target(hound, target);
 	if (ret != EOK) {
-		printf("Failed to connect to default target: %s\n",
+		printf("Failed to connect to target '%s': %s\n", target,
 		    str_error(ret));
+
+		char **names = NULL;
+		size_t count = 0;
+		ret = hound_context_get_available_targets(hound, &names, &count);
+		if (ret == EOK) {
+			printf("Available targets:\n");
+			for (size_t i = 0; i < count; i++)
+				printf(" - %s\n", names[i]);
+		}
+
 		hound_context_destroy(hound);
 		fclose(source);
 		return ret;
@@ -214,6 +224,7 @@ static const struct option opts[] = {
 	{ "device", required_argument, 0, 'd' },
 	{ "parallel", no_argument, 0, 'p' },
 	{ "record", no_argument, 0, 'r' },
+	{ "target", required_argument, 0, 't' },
 	{ "help", no_argument, 0, 'h' },
 	{ 0, 0, 0, 0 }
 };
@@ -229,23 +240,25 @@ static void print_help(const char *name)
 	printf("\t -h, --help\t Print this help.\n");
 	printf("\t -r, --record\t Start recording instead of playback. "
 	    "(Not implemented)\n");
-	printf("\t -d, --device\t Use specified device instead of the sound "
-	    "service. Use location path or a special device `default'\n");
+	printf("\t -d, --device\t Direct output to specified device instead of "
+	    "the sound service. Use location path or a special device `default'\n");
+	printf("\t -t, --target\t Output to the specified audio target.\n");
 	printf("\t -p, --parallel\t Play given files in parallel instead of "
 	    "sequentially (does not work with -d).\n");
 }
 
 int main(int argc, char *argv[])
 {
 	const char *device = "default";
+	const char *target = HOUND_DEFAULT_TARGET;
 	int idx = 0;
 	bool direct = false, record = false, parallel = false;
 	optind = 0;
 	int ret = 0;
 
 	/* Parse command line options */
 	while (ret != -1) {
-		ret = getopt_long(argc, argv, "d:prh", opts, &idx);
+		ret = getopt_long(argc, argv, "d:prt:h", opts, &idx);
 		switch (ret) {
 		case 'd':
 			direct = true;
@@ -257,6 +270,9 @@ int main(int argc, char *argv[])
 		case 'p':
 			parallel = true;
 			break;
+		case 't':
+			target = optarg;
+			break;
 		case 'h':
 			print_help(*argv);
 			return 0;
@@ -333,7 +349,7 @@ int main(int argc, char *argv[])
 				atomic_fetch_add(&playcount, 1);
 				fibril_add_ready(fid);
 			} else {
-				hplay(file);
+				hplay(file, target);
 			}
 		}
 	}