Changeset 018ab50 in mainline for uspace/app

Timestamp:

2012-08-20T11:28:46Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fb6c98f

Parents:

20840922

Message:

audio: Move event callback into separate API calls.

Location:

uspace/app

Files:

• drec/drec.c (modified) (2 diffs)
• wavplay/dplay.c (modified) (5 diffs)

uspace/app/drec/drec.c

@@ -173 +173 @@
 
         ret = audio_pcm_get_buffer(rec.device, &rec.buffer.base,
-            &rec.buffer.size, device_event_callback, &rec);
+            &rec.buffer.size);
         if (ret != EOK) {
                 printf("Failed to get PCM buffer: %s.\n", str_error(ret));
                 goto close_session;
+        }
+        ret = audio_pcm_register_event_callback(rec.device,
+            device_event_callback, &rec);
+        if (ret != EOK) {
+                printf("Failed to register for events: %s.\n", str_error(ret));
+                goto cleanup;
         }
         printf("Buffer: %p %zu.\n", rec.buffer.base, rec.buffer.size);
@@ -209 +215 @@
         munmap(rec.buffer.base, rec.buffer.size);
         audio_pcm_release_buffer(rec.device);
+        audio_pcm_unregister_event_callback(rec.device);
 close_session:
         async_hangup(session);

uspace/app/wavplay/dplay.c

@@ -123 +123 @@
 
 
-static void play(playback_t *pb, unsigned channels,  unsigned sampling_rate,
+static void play(playback_t *pb, unsigned channels, unsigned sampling_rate,
     pcm_sample_format_t format)
 {
@@ -129 +129 @@
         assert(pb->device);
         pb->buffer.position = pb->buffer.base;
+        printf("Registering event callback\n");
+        int ret = audio_pcm_register_event_callback(pb->device,
+            device_event_callback, pb);
+        if (ret != EOK) {
+                printf("Failed to register event callback.\n");
+                return;
+        }
         printf("Playing: %dHz, %s, %d channel(s).\n",
             sampling_rate, pcm_sample_format_str(format), channels);
@@ -139 +146 @@
         const unsigned frames = pb->buffer.size /
             (BUFFER_PARTS * channels * pcm_sample_format_size(format));
-        int ret = audio_pcm_start_playback(pb->device,
-            frames, channels, sampling_rate, format);
+        ret = audio_pcm_start_playback(pb->device, frames, channels,
+            sampling_rate, format);
         if (ret != EOK) {
                 fibril_mutex_unlock(&pb->mutex);
@@ -152 +159 @@
         fibril_mutex_unlock(&pb->mutex);
         printf("\n");
+        audio_pcm_unregister_event_callback(pb->device);
 }
 
@@ -177 +185 @@
         playback_initialize(&pb, session);
 
-        ret = audio_pcm_get_buffer(pb.device, &pb.buffer.base,
-            &pb.buffer.size, device_event_callback, &pb);
+        ret = audio_pcm_get_buffer(pb.device, &pb.buffer.base, &pb.buffer.size);
         if (ret != EOK) {
                 printf("Failed to get PCM buffer: %s.\n", str_error(ret));