Changeset 90f05b0f in mainline for uspace/app

Timestamp:

2012-07-09T07:46:24Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

68d1313

Parents:

0336354a

Message:

Rename audio pcm interface.

Location:

uspace/app

Files:

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

uspace/app/dplay/dplay.c

@@ -39 +39 @@
 #include <str.h>
 #include <devman.h>
-#include <audio_pcm_buffer_iface.h>
+#include <audio_pcm_iface.h>
 #include <fibril_synch.h>
 #include <stdio.h>
@@ -126 +126 @@
         printf("Buffer data ready.\n");
         fibril_mutex_lock(&pb->mutex);
-        int ret = audio_pcm_buffer_start_playback(pb->device, pb->buffer.id,
+        int ret = audio_pcm_start_playback(pb->device, pb->buffer.id,
             SUBBUFFERS, sampling_rate, sample_size, channels, sign);
         if (ret != EOK) {
@@ -137 +137 @@
             fibril_condvar_wait(&pb->cv, &pb->mutex));
 
-        audio_pcm_buffer_stop_playback(pb->device, pb->buffer.id);
+        audio_pcm_stop_playback(pb->device, pb->buffer.id);
         fibril_condvar_wait(&pb->cv, &pb->mutex);
         printf("\n");
@@ -181 +181 @@
         }
         const char* info = NULL;
-        ret = audio_pcm_buffer_get_info_str(exch, &info);
+        ret = audio_pcm_get_info_str(exch, &info);
         if (ret != EOK) {
                 printf("Failed to get PCM info.\n");
@@ -192 +192 @@
         playback_initialize(&pb, exch);
 
-        ret = audio_pcm_buffer_get_buffer(pb.device, &pb.buffer.base,
+        ret = audio_pcm_get_buffer(pb.device, &pb.buffer.base,
             &pb.buffer.size, &pb.buffer.id, device_event_callback, &pb);
         if (ret != EOK) {
@@ -228 +228 @@
 cleanup:
         munmap(pb.buffer.base, pb.buffer.size);
-        audio_pcm_buffer_release_buffer(exch, pb.buffer.id);
+        audio_pcm_release_buffer(exch, pb.buffer.id);
 close_session:
         async_exchange_end(exch);

uspace/app/drec/drec.c

@@ -39 +39 @@
 #include <str.h>
 #include <devman.h>
-#include <audio_pcm_buffer_iface.h>
+#include <audio_pcm_iface.h>
 #include <fibril_synch.h>
 #include <stdio.h>
@@ -112 +112 @@
         printf("Recording: %dHz, %d-bit %ssigned samples, %d channel(s).\n",
             sampling_rate, sample_size, sign ? "": "un", channels);
-        int ret = audio_pcm_buffer_start_record(rec->device, rec->buffer.id,
+        int ret = audio_pcm_start_record(rec->device, rec->buffer.id,
             SUBBUFFERS, sampling_rate, sample_size, channels, sign);
         if (ret != EOK) {
@@ -121 +121 @@
         getchar();
         printf("\n");
-        audio_pcm_buffer_stop_record(rec->device, rec->buffer.id);
+        audio_pcm_stop_record(rec->device, rec->buffer.id);
 }
 
@@ -163 +163 @@
         }
         const char* info = NULL;
-        ret = audio_pcm_buffer_get_info_str(exch, &info);
+        ret = audio_pcm_get_info_str(exch, &info);
         if (ret != EOK) {
                 printf("Failed to get PCM info.\n");
@@ -174 +174 @@
         record_initialize(&rec, exch);
 
-        ret = audio_pcm_buffer_get_buffer(rec.device, &rec.buffer.base,
+        ret = audio_pcm_get_buffer(rec.device, &rec.buffer.base,
             &rec.buffer.size, &rec.buffer.id, device_event_callback, &rec);
         if (ret != EOK) {
@@ -211 +211 @@
 cleanup:
         munmap(rec.buffer.base, rec.buffer.size);
-        audio_pcm_buffer_release_buffer(exch, rec.buffer.id);
+        audio_pcm_release_buffer(exch, rec.buffer.id);
 close_session:
         async_exchange_end(exch);