update

Author: Cuda-Chen

Diff for: virtio-snd.c

@@ -321,12 +321,12 @@ typedef int (*vsnd_virtq_cb)(virtio_snd_state_t *,       /* vsnd state */
                              uint32_t * /* response length */);
 
 /* Forward declaration */
-static int virtio_snd_pa_cb(const void *input,
-                            void *output,
-                            unsigned long frameCount,
-                            const PaStreamCallbackTimeInfo *timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData);
+static int virtio_snd_stream_cb(const void *input,
+                                void *output,
+                                unsigned long frame_cnt,
+                                const PaStreamCallbackTimeInfo *time_info,
+                                PaStreamCallbackFlags status_flags,
+                                void *user_data);
 static void virtio_queue_notify_handler(virtio_snd_state_t *vsnd,
                                         int index, /* virtq index */
                                         vsnd_virtq_cb cb);
@@ -625,15 +625,16 @@ static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
     INIT_LIST_HEAD(&props->buf_queue_head);
     props->intermediate =
         (void *) malloc(sizeof(*props->intermediate) * cnfa_period_bytes);
-    PaStreamParameters params;
-    params.device = Pa_GetDefaultOutputDevice();
-    params.channelCount = props->pp.channels;
-    params.sampleFormat = paInt16;
-    params.suggestedLatency = 0.1; /* 100 ms */
-    params.hostApiSpecificStreamInfo = NULL;
+    PaStreamParameters params = {
+        .device = Pa_GetDefaultOutputDevice(),
+        .channelCount = props->pp.channels,
+        .sampleFormat = paInt16,
+        .suggestedLatency = 0.1, /* 100 ms */
+        .hostApiSpecificStreamInfo = NULL,
+    };
     PaError err = Pa_OpenStream(&props->pa_stream, NULL, /* no input */
                                 &params, rate, cnfa_period_frames, paClipOff,
-                                virtio_snd_pa_cb, &props->v);
+                                virtio_snd_stream_cb, &props->v);
     if (err != paNoError) {
         fprintf(stderr, "Cannot create PortAudio\n");
         printf("PortAudio error: %s\n", Pa_GetErrorText(err));
@@ -790,17 +791,17 @@ static void __virtio_snd_frame_dequeue(void *out,
     pthread_mutex_unlock(&props->lock.lock);
 }
 
-static int virtio_snd_pa_cb(const void *input,
-                            void *output,
-                            unsigned long frameCount,
-                            const PaStreamCallbackTimeInfo *timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData)
+static int virtio_snd_stream_cb(const void *input,
+                                void *output,
+                                unsigned long frame_cnt,
+                                const PaStreamCallbackTimeInfo *time_info,
+                                PaStreamCallbackFlags status_flags,
+                                void *user_data)
 {
-    vsnd_stream_sel_t *v_ptr = (vsnd_stream_sel_t *) userData;
+    vsnd_stream_sel_t *v_ptr = (vsnd_stream_sel_t *) user_data;
     uint32_t id = v_ptr->stream_id;
     int channels = vsnd_props[id].pp.channels;
-    uint32_t out_buf_sz = frameCount * channels;
+    uint32_t out_buf_sz = frame_cnt * channels;
     uint32_t out_buf_bytes = out_buf_sz * VSND_CNFA_FRAME_SZ;
     __virtio_snd_frame_dequeue(output, out_buf_bytes, id);