Changeset d01e635 in mainline for uspace/app/dplay/dplay.c

Timestamp:

2012-07-12T18:29:02Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1df3018a

Parents:

1240bb9

Message:

dplay: Simplify playback stop.

File:

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

uspace/app/dplay/dplay.c

@@ -112 +112 @@
                 const size_t bytes = fread(pb->buffer.position, sizeof(uint8_t),
                    buffer_part, pb->source);
+                if (bytes == 0) {
+                        audio_pcm_stop_playback(pb->device, pb->buffer.id);
+                }
                 bzero(pb->buffer.position + bytes, buffer_part - bytes);
                 pb->buffer.position += buffer_part;
@@ -117 +120 @@
                 if (pb->buffer.position >= (pb->buffer.base + pb->buffer.size))
                         pb->buffer.position = pb->buffer.base;
-                if (bytes == 0) {
-                        fibril_mutex_lock(&pb->mutex);
-                        pb->playing = false;
-                        fibril_condvar_signal(&pb->cv);
-                        fibril_mutex_unlock(&pb->mutex);
-                }
         }
 }
@@ -152 +149 @@
             fibril_condvar_wait(&pb->cv, &pb->mutex));
 
-        audio_pcm_stop_playback(pb->device, pb->buffer.id);
-        for (pb->playing = true; pb->playing;
-                fibril_condvar_wait(&pb->cv, &pb->mutex));
         fibril_mutex_unlock(&pb->mutex);
         printf("\n");