Changeset 346643c in mainline for uspace/app/drec/drec.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/drec/drec.c (modified) (4 diffs)

uspace/app/drec/drec.c

@@ -47 +47 @@
 #include <stdio.h>
 #include <macros.h>
+#include <pcm_sample_format.h>
 
 #include "wave.h"
@@ -53 +54 @@
 #define SUBBUFFERS 2
 
-const unsigned sampling_rate = 44100, sample_size = 16, channels = 2;
-bool sign = true;
+const unsigned sampling_rate = 44100, channels = 2, sample_size = 16;
+const pcm_sample_format_t format = PCM_SAMPLE_SINT16_LE;
 
 typedef struct {
@@ -104 +105 @@
 
 
-static void record(record_t *rec, unsigned sampling_rate, unsigned sample_size,
-    unsigned channels, bool sign)
+static void record(record_t *rec, unsigned channels, unsigned sampling_rate,
+    pcm_sample_format_t format)
 {
         assert(rec);
         assert(rec->device);
         rec->buffer.position = rec->buffer.base;
-        printf("Recording: %dHz, %d-bit %ssigned samples, %d channel(s).\n",
-            sampling_rate, sample_size, sign ? "": "un", channels);
+        printf("Recording: %dHz, %s, %d channel(s).\n",
+            sampling_rate, pcm_sample_format_str(format), channels);
         int ret = audio_pcm_start_record(rec->device, rec->buffer.id,
-            SUBBUFFERS, sampling_rate, sample_size, channels, sign);
+            SUBBUFFERS, channels, sampling_rate, format);
         if (ret != EOK) {
                 printf("Failed to start recording: %s.\n", str_error(ret));
@@ -201 +202 @@
                 .sampling_rate = sampling_rate,
                 .sample_size = sample_size,
-                .byte_rate = (sampling_rate / 8) * channels,
-                .block_align = (sampling_rate / 8) * channels,
+                .byte_rate = sampling_rate * (sample_size / 8) * channels,
+                .block_align = (sample_size / 8) * channels,
                 .subchunk2_id = SUBCHUNK2_ID,
         };
         fwrite(&header, sizeof(header), 1, rec.file);
-        record(&rec, sampling_rate, sample_size, channels, sign);
+        record(&rec, sampling_rate, channels, format);
         fclose(rec.file);