Changeset aef1799 in mainline for uspace/app/wavplay/dplay.c

Timestamp:

2012-07-17T10:57:41Z (13 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.

File:

• uspace/app/wavplay/dplay.c (moved) (moved from uspace/app/dplay/dplay.c ) (2 diffs)

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;