Changeset b497018 in mainline for uspace/app

Timestamp:

2012-07-15T15:13:34Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2cc5c835

Parents:

44d1311

Message:

Drop id parameter from audio_pcm interface.

Independent buffer should have separate nodes.

Location:

uspace/app

Files:

• dplay/dplay.c (modified) (6 diffs)
• drec/drec.c (modified) (5 diffs)

uspace/app/dplay/dplay.c

@@ -57 +57 @@
                 void *base;
                 size_t size;
-                unsigned id;
                 void* position;
         } buffer;
@@ -71 +70 @@
         assert(exch);
         assert(pb);
-        pb->buffer.id = 0;
         pb->buffer.base = NULL;
         pb->buffer.size = 0;
@@ -113 +111 @@
                    buffer_part, pb->source);
                 if (bytes == 0) {
-                        audio_pcm_stop_playback(pb->device, pb->buffer.id);
+                        audio_pcm_stop_playback(pb->device);
                 }
                 bzero(pb->buffer.position + bytes, buffer_part - bytes);
@@ -138 +136 @@
         printf("Buffer data ready.\n");
         fibril_mutex_lock(&pb->mutex);
-        int ret = audio_pcm_start_playback(pb->device, pb->buffer.id,
+        int ret = audio_pcm_start_playback(pb->device,
             SUBBUFFERS, channels, sampling_rate, format);
         if (ret != EOK) {
@@ -204 +202 @@
 
         ret = audio_pcm_get_buffer(pb.device, &pb.buffer.base,
-            &pb.buffer.size, &pb.buffer.id, device_event_callback, &pb);
+            &pb.buffer.size, device_event_callback, &pb);
         if (ret != EOK) {
                 printf("Failed to get PCM buffer: %s.\n", str_error(ret));
                 goto close_session;
         }
-        printf("Buffer (%u): %p %zu.\n", pb.buffer.id, pb.buffer.base,
-            pb.buffer.size);
+        printf("Buffer: %p %zu.\n", pb.buffer.base, pb.buffer.size);
         uintptr_t ptr = 0;
         as_get_physical_mapping(pb.buffer.base, &ptr);
@@ -239 +236 @@
 cleanup:
         munmap(pb.buffer.base, pb.buffer.size);
-        audio_pcm_release_buffer(exch, pb.buffer.id);
+        audio_pcm_release_buffer(exch);
 close_session:
         async_exchange_end(exch);

uspace/app/drec/drec.c

@@ -72 +72 @@
         assert(exch);
         assert(rec);
-        rec->buffer.id = 0;
         rec->buffer.base = NULL;
         rec->buffer.size = 0;
@@ -123 +122 @@
         printf("Recording: %dHz, %s, %d channel(s).\n",
             sampling_rate, pcm_sample_format_str(format), channels);
-        int ret = audio_pcm_start_record(rec->device, rec->buffer.id,
+        int ret = audio_pcm_start_record(rec->device,
             SUBBUFFERS, channels, sampling_rate, format);
         if (ret != EOK) {
@@ -132 +131 @@
         getchar();
         printf("\n");
-        audio_pcm_stop_record(rec->device, rec->buffer.id);
+        audio_pcm_stop_record(rec->device);
 }
 
@@ -186 +185 @@
 
         ret = audio_pcm_get_buffer(rec.device, &rec.buffer.base,
-            &rec.buffer.size, &rec.buffer.id, device_event_callback, &rec);
+            &rec.buffer.size, device_event_callback, &rec);
         if (ret != EOK) {
                 printf("Failed to get PCM buffer: %s.\n", str_error(ret));
                 goto close_session;
         }
-        printf("Buffer (%u): %p %zu.\n", rec.buffer.id, rec.buffer.base,
-            rec.buffer.size);
+        printf("Buffer: %p %zu.\n", rec.buffer.base, rec.buffer.size);
         uintptr_t ptr = 0;
         as_get_physical_mapping(rec.buffer.base, &ptr);
@@ -222 +220 @@
 cleanup:
         munmap(rec.buffer.base, rec.buffer.size);
-        audio_pcm_release_buffer(exch, rec.buffer.id);
+        audio_pcm_release_buffer(exch);
 close_session:
         async_exchange_end(exch);