Changeset 0773396 in mainline for uspace/app/wavplay/main.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

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

uspace/app/wavplay/main.c

@@ -79 +79 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+                printf("Error parsing `%s' wav header: %s.\n", filename, error);
                 fclose(source);
                 return EINVAL;
         }
+
+        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
+            format.channels, format.sampling_rate,
+            pcm_sample_format_str(format.sample_format));
 
         /* Allocate buffer and create new context */
@@ -136 +140 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+                printf("Error parsing `%s' wav header: %s.\n", filename, error);
                 fclose(source);
                 return EINVAL;
         }
+        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
+            format.channels, format.sampling_rate,
+            pcm_sample_format_str(format.sample_format));
 
         /* Connect new playback context */