Changeset c5c65b6 in mainline

Timestamp:

2012-07-06T14:11:32Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9b3d999

Parents:

6be06d0

Message:

app/dplay: Refactoring. Ouput + sign instead of one line.

File:

• uspace/app/dplay/dplay.c (modified) (9 diffs)

uspace/app/dplay/dplay.c

@@ -74 +74 @@
         pb->buffer.base = NULL;
         pb->buffer.size = 0;
+        pb->buffer.position = NULL;
         pb->playing = false;
         pb->source = NULL;
@@ -94 +95 @@
                         break;
                 }
-                printf("Got device event!!!\n");
+                printf("+");
                 const size_t bytes = fread(pb->buffer.position, sizeof(uint8_t),
                    buffer_part, pb->source);
-                pb->buffer.position += bytes;
-                if (bytes != buffer_part)
-                        bzero(pb->buffer.position, buffer_part - bytes);
-                pb->buffer.position += buffer_part - bytes;
+                bzero(pb->buffer.position + bytes, buffer_part - bytes);
+                pb->buffer.position += buffer_part;
+
                 if (pb->buffer.position >= (pb->buffer.base + pb->buffer.size))
                         pb->buffer.position = pb->buffer.base;
@@ -118 +118 @@
         assert(pb->device);
         pb->buffer.position = pb->buffer.base;
-        printf("Playing: %dHz, %d-bit samples, %d channel(s), %sSIGNED.\n",
-            sampling_rate, sample_size, channels, sign ? "": "UN");
+        printf("Playing: %dHz, %d-bit %ssigned samples, %d channel(s).\n",
+            sampling_rate, sample_size, sign ? "": "un", channels);
         const size_t bytes = fread(pb->buffer.base, sizeof(uint8_t),
             pb->buffer.size, pb->source);
         if (bytes != pb->buffer.size)
-                return;
+                bzero(pb->buffer.base + bytes, pb->buffer.size - bytes);
         printf("Buffer data ready.\n");
         fibril_mutex_lock(&pb->mutex);
@@ -139 +139 @@
         audio_pcm_buffer_stop_playback(pb->device, pb->buffer.id);
         fibril_condvar_wait(&pb->cv, &pb->mutex);
+        printf("\n");
 }
 
@@ -175 +176 @@
         async_exch_t *exch = async_exchange_begin(session);
         if (!exch) {
+                ret = EPARTY;
                 printf("Failed to start session exchange.\n");
-                async_hangup(session);
-                return 1;
+                goto close_session;
         }
         const char* info = NULL;
@@ -183 +184 @@
         if (ret != EOK) {
                 printf("Failed to get PCM info.\n");
-                async_exchange_end(exch);
-                async_hangup(session);
-                return 1;
+                goto close_session;
         }
         printf("Playing on %s.\n", info);
@@ -197 +196 @@
         if (ret != EOK) {
                 printf("Failed to get PCM buffer: %s.\n", str_error(ret));
-                async_exchange_end(exch);
-                async_hangup(session);
-                return 1;
+                goto close_session;
         }
         printf("Buffer (%u): %p %zu.\n", pb.buffer.id, pb.buffer.base,
@@ -209 +206 @@
         pb.source = fopen(file, "rb");
         if (pb.source == NULL) {
+                ret = ENOENT;
                 printf("Failed to open %s.\n", file);
-                munmap(pb.buffer.base, pb.buffer.size);
-                audio_pcm_buffer_release_buffer(exch, pb.buffer.id);
-                async_exchange_end(exch);
-                async_hangup(session);
-                return 1;
+                goto cleanup;
         }
         wave_header_t header;
@@ -226 +220 @@
                 printf("Error parsing wav header: %s.\n", error);
                 fclose(pb.source);
-                munmap(pb.buffer.base, pb.buffer.size);
-                audio_pcm_buffer_release_buffer(exch, pb.buffer.id);
-                async_exchange_end(exch);
-                async_hangup(session);
-                return 1;
+                goto cleanup;
         }
 
         play(&pb, rate, sample_size, channels, sign);
 
+cleanup:
         munmap(pb.buffer.base, pb.buffer.size);
         audio_pcm_buffer_release_buffer(exch, pb.buffer.id);
+close_session:
         async_exchange_end(exch);
         async_hangup(session);
-        return 0;
+        return ret == EOK ? 0 : 1;
 }
 /**