Changeset aef1799 in mainline

Timestamp:

2012-07-17T10:57:41Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1f7da3b

Parents:

cd8f19d

Message:

Integrate dplay into wavplay.

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/dplay/Makefile (deleted)
• uspace/app/dplay/wave.c (deleted)
• uspace/app/dplay/wave.h (deleted)
• uspace/app/wavplay/Makefile (modified) (1 diff)
• uspace/app/wavplay/dplay.c (moved) (moved from uspace/app/dplay/dplay.c ) (2 diffs)
• uspace/app/wavplay/dplay.h (added)
• uspace/app/wavplay/main.c (moved) (moved from uspace/app/wavplay/wavplay.c ) (3 diffs)
• uspace/lib/pcm/src/format.c (modified) (2 diffs)

boot/arch/amd64/Makefile.inc

@@ -63 +63 @@
 RD_APPS_ESSENTIAL += \
         $(USPACE_PATH)/app/edit/edit \
-        $(USPACE_PATH)/app/dplay/dplay \
-        $(USPACE_PATH)/app/drec/drec \
         $(USPACE_PATH)/app/mixerctl/mixerctl \
         $(USPACE_PATH)/app/wavplay/wavplay \

uspace/Makefile

@@ -38 +38 @@
         app/bnchmark \
         app/devctl \
-        app/dplay \
         app/drec \
         app/edit \

uspace/app/wavplay/Makefile

@@ -31 +31 @@
 
 LIBS = \
-        $(LIBHOUND_PREFIX)/libhound.a
+        $(LIBHOUND_PREFIX)/libhound.a \
+        $(LIBDRV_PREFIX)/libdrv.a
 
 EXTRA_CFLAGS = \
-        -I$(LIBHOUND_PREFIX)/include -I$(LIBPCM_PREFIX)/include
+        -I$(LIBDRV_PREFIX)/include \
+        -I$(LIBHOUND_PREFIX)/include \
+        -I$(LIBPCM_PREFIX)/include
 
 SOURCES = \
-        wavplay.c \
+        dplay.c \
+        main.c \
         wave.c
 

uspace/app/wavplay/dplay.c

@@ -49 +49 @@
 
 #include "wave.h"
+#include "dplay.h"
 
 #define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/pcm"
@@ -153 +154 @@
 }
 
-int main(int argc, char *argv[])
-{
-        const char *device = DEFAULT_DEVICE;
-        const char *file;
-        switch (argc) {
-        case 2:
-                file = argv[1];
-                break;
-        case 3:
-                device = argv[1];
-                file = argv[2];
-                break;
-        default:
-                printf("Usage: %s [device] file.\n", argv[0]);
-                return 1;
-        }
-
+int dplay(const char *device, const char *file)
+{
+        if (str_cmp(device, "default") == 0)
+                device = DEFAULT_DEVICE;
         audio_pcm_sess_t *session = audio_pcm_open(device);
         if (!session) {
-                printf("Failed to connect to device.\n");
+                printf("Failed to connect to device %s.\n", device);
                 return 1;
         }
+        printf("Playing on device: %s.\n", device);
 
         const char* info = NULL;

uspace/app/wavplay/main.c

@@ -41 +41 @@
 #include <hound/client.h>
 #include <pcm/sample_format.h>
-
+#include <getopt.h>
+
+#include "dplay.h"
 #include "wave.h"
 
@@ -119 +121 @@
 }
 
+static const struct option opts[] = {
+        {"device", required_argument, 0, 'd'},
+        {"record", no_argument, 0, 'r'},
+        {0, 0, 0, 0}
+};
+
+
 int main(int argc, char *argv[])
 {
-        if (argc != 2)
-                return 1;
-        const char *file = argv[1];
+        const char *device = "default";
+        int idx = 0;
+        bool direct = false, record = false;
+        optind = 0;
+        int ret = 0;
+        while (ret != -1) {
+                ret = getopt_long(argc, argv, "d:r", opts, &idx);
+                switch (ret) {
+                case 'd':
+                        direct = true;
+                        device = optarg;
+                        break;
+                case 'r':
+                        record = true;
+                        break;
+                };
+        }
+
+        if (optind == argc) {
+                printf("Not enough arguments.\n");
+                return 1;
+        }
+        const char *file = argv[optind];
+
+        printf("%s %s\n", record ? "Recording" : "Playing", file);
+        if (record) {
+                printf("Recording is not supported yet.\n");
+                return 1;
+        }
+        if (direct)
+                return dplay(device, file);
 
         task_id_t tid = task_get_id();
@@ -149 +186 @@
         pcm_sample_format_t format;
         const char *error;
-        const int ret = wav_parse_header(&header, NULL, NULL, &channels, &rate,
+        ret = wav_parse_header(&header, NULL, NULL, &channels, &rate,
             &format, &error);
         if (ret != EOK) {

uspace/lib/pcm/src/format.c

@@ -219 +219 @@
 {
         assert(f);
+        assert(buffer);
         if (channel >= f->channels)
                 return 0.0f;
@@ -232 +233 @@
         /* This makes it positive */ \
         sample -= (float)(type)low; \
-        if (sample < 0.0f) { \
-                printf("SUB MIN failed\n"); \
-        } \
         /* This makes it <0,2> */ \
         sample /= (((float)(type)high - (float)(type)low) / 2.0f); \
-        if (sample > 2.0) { \
-                printf("DIV RANGE failed\n"); \
-        } \
         return sample - 1.0f; \
 } while (0)