Revision 72cf2d4f audio/audio_int.h

b/audio/audio_int.h
80 80
    struct st_sample *mix_buf;
81 81

  
82 82
    int samples;
83
    LIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head;
84
    LIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head;
83
    QLIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head;
84
    QLIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head;
85 85
    struct audio_pcm_ops *pcm_ops;
86
    LIST_ENTRY (HWVoiceOut) entries;
86
    QLIST_ENTRY (HWVoiceOut) entries;
87 87
} HWVoiceOut;
88 88

  
89 89
typedef struct HWVoiceIn {
......
100 100
    struct st_sample *conv_buf;
101 101

  
102 102
    int samples;
103
    LIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head;
103
    QLIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head;
104 104
    struct audio_pcm_ops *pcm_ops;
105
    LIST_ENTRY (HWVoiceIn) entries;
105
    QLIST_ENTRY (HWVoiceIn) entries;
106 106
} HWVoiceIn;
107 107

  
108 108
struct SWVoiceOut {
......
119 119
    char *name;
120 120
    struct mixeng_volume vol;
121 121
    struct audio_callback callback;
122
    LIST_ENTRY (SWVoiceOut) entries;
122
    QLIST_ENTRY (SWVoiceOut) entries;
123 123
};
124 124

  
125 125
struct SWVoiceIn {
......
135 135
    char *name;
136 136
    struct mixeng_volume vol;
137 137
    struct audio_callback callback;
138
    LIST_ENTRY (SWVoiceIn) entries;
138
    QLIST_ENTRY (SWVoiceIn) entries;
139 139
};
140 140

  
141 141
struct audio_driver {
......
169 169
struct capture_callback {
170 170
    struct audio_capture_ops ops;
171 171
    void *opaque;
172
    LIST_ENTRY (capture_callback) entries;
172
    QLIST_ENTRY (capture_callback) entries;
173 173
};
174 174

  
175 175
struct CaptureVoiceOut {
176 176
    HWVoiceOut hw;
177 177
    void *buf;
178
    LIST_HEAD (cb_listhead, capture_callback) cb_head;
179
    LIST_ENTRY (CaptureVoiceOut) entries;
178
    QLIST_HEAD (cb_listhead, capture_callback) cb_head;
179
    QLIST_ENTRY (CaptureVoiceOut) entries;
180 180
};
181 181

  
182 182
struct SWVoiceCap {
183 183
    SWVoiceOut sw;
184 184
    CaptureVoiceOut *cap;
185
    LIST_ENTRY (SWVoiceCap) entries;
185
    QLIST_ENTRY (SWVoiceCap) entries;
186 186
};
187 187

  
188 188
struct AudioState {
......
190 190
    void *drv_opaque;
191 191

  
192 192
    QEMUTimer *ts;
193
    LIST_HEAD (card_listhead, QEMUSoundCard) card_head;
194
    LIST_HEAD (hw_in_listhead, HWVoiceIn) hw_head_in;
195
    LIST_HEAD (hw_out_listhead, HWVoiceOut) hw_head_out;
196
    LIST_HEAD (cap_listhead, CaptureVoiceOut) cap_head;
193
    QLIST_HEAD (card_listhead, QEMUSoundCard) card_head;
194
    QLIST_HEAD (hw_in_listhead, HWVoiceIn) hw_head_in;
195
    QLIST_HEAD (hw_out_listhead, HWVoiceOut) hw_head_out;
196
    QLIST_HEAD (cap_listhead, CaptureVoiceOut) cap_head;
197 197
    int nb_hw_voices_out;
198 198
    int nb_hw_voices_in;
199 199
    int vm_running;

Also available in: Unified diff