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

Timestamp:

2012-07-11T12:05:30Z (12 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/dplay.c (modified) (4 diffs)

uspace/app/dplay/dplay.c

@@ -112 +112 @@
 
 
-static void play(playback_t *pb, unsigned sampling_rate, unsigned sample_size,
-    unsigned channels, bool sign)
+static void play(playback_t *pb, unsigned channels,  unsigned sampling_rate,
+    pcm_sample_format_t format)
 {
         assert(pb);
         assert(pb->device);
         pb->buffer.position = pb->buffer.base;
-        printf("Playing: %dHz, %d-bit %ssigned samples, %d channel(s).\n",
-            sampling_rate, sample_size, sign ? "": "un", channels);
+        printf("Playing: %dHz, %s, %d channel(s).\n",
+            sampling_rate, pcm_sample_format_str(format), channels);
         const size_t bytes = fread(pb->buffer.base, sizeof(uint8_t),
             pb->buffer.size, pb->source);
@@ -127 +127 @@
         fibril_mutex_lock(&pb->mutex);
         int ret = audio_pcm_start_playback(pb->device, pb->buffer.id,
-            SUBBUFFERS, sampling_rate, sample_size, channels, sign);
+            SUBBUFFERS, channels, sampling_rate, format);
         if (ret != EOK) {
                 fibril_mutex_unlock(&pb->mutex);
@@ -212 +212 @@
         wave_header_t header;
         fread(&header, sizeof(header), 1, pb.source);
-        unsigned rate, sample_size, channels;
-        bool sign;
+        unsigned rate, channels;
+        pcm_sample_format_t format;
         const char *error;
-        ret = wav_parse_header(&header, NULL, NULL, &rate, &sample_size,
-            &channels, &sign, &error);
+        ret = wav_parse_header(&header, NULL, NULL, &channels, &rate, &format,
+            &error);
         if (ret != EOK) {
                 printf("Error parsing wav header: %s.\n", error);
@@ -223 +223 @@
         }
 
-        play(&pb, rate, sample_size, channels, sign);
+        play(&pb, channels, rate, format);
         fclose(pb.source);