Changeset 1240bb9 in mainline for uspace/app/dplay/dplay.c

Timestamp:

2012-07-12T18:20:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d01e635

Parents:

992ef56

Message:

Use named audio events.

audio/sb16: dsp uses more detailed status (not just playing/not-playing).
app/drec: Fix parameter order in.

File:

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

uspace/app/dplay/dplay.c

@@ -91 +91 @@
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-                if (IPC_GET_IMETHOD(call) != IPC_FIRST_USER_METHOD) {
-                        printf("Unknown event.\n");
+                switch(IPC_GET_IMETHOD(call)) {
+                case PCM_EVENT_PLAYBACK_DONE:
+                        printf("+");
+                        async_answer_0(callid, EOK);
                         break;
+                case PCM_EVENT_PLAYBACK_TERMINATED:
+                        printf("\nPlayback terminated\n");
+                        fibril_mutex_lock(&pb->mutex);
+                        pb->playing = false;
+                        fibril_condvar_signal(&pb->cv);
+                        async_answer_0(callid, EOK);
+                        fibril_mutex_unlock(&pb->mutex);
+                        return;
+                default:
+                        printf("Unknown event %d.\n", IPC_GET_IMETHOD(call));
+                        async_answer_0(callid, ENOTSUP);
+                        continue;
+
                 }
-                printf("+");
                 const size_t bytes = fread(pb->buffer.position, sizeof(uint8_t),
                    buffer_part, pb->source);
@@ -103 +117 @@
                 if (pb->buffer.position >= (pb->buffer.base + pb->buffer.size))
                         pb->buffer.position = pb->buffer.base;
-                async_answer_0(callid, EOK);
                 if (bytes == 0) {
+                        fibril_mutex_lock(&pb->mutex);
                         pb->playing = false;
                         fibril_condvar_signal(&pb->cv);
+                        fibril_mutex_unlock(&pb->mutex);
                 }
         }
@@ -138 +153 @@
 
         audio_pcm_stop_playback(pb->device, pb->buffer.id);
-        fibril_condvar_wait(&pb->cv, &pb->mutex);
+        for (pb->playing = true; pb->playing;
+                fibril_condvar_wait(&pb->cv, &pb->mutex));
+        fibril_mutex_unlock(&pb->mutex);
         printf("\n");
 }