Changeset 68e005d in mainline for uspace/app/dplay/dplay.c

Timestamp:

2012-07-05T23:31:46Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6be06d0

Parents:

2afae0e

Message:

dplay: There is one more event after sending the stop command.

File:

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

uspace/app/dplay/dplay.c

@@ -84 +84 @@
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void* arg)
 {
-        static unsigned wait = SUBBUFFERS;
+        async_answer_0(iid, EOK);
+        playback_t *pb = arg;
+        const size_t buffer_part = pb->buffer.size / SUBBUFFERS;
         while (1) {
                 ipc_call_t call;
@@ -90 +92 @@
                 if (IPC_GET_IMETHOD(call) != IPC_FIRST_USER_METHOD) {
                         printf("Unknown event.\n");
-                        async_answer_0(callid,EOK);
                         break;
                 }
-                playback_t *pb = arg;
-//              printf("Got device event!!!\n");
-                const size_t buffer_part = pb->buffer.size / SUBBUFFERS;
+                printf("Got device event!!!\n");
                 const size_t bytes = fread(pb->buffer.position, sizeof(uint8_t),
                    buffer_part, pb->source);
@@ -104 +103 @@
                 if (pb->buffer.position >= (pb->buffer.base + pb->buffer.size))
                         pb->buffer.position = pb->buffer.base;
-                async_answer_0(callid,EOK);
-                if (bytes == 0 && (wait-- == 0)) {
+                async_answer_0(callid, EOK);
+                if (bytes == 0) {
                         pb->playing = false;
                         fibril_condvar_signal(&pb->cv);
-                        return;
                 }
         }
@@ -137 +135 @@
 
         for (pb->playing = true; pb->playing;
-          fibril_condvar_wait(&pb->cv, &pb->mutex));
+            fibril_condvar_wait(&pb->cv, &pb->mutex));
 
         audio_pcm_buffer_stop_playback(pb->device, pb->buffer.id);
+        fibril_condvar_wait(&pb->cv, &pb->mutex);
 }