Changeset d86c9736 in mainline for uspace/lib/drv

Timestamp:

2012-08-19T14:35:32Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fa91c0f

Parents:

ad42844

Message:

Rename record → capture.

Location:

uspace/lib/drv

Files:

• generic/remote_audio_pcm.c (modified) (8 diffs)
• include/audio_pcm_iface.h (modified) (4 diffs)

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -51 +51 @@
         IPC_M_AUDIO_PCM_START_PLAYBACK,
         IPC_M_AUDIO_PCM_STOP_PLAYBACK,
-        IPC_M_AUDIO_PCM_START_RECORD,
-        IPC_M_AUDIO_PCM_STOP_RECORD,
+        IPC_M_AUDIO_PCM_START_CAPTURE,
+        IPC_M_AUDIO_PCM_STOP_CAPTURE,
 } audio_pcm_iface_funcs_t;
 
@@ -219 +219 @@
 }
 
-int audio_pcm_start_record(audio_pcm_sess_t *sess, unsigned frames,
+int audio_pcm_start_capture(audio_pcm_sess_t *sess, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
 {
@@ -228 +228 @@
         async_exch_t *exch = async_exchange_begin(sess);
         const int ret = async_req_4_0(exch,
-            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_START_RECORD,
+            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_START_CAPTURE,
             frames, sample_rate, packed);
         async_exchange_end(exch);
@@ -234 +234 @@
 }
 
-int audio_pcm_stop_record(audio_pcm_sess_t *sess)
+int audio_pcm_stop_capture(audio_pcm_sess_t *sess)
 {
         async_exch_t *exch = async_exchange_begin(sess);
         const int ret = async_req_1_0(exch,
-            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_STOP_RECORD);
+            DEV_IFACE_ID(AUDIO_PCM_BUFFER_IFACE), IPC_M_AUDIO_PCM_STOP_CAPTURE);
         async_exchange_end(exch);
         return ret;
@@ -253 +253 @@
 static void remote_audio_pcm_start_playback(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_audio_pcm_stop_playback(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_audio_pcm_start_record(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_audio_pcm_stop_record(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_audio_pcm_start_capture(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_audio_pcm_stop_capture(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** Remote audio pcm buffer interface operations. */
@@ -265 +265 @@
         [IPC_M_AUDIO_PCM_START_PLAYBACK] = remote_audio_pcm_start_playback,
         [IPC_M_AUDIO_PCM_STOP_PLAYBACK] = remote_audio_pcm_stop_playback,
-        [IPC_M_AUDIO_PCM_START_RECORD] = remote_audio_pcm_start_record,
-        [IPC_M_AUDIO_PCM_STOP_RECORD] = remote_audio_pcm_stop_record,
+        [IPC_M_AUDIO_PCM_START_CAPTURE] = remote_audio_pcm_start_capture,
+        [IPC_M_AUDIO_PCM_STOP_CAPTURE] = remote_audio_pcm_stop_capture,
 };
 
@@ -436 +436 @@
 }
 
-void remote_audio_pcm_start_record(ddf_fun_t *fun, void *iface,
+void remote_audio_pcm_start_capture(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -446 +446 @@
         const pcm_sample_format_t format = DEV_IPC_GET_ARG3(*call) & UINT16_MAX;
 
-        const int ret = pcm_iface->start_record
-            ? pcm_iface->start_record(fun, frames, channels, rate, format)
+        const int ret = pcm_iface->start_capture
+            ? pcm_iface->start_capture(fun, frames, channels, rate, format)
             : ENOTSUP;
         async_answer_0(callid, ret);
 }
 
-void remote_audio_pcm_stop_record(ddf_fun_t *fun, void *iface,
+void remote_audio_pcm_stop_capture(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
         const audio_pcm_iface_t *pcm_iface = iface;
 
-        const int ret = pcm_iface->stop_record ?
-            pcm_iface->stop_record(fun) : ENOTSUP;
+        const int ret = pcm_iface->stop_capture ?
+            pcm_iface->stop_capture(fun) : ENOTSUP;
         async_answer_0(callid, ret);
 }

uspace/lib/drv/include/audio_pcm_iface.h

@@ -45 +45 @@
 
 typedef enum {
-        AUDIO_CAP_RECORD,
+        AUDIO_CAP_CAPTURE,
         AUDIO_CAP_PLAYBACK,
         AUDIO_CAP_MAX_BUFFER,
@@ -56 +56 @@
 enum {
         PCM_EVENT_FRAMES_PLAYED = IPC_FIRST_USER_METHOD,
-        PCM_EVENT_FRAMES_RECORDED,
+        PCM_EVENT_FRAMES_CAPTURED,
         PCM_EVENT_PLAYBACK_TERMINATED,
-        PCM_EVENT_RECORDING_TERMINATED
+        PCM_EVENT_CAPTURE_TERMINATED
 };
 
@@ -80 +80 @@
 int audio_pcm_stop_playback(audio_pcm_sess_t *);
 
-int audio_pcm_start_record(audio_pcm_sess_t *, unsigned,
+int audio_pcm_start_capture(audio_pcm_sess_t *, unsigned,
     unsigned, unsigned, pcm_sample_format_t);
-int audio_pcm_stop_record(audio_pcm_sess_t *);
+int audio_pcm_stop_capture(audio_pcm_sess_t *);
 
 /** Audio pcm communication interface. */
@@ -96 +96 @@
             unsigned, unsigned, pcm_sample_format_t);
         int (*stop_playback)(ddf_fun_t *);
-        int (*start_record)(ddf_fun_t *, unsigned,
+        int (*start_capture)(ddf_fun_t *, unsigned,
             unsigned, unsigned, pcm_sample_format_t);
-        int (*stop_record)(ddf_fun_t *);
+        int (*stop_capture)(ddf_fun_t *);
 } audio_pcm_iface_t;