Changes in uspace/app/wavplay/main.c [485281e:508b0df1] in mainline

File:

• uspace/app/wavplay/main.c (modified) (8 diffs)

uspace/app/wavplay/main.c

@@ -119 +119 @@
  * @return Error code
  */
-static errno_t hplay(const char *filename, const char *target)
+static errno_t hplay(const char *filename)
 {
         printf("Hound playback: %s\n", filename);
@@ -158 +158 @@
         }
 
-        ret = hound_context_connect_target(hound, target);
+        ret = hound_context_connect_target(hound, HOUND_DEFAULT_TARGET);
         if (ret != EOK) {
-                printf("Failed to connect to target '%s': %s\n", target,
+                printf("Failed to connect to default target: %s\n",
                     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);
@@ -225 +215 @@
         { "parallel", no_argument, 0, 'p' },
         { "record", no_argument, 0, 'r' },
-        { "target", required_argument, 0, 't' },
         { "help", no_argument, 0, 'h' },
         { 0, 0, 0, 0 }
@@ -241 +230 @@
         printf("\t -r, --record\t Start recording instead of playback. "
             "(Not implemented)\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 -d, --device\t Use specified device instead of the sound "
+            "service. Use location path or a special device `default'\n");
         printf("\t -p, --parallel\t Play given files in parallel instead of "
             "sequentially (does not work with -d).\n");
@@ -251 +239 @@
 {
         const char *device = "default";
-        const char *target = HOUND_DEFAULT_TARGET;
         int idx = 0;
         bool direct = false, record = false, parallel = false;
@@ -259 +246 @@
         /* Parse command line options */
         while (ret != -1) {
-                ret = getopt_long(argc, argv, "d:prt:h", opts, &idx);
+                ret = getopt_long(argc, argv, "d:prh", opts, &idx);
                 switch (ret) {
                 case 'd':
@@ -270 +257 @@
                 case 'p':
                         parallel = true;
-                        break;
-                case 't':
-                        target = optarg;
                         break;
                 case 'h':
@@ -350 +334 @@
                                 fibril_add_ready(fid);
                         } else {
-                                hplay(file, target);
+                                hplay(file);
                         }
                 }