Changeset 346643c in mainline for uspace/app/dplay/wave.c

Timestamp:

2012-07-11T12:05:30Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

039337e8

Parents:

94694a4

Message:

audio: Use enum for sample format.

File:

• uspace/app/dplay/wave.c (modified) (3 diffs)

uspace/app/dplay/wave.c

@@ -40 +40 @@
 
 int wav_parse_header(void *file, const void **data, size_t *data_size,
-    unsigned *sampling_rate, unsigned *sample_size, unsigned *channels,
-    bool *sign, const char **error)
+    unsigned *channels, unsigned *sampling_rate, pcm_sample_format_t *format,
+    const char **error)
 {
         if (!file) {
@@ -86 +86 @@
         }
 
+
         if (data)
                 *data = header->data;
@@ -93 +94 @@
         if (sampling_rate)
                 *sampling_rate = uint32_t_le2host(header->sampling_rate);
-        if (sample_size)
-                *sample_size = uint32_t_le2host(header->sample_size);
         if (channels)
                 *channels = uint16_t_le2host(header->channels);
-        if (sign)
-                *sign = uint32_t_le2host(header->sample_size) == 16
-                    ? true : false;
+        if (format) {
+                const unsigned size = uint32_t_le2host(header->sample_size);
+                switch (size) {
+                case 8: *format = PCM_SAMPLE_UINT8; break;
+                case 16: *format = PCM_SAMPLE_SINT16_LE; break;
+                case 24: *format = PCM_SAMPLE_SINT24_LE; break;
+                case 32: *format = PCM_SAMPLE_SINT32_LE; break;
+                default:
+                        *error = "Unknown format";
+                        return ENOTSUP;
+                }
+        }
         if (error)
                 *error = "no error";