Changeset d86c9736 in mainline for uspace/drv/audio

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/drv/audio/sb16

Files:

• dsp.c (modified) (6 diffs)
• dsp.h (modified) (2 diffs)
• pcm_iface.c (modified) (3 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -215 +215 @@
         }
 
-        if (dsp->status == DSP_RECORDING) {
+        if (dsp->status == DSP_CAPTURE) {
                 sb_dsp_start_active(dsp, SINGLE_DMA_16B_AD);
         }
@@ -232 +232 @@
                             PCM_EVENT_FRAMES_PLAYED, dsp->active.frame_count);
                         break;
-                case DSP_RECORDING:
+                case DSP_CAPTURE:
                         async_msg_1(dsp->event_exchange,
-                            PCM_EVENT_FRAMES_RECORDED, dsp->active.frame_count);
+                            PCM_EVENT_FRAMES_CAPTURED, dsp->active.frame_count);
                         break;
                 default:
@@ -251 +251 @@
 {
         switch(cap) {
-        case AUDIO_CAP_RECORD:
+        case AUDIO_CAP_CAPTURE:
         case AUDIO_CAP_PLAYBACK:
         case AUDIO_CAP_INTERRUPT:
@@ -393 +393 @@
 }
 
-int sb_dsp_start_record(sb_dsp_t *dsp, unsigned frames,
+int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
@@ -401 +401 @@
 
         /* Check supported parameters */
-        ddf_log_debug("Requested record: %u frames, %uHz, %s, %u channel(s).",
+        ddf_log_debug("Requested capture: %u frames, %uHz, %s, %u channel(s).",
             frames, sampling_rate, pcm_sample_format_str(format), channels);
         if (sb_dsp_test_format(dsp, &channels, &sampling_rate, &format) != EOK)
@@ -433 +433 @@
             "(~1/%u sec)", dsp->active.samples,
             sampling_rate / (dsp->active.samples * channels));
-        dsp->status = DSP_RECORDING;
-
-        return EOK;
-}
-
-int sb_dsp_stop_record(sb_dsp_t *dsp)
+        dsp->status = DSP_CAPTURE;
+
+        return EOK;
+}
+
+int sb_dsp_stop_capture(sb_dsp_t *dsp)
 {
         assert(dsp);
         sb_dsp_write(dsp, DMA_16B_EXIT);
-        ddf_log_debug("Stopped recording");
-        async_msg_0(dsp->event_exchange, PCM_EVENT_RECORDING_TERMINATED);
+        ddf_log_debug("Stopped capture");
+        async_msg_0(dsp->event_exchange, PCM_EVENT_CAPTURE_TERMINATED);
         async_exchange_end(dsp->event_exchange);
         dsp->event_exchange = NULL;

uspace/drv/audio/sb16/dsp.h

@@ -63 +63 @@
         enum {
                 DSP_PLAYBACK,
-                DSP_RECORDING,
+                DSP_CAPTURE,
                 DSP_STOPPED,
         } status;
@@ -83 +83 @@
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format);
 int sb_dsp_stop_playback(sb_dsp_t *dsp);
-int sb_dsp_start_record(sb_dsp_t *dsp, unsigned frames,
+int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format);
-int sb_dsp_stop_record(sb_dsp_t *dsp);
+int sb_dsp_stop_capture(sb_dsp_t *dsp);
 
 #endif

uspace/drv/audio/sb16/pcm_iface.c

@@ -104 +104 @@
 }
 
-static int sb_start_record(ddf_fun_t *fun, unsigned frames,
+static int sb_start_capture(ddf_fun_t *fun, unsigned frames,
     unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
 {
@@ -110 +110 @@
         assert(fun->driver_data);
         sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_start_record(
+        return sb_dsp_start_capture(
             dsp, frames, channels, sample_rate, format);
 }
 
-static int sb_stop_record(ddf_fun_t *fun)
+static int sb_stop_capture(ddf_fun_t *fun)
 {
         assert(fun);
         assert(fun->driver_data);
         sb_dsp_t *dsp = fun->driver_data;
-        return sb_dsp_stop_record(dsp);
+        return sb_dsp_stop_capture(dsp);
 }
 
@@ -134 +134 @@
         .stop_playback = sb_stop_playback,
 
-        .start_record = sb_start_record,
-        .stop_record = sb_stop_record
+        .start_capture = sb_start_capture,
+        .stop_capture = sb_stop_capture,
 };
 /**