Changeset 94e46c9 in mainline for uspace/app/wavplay/wave.c

Timestamp:

2015-05-23T04:09:11Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (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:

Mainline changes

File:

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

uspace/app/wavplay/wave.c

@@ -116 +116 @@
                 *channels = uint16_t_le2host(header->channels);
         if (format) {
-                const unsigned size = uint32_t_le2host(header->sample_size);
+                const unsigned size = uint16_t_le2host(header->sample_size);
                 switch (size) {
                 case 8: *format = PCM_SAMPLE_UINT8; break;
@@ -157 +157 @@
         header->channels = host2uint32_t_le(format.channels);
         header->sample_size =
-            host2uint32_t_le(pcm_sample_format_size(format.sample_format));
+            host2uint16_t_le(pcm_sample_format_size(format.sample_format) * 8);
 }
 /**