Hold settings into variable

Author: Cuda-Chen

virtio-snd.c

@@ -223,10 +223,21 @@ typedef struct {
     uint8_t positions[VIRTIO_SND_CHMAP_MAX_SIZE];
 } virtio_snd_chmap_info_t;
 
+/* virtio-snd to hold the settings of each stream */
+typedef struct {
+    virtio_snd_jack_info_t j;
+    virtio_snd_pcm_info_t p;
+    virtio_snd_chmap_info_t c;
+    virtio_snd_pcm_set_params_t pp;
+    struct CNFADriver *audio_host;
+    bool is_guest_playing;
+} virtio_snd_prop_t;
+
 static virtio_snd_config_t vsnd_configs[VSND_DEV_CNT_MAX];
+static virtio_snd_prop_t vsnd_props[VSND_DEV_CNT_MAX];
 static int vsnd_dev_cnt = 0;
 
-static struct CNFADriver *audio_host = NULL;
+//static struct CNFADriver *audio_host = NULL;
 
 static bool guest_playing = false;
 
@@ -271,20 +282,29 @@ static void virtio_snd_read_jack_info_handler(
     virtio_snd_jack_info_t *info,
     const virtio_snd_query_info_t *query)
 {
+    printf("jack info handler count %d\n", query->count);
     for (uint32_t i = 0; i < query->count; i++) {
         info[i].hdr.hda_fn_nid = 0;
         info[i].features = 0;
         info[i].hda_reg_defconf = 0;
         info[i].hda_reg_caps = 0;
         info[i].connected = 1;
         memset(&info[i].padding, 0, sizeof(info[i].padding));
+
+        vsnd_props[i].j.hdr.hda_fn_nid = 0;
+        vsnd_props[i].j.features = 0;
+        vsnd_props[i].j.hda_reg_defconf = 0;
+        vsnd_props[i].j.hda_reg_caps = 0;
+        vsnd_props[i].j.connected = 1;
+        memset(&vsnd_props[i].j.padding, 0, sizeof(vsnd_props[i].j.padding));
     }
 }
 
 static void virtio_snd_read_pcm_info_handler(
     virtio_snd_pcm_info_t *info,
     const virtio_snd_query_info_t *query)
 {
+    printf("snd info handler count %d\n", query->count);
     for (uint32_t i = 0; i < query->count; i++) {
         info[i].hdr.hda_fn_nid = 0;
         info[i].features = 0;
@@ -294,18 +314,33 @@ static void virtio_snd_read_pcm_info_handler(
         info[i].channels_min = 1;
         info[i].channels_max = 1;
         memset(&info[i].padding, 0, sizeof(info[i].padding));
+
+        vsnd_props[i].p.hdr.hda_fn_nid = 0;
+        vsnd_props[i].p.features = 0;
+        vsnd_props[i].p.formats = (1 << VIRTIO_SND_PCM_FMT_S16);
+        vsnd_props[i].p.rates = (1 << VIRTIO_SND_PCM_RATE_44100);
+        vsnd_props[i].p.direction = VIRTIO_SND_D_OUTPUT;
+        vsnd_props[i].p.channels_min = 1;
+        vsnd_props[i].p.channels_max = 1;
+        memset(&vsnd_props[i].p.padding, 0, sizeof(vsnd_props[i].p.padding));
     }
 }
 
 static void virtio_snd_read_chmap_info_handler(
     virtio_snd_chmap_info_t *info,
     const virtio_snd_query_info_t *query)
 {
+    printf("chmap info handler count %d\n", query->count);
     for (uint32_t i = 0; i < query->count; i++) {
         info[i].hdr.hda_fn_nid = 0;
         info[i].direction = VIRTIO_SND_D_OUTPUT;
         info[i].channels = 1;
         info[i].positions[0] = VIRTIO_SND_CHMAP_MONO;
+
+        vsnd_props[i].c.hdr.hda_fn_nid = 0;
+        vsnd_props[i].c.direction = VIRTIO_SND_D_OUTPUT;
+        vsnd_props[i].c.channels = 1;
+        vsnd_props[i].c.positions[0] = VIRTIO_SND_CHMAP_MONO;
     }
 }
 
@@ -734,12 +769,12 @@ bool virtio_snd_init(virtio_snd_state_t *vsnd)
     /* Allocate the memory of private member. */
     vsnd->priv = &vsnd_configs[vsnd_dev_cnt++];
 
-    audio_host = CNFAInit(NULL, "semu-virtio-snd", virtio_snd_cb, 44100, 0, 1,
+    /*audio_host = CNFAInit(NULL, "semu-virtio-snd", virtio_snd_cb, 44100, 0, 1,
                           0, 1024, NULL, NULL, &guest_playing);
     if (!audio_host) {
         fprintf(stderr, "virtio-snd driver initialization failed.\n");
         return false;
-    }
+    }*/
 
     PRIV(vsnd)->jacks = 1;
     PRIV(vsnd)->streams = 1;