@samitouri / QOSamiQemu / commits / c70d79776b

audio: AUD_ -> audio_be_

Use the associate AudioBackend prefix for readability. Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Marc-André Lureau committed Nov 10, 2025 at 14:43 UTC c70d79776b64c00bd2ed24c60dfa0d98749ba1b4
22 files changed +281 -279
audio/audio-be.c
+16 -16
@@ -5,7 +5,7 @@
5 #include "qemu/audio-capture.h"
6 #include "qapi/error.h"
7
8 -bool AUD_backend_check(AudioBackend **be, Error **errp)
8 +bool audio_be_check(AudioBackend **be, Error **errp)
9 {
10 assert(be != NULL);
11
@@ -19,7 +19,7 @@ bool AUD_backend_check(AudioBackend **be, Error **errp)
19 return true;
20 }
21
22 -SWVoiceIn *AUD_open_in(
22 +SWVoiceIn *audio_be_open_in(
23 AudioBackend *be,
24 SWVoiceIn *sw,
25 const char *name,
@@ -32,7 +32,7 @@ SWVoiceIn *AUD_open_in(
32 return klass->open_in(be, sw, name, callback_opaque, callback_fn, as);
33 }
34
35 -SWVoiceOut *AUD_open_out(
35 +SWVoiceOut *audio_be_open_out(
36 AudioBackend *be,
37 SWVoiceOut *sw,
38 const char *name,
@@ -45,84 +45,84 @@ SWVoiceOut *AUD_open_out(
45 return klass->open_out(be, sw, name, callback_opaque, callback_fn, as);
46 }
47
48 -void AUD_close_out(AudioBackend *be, SWVoiceOut *sw)
48 +void audio_be_close_out(AudioBackend *be, SWVoiceOut *sw)
49 {
50 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
51
52 return klass->close_out(be, sw);
53 }
54
55 -void AUD_close_in(AudioBackend *be, SWVoiceIn *sw)
55 +void audio_be_close_in(AudioBackend *be, SWVoiceIn *sw)
56 {
57 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
58
59 return klass->close_in(be, sw);
60 }
61
62 -bool AUD_is_active_out(AudioBackend *be, SWVoiceOut *sw)
62 +bool audio_be_is_active_out(AudioBackend *be, SWVoiceOut *sw)
63 {
64 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
65
66 return klass->is_active_out(be, sw);
67 }
68
69 -bool AUD_is_active_in(AudioBackend *be, SWVoiceIn *sw)
69 +bool audio_be_is_active_in(AudioBackend *be, SWVoiceIn *sw)
70 {
71 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
72
73 return klass->is_active_in(be, sw);
74 }
75
76 -size_t AUD_write(AudioBackend *be, SWVoiceOut *sw, void *buf, size_t size)
76 +size_t audio_be_write(AudioBackend *be, SWVoiceOut *sw, void *buf, size_t size)
77 {
78 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
79
80 return klass->write(be, sw, buf, size);
81 }
82
83 -size_t AUD_read(AudioBackend *be, SWVoiceIn *sw, void *buf, size_t size)
83 +size_t audio_be_read(AudioBackend *be, SWVoiceIn *sw, void *buf, size_t size)
84 {
85 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
86
87 return klass->read(be, sw, buf, size);
88 }
89
90 -int AUD_get_buffer_size_out(AudioBackend *be, SWVoiceOut *sw)
90 +int audio_be_get_buffer_size_out(AudioBackend *be, SWVoiceOut *sw)
91 {
92 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
93
94 return klass->get_buffer_size_out(be, sw);
95 }
96
97 -void AUD_set_active_out(AudioBackend *be, SWVoiceOut *sw, bool on)
97 +void audio_be_set_active_out(AudioBackend *be, SWVoiceOut *sw, bool on)
98 {
99 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
100
101 return klass->set_active_out(be, sw, on);
102 }
103
104 -void AUD_set_active_in(AudioBackend *be, SWVoiceIn *sw, bool on)
104 +void audio_be_set_active_in(AudioBackend *be, SWVoiceIn *sw, bool on)
105 {
106 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
107
108 return klass->set_active_in(be, sw, on);
109 }
110
111 -void AUD_set_volume_out(AudioBackend *be, SWVoiceOut *sw, Volume *vol)
111 +void audio_be_set_volume_out(AudioBackend *be, SWVoiceOut *sw, Volume *vol)
112 {
113 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
114
115 klass->set_volume_out(be, sw, vol);
116 }
117
118 -void AUD_set_volume_in(AudioBackend *be, SWVoiceIn *sw, Volume *vol)
118 +void audio_be_set_volume_in(AudioBackend *be, SWVoiceIn *sw, Volume *vol)
119 {
120 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
121
122 klass->set_volume_in(be, sw, vol);
123 }
124
125 -CaptureVoiceOut *AUD_add_capture(
125 +CaptureVoiceOut *audio_be_add_capture(
126 AudioBackend *be,
127 struct audsettings *as,
128 struct audio_capture_ops *ops,
@@ -133,7 +133,7 @@ CaptureVoiceOut *AUD_add_capture(
133 return klass->add_capture(be, as, ops, cb_opaque);
134 }
135
136 -void AUD_del_capture(AudioBackend *be, CaptureVoiceOut *cap, void *cb_opaque)
136 +void audio_be_del_capture(AudioBackend *be, CaptureVoiceOut *cap, void *cb_opaque)
137 {
138 AudioBackendClass *klass = AUDIO_BACKEND_GET_CLASS(be);
139
audio/audio_template.h
+2 -2
@@ -527,7 +527,7 @@ static SW *glue(audio_mixeng_backend_open_, TYPE) (
527 }
528
529 if (!pdo->fixed_settings && sw) {
530 - glue(AUD_close_, TYPE)(be, sw);
530 + glue(audio_be_close_, TYPE)(be, sw);
531 sw = NULL;
532 }
533
@@ -564,7 +564,7 @@ static SW *glue(audio_mixeng_backend_open_, TYPE) (
564 return sw;
565
566 fail:
567 - glue(AUD_close_, TYPE)(be, sw);
567 + glue(audio_be_close_, TYPE)(be, sw);
568 return NULL;
569 }
570
audio/wavcapture.c
+2 -2
@@ -86,7 +86,7 @@ static void wav_capture_destroy (void *opaque)
86 {
87 WAVState *wav = opaque;
88
89 - AUD_del_capture(wav->audio_be, wav->cap, wav);
89 + audio_be_del_capture(wav->audio_be, wav->cap, wav);
90 g_free (wav);
91 }
92
@@ -172,7 +172,7 @@ int wav_start_capture(AudioBackend *state, CaptureState *s, const char *path,
172 goto error_free;
173 }
174
175 - cap = AUD_add_capture(wav->audio_be, &as, &ops, wav);
175 + cap = audio_be_add_capture(wav->audio_be, &as, &ops, wav);
176 if (!cap) {
177 error_report("Failed to add audio capture");
178 goto error_free;
hw/audio/ac97.c
+21 -21
@@ -246,15 +246,15 @@ static void voice_set_active(AC97LinkState *s, int bm_index, int on)
246 {
247 switch (bm_index) {
248 case PI_INDEX:
249 - AUD_set_active_in(s->audio_be, s->voice_pi, on);
249 + audio_be_set_active_in(s->audio_be, s->voice_pi, on);
250 break;
251
252 case PO_INDEX:
253 - AUD_set_active_out(s->audio_be, s->voice_po, on);
253 + audio_be_set_active_out(s->audio_be, s->voice_po, on);
254 break;
255
256 case MC_INDEX:
257 - AUD_set_active_in(s->audio_be, s->voice_mc, on);
257 + audio_be_set_active_in(s->audio_be, s->voice_mc, on);
258 break;
259
260 default:
@@ -319,7 +319,7 @@ static void open_voice(AC97LinkState *s, int index, int freq)
319 s->invalid_freq[index] = 0;
320 switch (index) {
321 case PI_INDEX:
322 - s->voice_pi = AUD_open_in(
322 + s->voice_pi = audio_be_open_in(
323 s->audio_be,
324 s->voice_pi,
325 "ac97.pi",
@@ -330,7 +330,7 @@ static void open_voice(AC97LinkState *s, int index, int freq)
330 break;
331
332 case PO_INDEX:
333 - s->voice_po = AUD_open_out(
333 + s->voice_po = audio_be_open_out(
334 s->audio_be,
335 s->voice_po,
336 "ac97.po",
@@ -341,7 +341,7 @@ static void open_voice(AC97LinkState *s, int index, int freq)
341 break;
342
343 case MC_INDEX:
344 - s->voice_mc = AUD_open_in(
344 + s->voice_mc = audio_be_open_in(
345 s->audio_be,
346 s->voice_mc,
347 "ac97.mc",
@@ -355,17 +355,17 @@ static void open_voice(AC97LinkState *s, int index, int freq)
355 s->invalid_freq[index] = freq;
356 switch (index) {
357 case PI_INDEX:
358 - AUD_close_in(s->audio_be, s->voice_pi);
358 + audio_be_close_in(s->audio_be, s->voice_pi);
359 s->voice_pi = NULL;
360 break;
361
362 case PO_INDEX:
363 - AUD_close_out(s->audio_be, s->voice_po);
363 + audio_be_close_out(s->audio_be, s->voice_po);
364 s->voice_po = NULL;
365 break;
366
367 case MC_INDEX:
368 - AUD_close_in(s->audio_be, s->voice_mc);
368 + audio_be_close_in(s->audio_be, s->voice_mc);
369 s->voice_mc = NULL;
370 break;
371 }
@@ -378,15 +378,15 @@ static void reset_voices(AC97LinkState *s, uint8_t active[LAST_INDEX])
378
379 freq = mixer_load(s, AC97_PCM_LR_ADC_Rate);
380 open_voice(s, PI_INDEX, freq);
381 - AUD_set_active_in(s->audio_be, s->voice_pi, active[PI_INDEX]);
381 + audio_be_set_active_in(s->audio_be, s->voice_pi, active[PI_INDEX]);
382
383 freq = mixer_load(s, AC97_PCM_Front_DAC_Rate);
384 open_voice(s, PO_INDEX, freq);
385 - AUD_set_active_out(s->audio_be, s->voice_po, active[PO_INDEX]);
385 + audio_be_set_active_out(s->audio_be, s->voice_po, active[PO_INDEX]);
386
387 freq = mixer_load(s, AC97_MIC_ADC_Rate);
388 open_voice(s, MC_INDEX, freq);
389 - AUD_set_active_in(s->audio_be, s->voice_mc, active[MC_INDEX]);
389 + audio_be_set_active_in(s->audio_be, s->voice_mc, active[MC_INDEX]);
390 }
391
392 static void get_volume(uint16_t vol, uint16_t mask, int inverse,
@@ -416,7 +416,7 @@ static void update_combined_volume_out(AC97LinkState *s)
416 lvol = (lvol * plvol) / 255;
417 rvol = (rvol * prvol) / 255;
418
419 - AUD_set_volume_out_lr(s->audio_be, s->voice_po, mute, lvol, rvol);
419 + audio_be_set_volume_out_lr(s->audio_be, s->voice_po, mute, lvol, rvol);
420 }
421
422 static void update_volume_in(AC97LinkState *s)
@@ -427,7 +427,7 @@ static void update_volume_in(AC97LinkState *s)
427 get_volume(mixer_load(s, AC97_Record_Gain_Mute), 0x0f, 0,
428 &mute, &lvol, &rvol);
429
430 - AUD_set_volume_in_lr(s->audio_be, s->voice_pi, mute, lvol, rvol);
430 + audio_be_set_volume_in_lr(s->audio_be, s->voice_pi, mute, lvol, rvol);
431 }
432
433 static void set_volume(AC97LinkState *s, int index, uint32_t val)
@@ -904,7 +904,7 @@ static int write_audio(AC97LinkState *s, AC97BusMasterRegs *r,
904 int copied;
905 to_copy = MIN(temp, sizeof(tmpbuf));
906 pci_dma_read(&s->dev, addr, tmpbuf, to_copy);
907 - copied = AUD_write(s->audio_be, s->voice_po, tmpbuf, to_copy);
907 + copied = audio_be_write(s->audio_be, s->voice_po, tmpbuf, to_copy);
908 dolog("write_audio max=%x to_copy=%x copied=%x",
909 max, to_copy, copied);
910 if (!copied) {
@@ -948,7 +948,7 @@ static void write_bup(AC97LinkState *s, int elapsed)
948 while (elapsed) {
949 int temp = MIN(elapsed, sizeof(s->silence));
950 while (temp) {
951 - int copied = AUD_write(s->audio_be, s->voice_po, s->silence, temp);
951 + int copied = audio_be_write(s->audio_be, s->voice_po, s->silence, temp);
952 if (!copied) {
953 return;
954 }
@@ -978,7 +978,7 @@ static int read_audio(AC97LinkState *s, AC97BusMasterRegs *r,
978 while (temp) {
979 int acquired;
980 to_copy = MIN(temp, sizeof(tmpbuf));
981 - acquired = AUD_read(s->audio_be, voice, tmpbuf, to_copy);
981 + acquired = audio_be_read(s->audio_be, voice, tmpbuf, to_copy);
982 if (!acquired) {
983 *stop = 1;
984 break;
@@ -1275,7 +1275,7 @@ static void ac97_realize(PCIDevice *dev, Error **errp)
1275 AC97LinkState *s = AC97(dev);
1276 uint8_t *c = s->dev.config;
1277
1278 - if (!AUD_backend_check(&s->audio_be, errp)) {
1278 + if (!audio_be_check(&s->audio_be, errp)) {
1279 return;
1280 }
1281
@@ -1301,9 +1301,9 @@ static void ac97_exit(PCIDevice *dev)
1301 {
1302 AC97LinkState *s = AC97(dev);
1303
1304 - AUD_close_in(s->audio_be, s->voice_pi);
1305 - AUD_close_out(s->audio_be, s->voice_po);
1306 - AUD_close_in(s->audio_be, s->voice_mc);
1304 + audio_be_close_in(s->audio_be, s->voice_pi);
1305 + audio_be_close_out(s->audio_be, s->voice_po);
1306 + audio_be_close_in(s->audio_be, s->voice_mc);
1307 }
1308
1309 static const Property ac97_properties[] = {
hw/audio/adlib.c
+5 -5
@@ -95,7 +95,7 @@ static void adlib_write(void *opaque, uint32_t nport, uint32_t val)
95 int a = nport & 3;
96
97 s->active = 1;
98 - AUD_set_active_out(s->audio_be, s->voice, 1);
98 + audio_be_set_active_out(s->audio_be, s->voice, 1);
99
100 adlib_kill_timers (s);
101
@@ -143,7 +143,7 @@ static int write_audio (AdlibState *s, int samples)
143 int nbytes, wbytes, wsampl;
144
145 nbytes = samples << SHIFT;
146 - wbytes = AUD_write(
146 + wbytes = audio_be_write(
147 s->audio_be,
148 s->voice,
149 s->mixbuf + (pos << (SHIFT - 1)),
@@ -237,7 +237,7 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
237 AdlibState *s = ADLIB(dev);
238 struct audsettings as;
239
240 - if (!AUD_backend_check(&s->audio_be, errp)) {
240 + if (!audio_be_check(&s->audio_be, errp)) {
241 return;
242 }
243
@@ -256,7 +256,7 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
256 as.fmt = AUDIO_FORMAT_S16;
257 as.endianness = HOST_BIG_ENDIAN;
258
259 - s->voice = AUD_open_out(
259 + s->voice = audio_be_open_out(
260 s->audio_be,
261 s->voice,
262 "adlib",
@@ -270,7 +270,7 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
270 return;
271 }
272
273 - s->samples = AUD_get_buffer_size_out(s->audio_be, s->voice) >> SHIFT;
273 + s->samples = audio_be_get_buffer_size_out(s->audio_be, s->voice) >> SHIFT;
274 s->mixbuf = g_malloc0 (s->samples << SHIFT);
275
276 adlib_portio_list[0].offset = s->port;
hw/audio/asc.c
+10 -10
@@ -355,12 +355,12 @@ static void asc_out_cb(void *opaque, int free_b)
355 * loop because the FIFO has run out of data, and the driver
356 * reuses the stale content in its circular audio buffer.
357 */
358 - AUD_write(s->audio_be, s->voice, s->silentbuf, samples << s->shift);
358 + audio_be_write(s->audio_be, s->voice, s->silentbuf, samples << s->shift);
359 }
360 return;
361 }
362
363 - AUD_write(s->audio_be, s->voice, s->mixbuf, generated << s->shift);
363 + audio_be_write(s->audio_be, s->voice, s->mixbuf, generated << s->shift);
364 }
365
366 static uint64_t asc_fifo_read(void *opaque, hwaddr addr,
@@ -470,9 +470,9 @@ static void asc_write(void *opaque, hwaddr addr, uint64_t value,
470 asc_fifo_reset(&s->fifos[1]);
471 asc_lower_irq(s);
472 if (value != 0) {
473 - AUD_set_active_out(s->audio_be, s->voice, 1);
473 + audio_be_set_active_out(s->audio_be, s->voice, 1);
474 } else {
475 - AUD_set_active_out(s->audio_be, s->voice, 0);
475 + audio_be_set_active_out(s->audio_be, s->voice, 0);
476 }
477 }
478 break;
@@ -489,7 +489,7 @@ static void asc_write(void *opaque, hwaddr addr, uint64_t value,
489 {
490 int vol = (value & 0xe0);
491
492 - AUD_set_volume_out_lr(s->audio_be, s->voice, 0, vol, vol);
492 + audio_be_set_volume_out_lr(s->audio_be, s->voice, 0, vol, vol);
493 break;
494 }
495 }
@@ -545,7 +545,7 @@ static int asc_post_load(void *opaque, int version)
545 ASCState *s = ASC(opaque);
546
547 if (s->regs[ASC_MODE] != 0) {
548 - AUD_set_active_out(s->audio_be, s->voice, 1);
548 + audio_be_set_active_out(s->audio_be, s->voice, 1);
549 }
550
551 return 0;
@@ -614,7 +614,7 @@ static void asc_reset_hold(Object *obj, ResetType type)
614 {
615 ASCState *s = ASC(obj);
616
617 - AUD_set_active_out(s->audio_be, s->voice, 0);
617 + audio_be_set_active_out(s->audio_be, s->voice, 0);
618
619 memset(s->regs, 0, sizeof(s->regs));
620 asc_fifo_reset(&s->fifos[0]);
@@ -641,7 +641,7 @@ static void asc_realize(DeviceState *dev, Error **errp)
641 ASCState *s = ASC(dev);
642 struct audsettings as;
643
644 - if (!AUD_backend_check(&s->audio_be, errp)) {
644 + if (!audio_be_check(&s->audio_be, errp)) {
645 return;
646 }
647
@@ -650,7 +650,7 @@ static void asc_realize(DeviceState *dev, Error **errp)
650 as.fmt = AUDIO_FORMAT_U8;
651 as.endianness = HOST_BIG_ENDIAN;
652
653 - s->voice = AUD_open_out(s->audio_be, s->voice, "asc.out", s, asc_out_cb,
653 + s->voice = audio_be_open_out(s->audio_be, s->voice, "asc.out", s, asc_out_cb,
654 &as);
655 if (!s->voice) {
656 error_setg(errp, "Initializing audio stream failed");
@@ -658,7 +658,7 @@ static void asc_realize(DeviceState *dev, Error **errp)
658 }
659
660 s->shift = 1;
661 - s->samples = AUD_get_buffer_size_out(s->audio_be, s->voice) >> s->shift;
661 + s->samples = audio_be_get_buffer_size_out(s->audio_be, s->voice) >> s->shift;
662 s->mixbuf = g_malloc0(s->samples << s->shift);
663
664 s->silentbuf = g_malloc(s->samples << s->shift);
hw/audio/cs4231a.c
+9 -9
@@ -327,7 +327,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
327 goto error;
328 }
329
330 - s->voice = AUD_open_out(
330 + s->voice = audio_be_open_out(
331 s->audio_be,
332 s->voice,
333 "cs4231a",
@@ -339,7 +339,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
339 if (s->dregs[Interface_Configuration] & PEN) {
340 if (!s->dma_running) {
341 k->hold_DREQ(s->isa_dma, s->dma);
342 - AUD_set_active_out(s->audio_be, s->voice, 1);
342 + audio_be_set_active_out(s->audio_be, s->voice, 1);
343 s->transferred = 0;
344 }
345 s->dma_running = 1;
@@ -347,7 +347,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
347 else {
348 if (s->dma_running) {
349 k->release_DREQ(s->isa_dma, s->dma);
350 - AUD_set_active_out(s->audio_be, s->voice, 0);
350 + audio_be_set_active_out(s->audio_be, s->voice, 0);
351 }
352 s->dma_running = 0;
353 }
@@ -356,7 +356,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
356 error:
357 if (s->dma_running) {
358 k->release_DREQ(s->isa_dma, s->dma);
359 - AUD_set_active_out(s->audio_be, s->voice, 0);
359 + audio_be_set_active_out(s->audio_be, s->voice, 0);
360 }
361 }
362
@@ -465,7 +465,7 @@ static void cs_write (void *opaque, hwaddr addr,
465 if (s->dma_running) {
466 IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
467 k->release_DREQ(s->isa_dma, s->dma);
468 - AUD_set_active_out(s->audio_be, s->voice, 0);
468 + audio_be_set_active_out(s->audio_be, s->voice, 0);
469 s->dma_running = 0;
470 }
471 }
@@ -551,11 +551,11 @@ static int cs_write_audio (CSState *s, int nchan, int dma_pos,
551
552 for (i = 0; i < copied; ++i)
553 linbuf[i] = s->tab[tmpbuf[i]];
554 - copied = AUD_write(s->audio_be, s->voice, linbuf, copied << 1);
554 + copied = audio_be_write(s->audio_be, s->voice, linbuf, copied << 1);
555 copied >>= 1;
556 }
557 else {
558 - copied = AUD_write(s->audio_be, s->voice, tmpbuf, copied);
558 + copied = audio_be_write(s->audio_be, s->voice, tmpbuf, copied);
559 }
560
561 temp -= copied;
@@ -614,7 +614,7 @@ static int cs4231a_pre_load (void *opaque)
614 if (s->dma_running) {
615 IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
616 k->release_DREQ(s->isa_dma, s->dma);
617 - AUD_set_active_out(s->audio_be, s->voice, 0);
617 + audio_be_set_active_out(s->audio_be, s->voice, 0);
618 }
619 s->dma_running = 0;
620 return 0;
@@ -678,7 +678,7 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp)
678 return;
679 }
680
681 - if (!AUD_backend_check(&s->audio_be, errp)) {
681 + if (!audio_be_check(&s->audio_be, errp)) {
682 return;
683 }
684
hw/audio/es1370.c
+13 -13
@@ -330,10 +330,10 @@ static void es1370_reset (ES1370State *s)
330 d->scount = 0;
331 d->leftover = 0;
332 if (i == ADC_CHANNEL) {
333 - AUD_close_in(s->audio_be, s->adc_voice);
333 + audio_be_close_in(s->audio_be, s->adc_voice);
334 s->adc_voice = NULL;
335 } else {
336 - AUD_close_out(s->audio_be, s->dac_voice[i]);
336 + audio_be_close_out(s->audio_be, s->dac_voice[i]);
337 s->dac_voice[i] = NULL;
338 }
339 }
@@ -411,7 +411,7 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl)
411
412 if (i == ADC_CHANNEL) {
413 s->adc_voice =
414 - AUD_open_in(
414 + audio_be_open_in(
415 s->audio_be,
416 s->adc_voice,
417 "es1370.adc",
@@ -421,7 +421,7 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl)
421 );
422 } else {
423 s->dac_voice[i] =
424 - AUD_open_out(
424 + audio_be_open_out(
425 s->audio_be,
426 s->dac_voice[i],
427 i ? "es1370.dac2" : "es1370.dac1",
@@ -438,9 +438,9 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl)
438 int on = (ctl & b->ctl_en) && !(sctl & b->sctl_pause);
439
440 if (i == ADC_CHANNEL) {
441 - AUD_set_active_in(s->audio_be, s->adc_voice, on);
441 + audio_be_set_active_in(s->audio_be, s->adc_voice, on);
442 } else {
443 - AUD_set_active_out(s->audio_be, s->dac_voice[i], on);
443 + audio_be_set_active_out(s->audio_be, s->dac_voice[i], on);
444 }
445 }
446 }
@@ -627,7 +627,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
627 int acquired, to_copy;
628
629 to_copy = MIN(to_transfer, sizeof(tmpbuf));
630 - acquired = AUD_read(s->audio_be, s->adc_voice, tmpbuf, to_copy);
630 + acquired = audio_be_read(s->audio_be, s->adc_voice, tmpbuf, to_copy);
631 if (!acquired) {
632 break;
633 }
@@ -646,7 +646,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
646
647 to_copy = MIN(to_transfer, sizeof(tmpbuf));
648 pci_dma_read (&s->dev, addr, tmpbuf, to_copy);
649 - copied = AUD_write(s->audio_be, voice, tmpbuf, to_copy);
649 + copied = audio_be_write(s->audio_be, voice, tmpbuf, to_copy);
650 if (!copied) {
651 break;
652 }
@@ -784,12 +784,12 @@ static int es1370_post_load (void *opaque, int version_id)
784 for (i = 0; i < NB_CHANNELS; ++i) {
785 if (i == ADC_CHANNEL) {
786 if (s->adc_voice) {
787 - AUD_close_in(s->audio_be, s->adc_voice);
787 + audio_be_close_in(s->audio_be, s->adc_voice);
788 s->adc_voice = NULL;
789 }
790 } else {
791 if (s->dac_voice[i]) {
792 - AUD_close_out(s->audio_be, s->dac_voice[i]);
792 + audio_be_close_out(s->audio_be, s->dac_voice[i]);
793 s->dac_voice[i] = NULL;
794 }
795 }
@@ -833,7 +833,7 @@ static void es1370_realize(PCIDevice *dev, Error **errp)
833 ES1370State *s = ES1370(dev);
834 uint8_t *c = s->dev.config;
835
836 - if (!AUD_backend_check(&s->audio_be, errp)) {
836 + if (!audio_be_check(&s->audio_be, errp)) {
837 return;
838 }
839
@@ -861,10 +861,10 @@ static void es1370_exit(PCIDevice *dev)
861 int i;
862
863 for (i = 0; i < 2; ++i) {
864 - AUD_close_out(s->audio_be, s->dac_voice[i]);
864 + audio_be_close_out(s->audio_be, s->dac_voice[i]);
865 }
866
867 - AUD_close_in(s->audio_be, s->adc_voice);
867 + audio_be_close_in(s->audio_be, s->adc_voice);
868 }
869
870 static const Property es1370_properties[] = {
hw/audio/gus.c
+5 -5
@@ -87,7 +87,7 @@ static int write_audio (GUSState *s, int samples)
87 int nbytes, wbytes, wsampl;
88
89 nbytes = samples << s->shift;
90 - wbytes = AUD_write(
90 + wbytes = audio_be_write(
91 s->audio_be,
92 s->voice,
93 s->mixbuf + (pos << (s->shift - 1)),
@@ -243,7 +243,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
243 IsaDmaClass *k;
244 struct audsettings as;
245
246 - if (!AUD_backend_check(&s->audio_be, errp)) {
246 + if (!audio_be_check(&s->audio_be, errp)) {
247 return;
248 }
249
@@ -258,7 +258,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
258 as.fmt = AUDIO_FORMAT_S16;
259 as.endianness = HOST_BIG_ENDIAN;
260
261 - s->voice = AUD_open_out(
261 + s->voice = audio_be_open_out(
262 s->audio_be,
263 NULL,
264 "gus",
@@ -273,7 +273,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
273 }
274
275 s->shift = 2;
276 - s->samples = AUD_get_buffer_size_out(s->audio_be, s->voice) >> s->shift;
276 + s->samples = audio_be_get_buffer_size_out(s->audio_be, s->voice) >> s->shift;
277 s->mixbuf = g_malloc0 (s->samples << s->shift);
278
279 isa_register_portio_list(d, &s->portio_list1, s->port,
@@ -288,7 +288,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
288 s->emu.opaque = s;
289 s->pic = isa_bus_get_irq(bus, s->emu.gusirq);
290
291 - AUD_set_active_out(s->audio_be, s->voice, 1);
291 + audio_be_set_active_out(s->audio_be, s->voice, 1);
292 }
293
294 static const Property gus_properties[] = {
hw/audio/hda-codec.c
+21 -19
@@ -275,8 +275,8 @@ static void hda_audio_input_cb(void *opaque, int avail)
275 while (to_transfer) {
276 uint32_t start = (uint32_t) (wpos & B_MASK);
277 uint32_t chunk = (uint32_t) MIN(B_SIZE - start, to_transfer);
278 - uint32_t read = AUD_read(st->state->audio_be, st->voice.in,
279 - st->buf + start, chunk);
278 + uint32_t read = audio_be_read(st->state->audio_be, st->voice.in,
279 + st->buf + start, chunk);
280 wpos += read;
281 to_transfer -= read;
282 st->wpos += read;
@@ -355,8 +355,8 @@ static void hda_audio_output_cb(void *opaque, int avail)
355 while (to_transfer) {
356 uint32_t start = (uint32_t) (rpos & B_MASK);
357 uint32_t chunk = (uint32_t) MIN(B_SIZE - start, to_transfer);
358 - uint32_t written = AUD_write(st->state->audio_be, st->voice.out,
359 - st->buf + start, chunk);
358 + uint32_t written = audio_be_write(st->state->audio_be, st->voice.out,
359 + st->buf + start, chunk);
360 rpos += written;
361 to_transfer -= written;
362 st->rpos += written;
@@ -377,9 +377,9 @@ static void hda_audio_compat_input_cb(void *opaque, int avail)
377
378 while (avail - recv >= sizeof(st->compat_buf)) {
379 if (st->compat_bpos != sizeof(st->compat_buf)) {
380 - len = AUD_read(st->state->audio_be, st->voice.in,
381 - st->compat_buf + st->compat_bpos,
382 - sizeof(st->compat_buf) - st->compat_bpos);
380 + len = audio_be_read(st->state->audio_be, st->voice.in,
381 + st->compat_buf + st->compat_bpos,
382 + sizeof(st->compat_buf) - st->compat_bpos);
383 st->compat_bpos += len;
384 recv += len;
385 if (st->compat_bpos != sizeof(st->compat_buf)) {
@@ -411,9 +411,9 @@ static void hda_audio_compat_output_cb(void *opaque, int avail)
411 }
412 st->compat_bpos = 0;
413 }
414 - len = AUD_write(st->state->audio_be, st->voice.out,
415 - st->compat_buf + st->compat_bpos,
416 - sizeof(st->compat_buf) - st->compat_bpos);
414 + len = audio_be_write(st->state->audio_be, st->voice.out,
415 + st->compat_buf + st->compat_bpos,
416 + sizeof(st->compat_buf) - st->compat_bpos);
417 st->compat_bpos += len;
418 sent += len;
419 if (st->compat_bpos != sizeof(st->compat_buf)) {
@@ -444,9 +444,9 @@ static void hda_audio_set_running(HDAAudioStream *st, bool running)
444 }
445 }
446 if (st->output) {
447 - AUD_set_active_out(st->state->audio_be, st->voice.out, st->running);
447 + audio_be_set_active_out(st->state->audio_be, st->voice.out, st->running);
448 } else {
449 - AUD_set_active_in(st->state->audio_be, st->voice.in, st->running);
449 + audio_be_set_active_in(st->state->audio_be, st->voice.in, st->running);
450 }
451 }
452
@@ -470,9 +470,11 @@ static void hda_audio_set_amp(HDAAudioStream *st)
470 return;
471 }
472 if (st->output) {
473 - AUD_set_volume_out_lr(st->state->audio_be, st->voice.out, muted, left, right);
473 + audio_be_set_volume_out_lr(st->state->audio_be, st->voice.out,
474 + muted, left, right);
475 } else {
475 - AUD_set_volume_in_lr(st->state->audio_be, st->voice.in, muted, left, right);
476 + audio_be_set_volume_in_lr(st->state->audio_be, st->voice.in,
477 + muted, left, right);
478 }
479 }
480
@@ -495,7 +497,7 @@ static void hda_audio_setup(HDAAudioStream *st)
497 } else {
498 cb = hda_audio_compat_output_cb;
499 }
498 - st->voice.out = AUD_open_out(st->state->audio_be, st->voice.out,
500 + st->voice.out = audio_be_open_out(st->state->audio_be, st->voice.out,
501 st->node->name, st, cb, &st->as);
502 } else {
503 if (use_timer) {
@@ -504,7 +506,7 @@ static void hda_audio_setup(HDAAudioStream *st)
506 } else {
507 cb = hda_audio_compat_input_cb;
508 }
507 - st->voice.in = AUD_open_in(st->state->audio_be, st->voice.in,
509 + st->voice.in = audio_be_open_in(st->state->audio_be, st->voice.in,
510 st->node->name, st, cb, &st->as);
511 }
512 }
@@ -700,7 +702,7 @@ static void hda_audio_init(HDACodecDevice *hda,
702 const desc_param *param;
703 uint32_t i, type;
704
703 - if (!AUD_backend_check(&a->audio_be, errp)) {
705 + if (!audio_be_check(&a->audio_be, errp)) {
706 return;
707 }
708
@@ -758,9 +760,9 @@ static void hda_audio_exit(HDACodecDevice *hda)
760 }
761 timer_free(st->buft);
762 if (st->output) {
761 - AUD_close_out(a->audio_be, st->voice.out);
763 + audio_be_close_out(a->audio_be, st->voice.out);
764 } else {
763 - AUD_close_in(a->audio_be, st->voice.in);
765 + audio_be_close_in(a->audio_be, st->voice.in);
766 }
767 }
768 }
hw/audio/lm4549.c
+10 -10
@@ -101,11 +101,11 @@ static void lm4549_audio_transfer(lm4549_state *s)
101 uint32_t i;
102
103 /* Activate the voice */
104 - AUD_set_active_out(s->audio_be, s->voice, 1);
104 + audio_be_set_active_out(s->audio_be, s->voice, 1);
105 s->voice_is_active = 1;
106
107 /* Try to write the buffer content */
108 - written_bytes = AUD_write(s->audio_be, s->voice, s->buffer,
108 + written_bytes = audio_be_write(s->audio_be, s->voice, s->buffer,
109 s->buffer_level * sizeof(uint16_t));
110 written_samples = written_bytes >> 1;
111
@@ -129,14 +129,14 @@ static void lm4549_audio_out_callback(void *opaque, int free)
129 static uint32_t prev_buffer_level;
130
131 #ifdef LM4549_DEBUG
132 - int size = AUD_get_buffer_size_out(s->audio_be, s->voice);
132 + int size = audio_be_get_buffer_size_out(s->audio_be, s->voice);
133 DPRINTF("audio_out_callback size = %i free = %i\n", size, free);
134 #endif
135
136 /* Detect that no data are consumed
137 => disable the voice */
138 if (s->buffer_level == prev_buffer_level) {
139 - AUD_set_active_out(s->audio_be, s->voice, 0);
139 + audio_be_set_active_out(s->audio_be, s->voice, 0);
140 s->voice_is_active = 0;
141 }
142 prev_buffer_level = s->buffer_level;
@@ -204,7 +204,7 @@ void lm4549_write(lm4549_state *s,
204 as.fmt = AUDIO_FORMAT_S16;
205 as.endianness = 0;
206
207 - s->voice = AUD_open_out(
207 + s->voice = audio_be_open_out(
208 s->audio_be,
209 s->voice,
210 "lm4549.out",
@@ -274,7 +274,7 @@ static int lm4549_post_load(void *opaque, int version_id)
274 as.fmt = AUDIO_FORMAT_S16;
275 as.endianness = 0;
276
277 - s->voice = AUD_open_out(
277 + s->voice = audio_be_open_out(
278 s->audio_be,
279 s->voice,
280 "lm4549.out",
@@ -285,7 +285,7 @@ static int lm4549_post_load(void *opaque, int version_id)
285
286 /* Request data */
287 if (s->voice_is_active == 1) {
288 - lm4549_audio_out_callback(s, AUD_get_buffer_size_out(s->audio_be, s->voice));
288 + lm4549_audio_out_callback(s, audio_be_get_buffer_size_out(s->audio_be, s->voice));
289 }
290
291 return 0;
@@ -297,7 +297,7 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque,
297 struct audsettings as;
298
299 /* Register an audio card */
300 - if (!AUD_backend_check(&s->audio_be, errp)) {
300 + if (!audio_be_check(&s->audio_be, errp)) {
301 return;
302 }
303
@@ -314,7 +314,7 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque,
314 as.fmt = AUDIO_FORMAT_S16;
315 as.endianness = 0;
316
317 - s->voice = AUD_open_out(
317 + s->voice = audio_be_open_out(
318 s->audio_be,
319 s->voice,
320 "lm4549.out",
@@ -323,7 +323,7 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque,
323 &as
324 );
325
326 - AUD_set_volume_out_lr(s->audio_be, s->voice, 0, 255, 255);
326 + audio_be_set_volume_out_lr(s->audio_be, s->voice, 0, 255, 255);
327
328 s->voice_is_active = 0;
329
hw/audio/pcspk.c
+4 -4
@@ -105,7 +105,7 @@ static void pcspk_callback(void *opaque, int free)
105
106 while (free > 0) {
107 n = MIN(s->samples - s->play_pos, (unsigned int)free);
108 - n = AUD_write(s->audio_be, s->voice, &s->sample_buf[s->play_pos], n);
108 + n = audio_be_write(s->audio_be, s->voice, &s->sample_buf[s->play_pos], n);
109 if (!n)
110 break;
111 s->play_pos = (s->play_pos + n) % s->samples;
@@ -122,7 +122,7 @@ static int pcspk_audio_init(PCSpkState *s)
122 return 0;
123 }
124
125 - s->voice = AUD_open_out(s->audio_be, s->voice, s_spk, s, pcspk_callback, &as);
125 + s->voice = audio_be_open_out(s->audio_be, s->voice, s_spk, s, pcspk_callback, &as);
126 if (!s->voice) {
127 error_report("pcspk: Could not open voice");
128 return -1;
@@ -163,7 +163,7 @@ static void pcspk_io_write(void *opaque, hwaddr addr, uint64_t val,
163 if (s->voice) {
164 if (gate) /* restart */
165 s->play_pos = 0;
166 - AUD_set_active_out(s->audio_be, s->voice, gate & s->data_on);
166 + audio_be_set_active_out(s->audio_be, s->voice, gate & s->data_on);
167 }
168 }
169
@@ -195,7 +195,7 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp)
195
196 isa_register_ioport(isadev, &s->ioport, s->iobase);
197
198 - if (s->audio_be && AUD_backend_check(&s->audio_be, errp)) {
198 + if (s->audio_be && audio_be_check(&s->audio_be, errp)) {
199 pcspk_audio_init(s);
200 return;
201 }
hw/audio/sb16.c
+11 -11
@@ -171,7 +171,7 @@ static void log_dsp (SB16State *dsp)
171 static void speaker (SB16State *s, int on)
172 {
173 s->speaker = on;
174 - /* AUD_enable (s->voice, on); */
174 + /* audio_be_enable (s->voice, on); */
175 }
176
177 static void control (SB16State *s, int hold)
@@ -185,11 +185,11 @@ static void control (SB16State *s, int hold)
185
186 if (hold) {
187 k->hold_DREQ(isa_dma, dma);
188 - AUD_set_active_out(s->audio_be, s->voice, 1);
188 + audio_be_set_active_out(s->audio_be, s->voice, 1);
189 }
190 else {
191 k->release_DREQ(isa_dma, dma);
192 - AUD_set_active_out(s->audio_be, s->voice, 0);
192 + audio_be_set_active_out(s->audio_be, s->voice, 0);
193 }
194 }
195
@@ -215,7 +215,7 @@ static void continue_dma8 (SB16State *s)
215 as.fmt = s->fmt;
216 as.endianness = 0;
217
218 - s->voice = AUD_open_out(
218 + s->voice = audio_be_open_out(
219 s->audio_be,
220 s->voice,
221 "sb16",
@@ -378,7 +378,7 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t d0, int dma_len)
378 as.fmt = s->fmt;
379 as.endianness = 0;
380
381 - s->voice = AUD_open_out(
381 + s->voice = audio_be_open_out(
382 s->audio_be,
383 s->voice,
384 "sb16",
@@ -879,7 +879,7 @@ static void legacy_reset (SB16State *s)
879 as.fmt = AUDIO_FORMAT_U8;
880 as.endianness = 0;
881
882 - s->voice = AUD_open_out(
882 + s->voice = audio_be_open_out(
883 s->audio_be,
884 s->voice,
885 "sb16",
@@ -889,7 +889,7 @@ static void legacy_reset (SB16State *s)
889 );
890
891 /* Not sure about that... */
892 - /* AUD_set_active_out (s->voice, 1); */
892 + /* audio_be_set_active_out (s->voice, 1); */
893 }
894
895 static void reset (SB16State *s)
@@ -1196,7 +1196,7 @@ static int write_audio (SB16State *s, int nchan, int dma_pos,
1196 }
1197
1198 copied = k->read_memory(isa_dma, nchan, tmpbuf, dma_pos, to_copy);
1199 - copied = AUD_write(s->audio_be, s->voice, tmpbuf, copied);
1199 + copied = audio_be_write(s->audio_be, s->voice, tmpbuf, copied);
1200
1201 temp -= copied;
1202 dma_pos = (dma_pos + copied) % dma_len;
@@ -1287,7 +1287,7 @@ static int sb16_post_load (void *opaque, int version_id)
1287 SB16State *s = opaque;
1288
1289 if (s->voice) {
1290 - AUD_close_out(s->audio_be, s->voice);
1290 + audio_be_close_out(s->audio_be, s->voice);
1291 s->voice = NULL;
1292 }
1293
@@ -1302,7 +1302,7 @@ static int sb16_post_load (void *opaque, int version_id)
1302 as.fmt = s->fmt;
1303 as.endianness = 0;
1304
1305 - s->voice = AUD_open_out(
1305 + s->voice = audio_be_open_out(
1306 s->audio_be,
1307 s->voice,
1308 "sb16",
@@ -1401,7 +1401,7 @@ static void sb16_realizefn (DeviceState *dev, Error **errp)
1401 SB16State *s = SB16 (dev);
1402 IsaDmaClass *k;
1403
1404 - if (!AUD_backend_check(&s->audio_be, errp)) {
1404 + if (!audio_be_check(&s->audio_be, errp)) {
1405 return;
1406 }
1407
hw/audio/via-ac97.c
+10 -10
@@ -53,7 +53,7 @@ static void codec_volume_set_out(ViaAC97State *s)
53 rvol /= 255;
54 mute = CODEC_REG(s, AC97_Master_Volume_Mute) >> MUTE_SHIFT;
55 mute |= CODEC_REG(s, AC97_PCM_Out_Volume_Mute) >> MUTE_SHIFT;
56 - AUD_set_volume_out_lr(s->audio_be, s->vo, mute, lvol, rvol);
56 + audio_be_set_volume_out_lr(s->audio_be, s->vo, mute, lvol, rvol);
57 }
58
59 static void codec_reset(ViaAC97State *s)
@@ -189,7 +189,7 @@ static void out_cb(void *opaque, int avail)
189 while (temp) {
190 to_copy = MIN(temp, sizeof(tmpbuf));
191 pci_dma_read(&s->dev, c->addr, tmpbuf, to_copy);
192 - copied = AUD_write(s->audio_be, s->vo, tmpbuf, to_copy);
192 + copied = audio_be_write(s->audio_be, s->vo, tmpbuf, to_copy);
193 if (!copied) {
194 stop = true;
195 break;
@@ -208,7 +208,7 @@ static void out_cb(void *opaque, int avail)
208 c->stat |= STAT_PAUSED;
209 } else {
210 c->stat &= ~STAT_ACTIVE;
211 - AUD_set_active_out(s->audio_be, s->vo, 0);
211 + audio_be_set_active_out(s->audio_be, s->vo, 0);
212 }
213 if (c->type & STAT_EOL) {
214 via_isa_set_irq(&s->dev, 0, 1);
@@ -239,7 +239,7 @@ static void open_voice_out(ViaAC97State *s)
239 .fmt = s->aur.type & BIT(5) ? AUDIO_FORMAT_S16 : AUDIO_FORMAT_S8,
240 .endianness = 0,
241 };
242 - s->vo = AUD_open_out(s->audio_be, s->vo, "via-ac97.out", s, out_cb, &as);
242 + s->vo = audio_be_open_out(s->audio_be, s->vo, "via-ac97.out", s, out_cb, &as);
243 }
244
245 static uint64_t sgd_read(void *opaque, hwaddr addr, unsigned size)
@@ -317,20 +317,20 @@ static void sgd_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
317 break;
318 case 1:
319 if (val & CNTL_START) {
320 - AUD_set_active_out(s->audio_be, s->vo, 1);
320 + audio_be_set_active_out(s->audio_be, s->vo, 1);
321 s->aur.stat = STAT_ACTIVE;
322 }
323 if (val & CNTL_TERM) {
324 - AUD_set_active_out(s->audio_be, s->vo, 0);
324 + audio_be_set_active_out(s->audio_be, s->vo, 0);
325 s->aur.stat &= ~(STAT_ACTIVE | STAT_PAUSED);
326 s->aur.clen = 0;
327 }
328 if (val & CNTL_PAUSE) {
329 - AUD_set_active_out(s->audio_be, s->vo, 0);
329 + audio_be_set_active_out(s->audio_be, s->vo, 0);
330 s->aur.stat &= ~STAT_ACTIVE;
331 s->aur.stat |= STAT_PAUSED;
332 } else if (!(val & CNTL_PAUSE) && (s->aur.stat & STAT_PAUSED)) {
333 - AUD_set_active_out(s->audio_be, s->vo, 1);
333 + audio_be_set_active_out(s->audio_be, s->vo, 1);
334 s->aur.stat |= STAT_ACTIVE;
335 s->aur.stat &= ~STAT_PAUSED;
336 }
@@ -426,7 +426,7 @@ static void via_ac97_realize(PCIDevice *pci_dev, Error **errp)
426 ViaAC97State *s = VIA_AC97(pci_dev);
427 Object *o = OBJECT(s);
428
429 - if (!AUD_backend_check(&s->audio_be, errp)) {
429 + if (!audio_be_check(&s->audio_be, errp)) {
430 return;
431 }
432
@@ -455,7 +455,7 @@ static void via_ac97_exit(PCIDevice *dev)
455 {
456 ViaAC97State *s = VIA_AC97(dev);
457
458 - AUD_close_out(s->audio_be, s->vo);
458 + audio_be_close_out(s->audio_be, s->vo);
459 }
460
461 static const Property via_ac97_properties[] = {
hw/audio/virtio-snd.c
+20 -20
@@ -402,10 +402,10 @@ static void virtio_snd_pcm_close(VirtIOSoundPCMStream *stream)
402 if (stream) {
403 virtio_snd_pcm_flush(stream);
404 if (stream->info.direction == VIRTIO_SND_D_OUTPUT) {
405 - AUD_close_out(stream->pcm->snd->audio_be, stream->voice.out);
405 + audio_be_close_out(stream->pcm->snd->audio_be, stream->voice.out);
406 stream->voice.out = NULL;
407 } else if (stream->info.direction == VIRTIO_SND_D_INPUT) {
408 - AUD_close_in(stream->pcm->snd->audio_be, stream->voice.in);
408 + audio_be_close_in(stream->pcm->snd->audio_be, stream->voice.in);
409 stream->voice.in = NULL;
410 }
411 }
@@ -469,21 +469,21 @@ static uint32_t virtio_snd_pcm_prepare(VirtIOSound *s, uint32_t stream_id)
469 stream->as = as;
470
471 if (stream->info.direction == VIRTIO_SND_D_OUTPUT) {
472 - stream->voice.out = AUD_open_out(s->audio_be,
472 + stream->voice.out = audio_be_open_out(s->audio_be,
473 stream->voice.out,
474 "virtio-sound.out",
475 stream,
476 virtio_snd_pcm_out_cb,
477 &as);
478 - AUD_set_volume_out_lr(s->audio_be, stream->voice.out, 0, 255, 255);
478 + audio_be_set_volume_out_lr(s->audio_be, stream->voice.out, 0, 255, 255);
479 } else {
480 - stream->voice.in = AUD_open_in(s->audio_be,
480 + stream->voice.in = audio_be_open_in(s->audio_be,
481 stream->voice.in,
482 "virtio-sound.in",
483 stream,
484 virtio_snd_pcm_in_cb,
485 &as);
486 - AUD_set_volume_in_lr(s->audio_be, stream->voice.in, 0, 255, 255);
486 + audio_be_set_volume_in_lr(s->audio_be, stream->voice.in, 0, 255, 255);
487 }
488
489 return cpu_to_le32(VIRTIO_SND_S_OK);
@@ -573,9 +573,9 @@ static void virtio_snd_handle_pcm_start_stop(VirtIOSound *s,
573 stream->active = start;
574 }
575 if (stream->info.direction == VIRTIO_SND_D_OUTPUT) {
576 - AUD_set_active_out(s->audio_be, stream->voice.out, start);
576 + audio_be_set_active_out(s->audio_be, stream->voice.out, start);
577 } else {
578 - AUD_set_active_in(s->audio_be, stream->voice.in, start);
578 + audio_be_set_active_in(s->audio_be, stream->voice.in, start);
579 }
580 } else {
581 error_report("Invalid stream id: %"PRIu32, stream_id);
@@ -1057,7 +1057,7 @@ static void virtio_snd_realize(DeviceState *dev, Error **errp)
1057 return;
1058 }
1059
1060 - if (!AUD_backend_check(&vsnd->audio_be, errp)) {
1060 + if (!audio_be_check(&vsnd->audio_be, errp)) {
1061 return;
1062 }
1063
@@ -1146,10 +1146,10 @@ static inline void return_tx_buffer(VirtIOSoundPCMStream *stream,
1146 }
1147
1148 /*
1149 - * AUD_* output callback.
1149 + * audio_be_* output callback.
1150 *
1151 * @data: VirtIOSoundPCMStream stream
1152 - * @available: number of bytes that can be written with AUD_write()
1152 + * @available: number of bytes that can be written with audio_be_write()
1153 */
1154 static void virtio_snd_pcm_out_cb(void *data, int available)
1155 {
@@ -1164,7 +1164,7 @@ static void virtio_snd_pcm_out_cb(void *data, int available)
1164 return;
1165 }
1166 if (!stream->active) {
1167 - /* Stream has stopped, so do not perform AUD_write. */
1167 + /* Stream has stopped, so do not perform audio_be_write. */
1168 return_tx_buffer(stream, buffer);
1169 continue;
1170 }
@@ -1177,7 +1177,7 @@ static void virtio_snd_pcm_out_cb(void *data, int available)
1177 buffer->populated = true;
1178 }
1179 for (;;) {
1180 - size = AUD_write(stream->s->audio_be,
1180 + size = audio_be_write(stream->s->audio_be,
1181 stream->voice.out,
1182 buffer->data + buffer->offset,
1183 MIN(buffer->size, available));
@@ -1242,10 +1242,10 @@ static inline void return_rx_buffer(VirtIOSoundPCMStream *stream,
1242
1243
1244 /*
1245 - * AUD_* input callback.
1245 + * audio_be_* input callback.
1246 *
1247 * @data: VirtIOSoundPCMStream stream
1248 - * @available: number of bytes that can be read with AUD_read()
1248 + * @available: number of bytes that can be read with audio_be_read()
1249 */
1250 static void virtio_snd_pcm_in_cb(void *data, int available)
1251 {
@@ -1260,7 +1260,7 @@ static void virtio_snd_pcm_in_cb(void *data, int available)
1260 return;
1261 }
1262 if (!stream->active) {
1263 - /* Stream has stopped, so do not perform AUD_read. */
1263 + /* Stream has stopped, so do not perform audio_be_read. */
1264 return_rx_buffer(stream, buffer);
1265 continue;
1266 }
@@ -1280,10 +1280,10 @@ static void virtio_snd_pcm_in_cb(void *data, int available)
1280 to_read = stream->params.period_bytes - buffer->size;
1281 to_read = MIN(to_read, available);
1282 to_read = MIN(to_read, max_size - buffer->size);
1283 - size = AUD_read(stream->s->audio_be,
1284 - stream->voice.in,
1285 - buffer->data + buffer->size,
1286 - to_read);
1283 + size = audio_be_read(stream->s->audio_be,
1284 + stream->voice.in,
1285 + buffer->data + buffer->size,
1286 + to_read);
1287 if (!size) {
1288 available = 0;
1289 break;
hw/audio/wm8750.c
+22 -21
@@ -72,7 +72,7 @@ static inline void wm8750_in_load(WM8750State *s)
72 if (s->idx_in + s->req_in <= sizeof(s->data_in))
73 return;
74 s->idx_in = MAX(0, (int) sizeof(s->data_in) - s->req_in);
75 - AUD_read(s->audio_be, *s->in[0], s->data_in + s->idx_in,
75 + audio_be_read(s->audio_be, *s->in[0], s->data_in + s->idx_in,
76 sizeof(s->data_in) - s->idx_in);
77 }
78
@@ -80,7 +80,8 @@ static inline void wm8750_out_flush(WM8750State *s)
80 {
81 int sent = 0;
82 while (sent < s->idx_out)
83 - sent += AUD_write(s->audio_be, *s->out[0], s->data_out + sent, s->idx_out - sent)
83 + sent += audio_be_write(s->audio_be, *s->out[0],
84 + s->data_out + sent, s->idx_out - sent)
85 ?: s->idx_out;
86 s->idx_out = 0;
87 }
@@ -145,30 +146,30 @@ static void wm8750_vol_update(WM8750State *s)
146 {
147 /* FIXME: multiply all volumes by s->invol[2], s->invol[3] */
148
148 - AUD_set_volume_in_lr(s->audio_be, s->adc_voice[0], s->mute,
149 + audio_be_set_volume_in_lr(s->audio_be, s->adc_voice[0], s->mute,
150 s->inmute[0] ? 0 : WM8750_INVOL_TRANSFORM(s->invol[0]),
151 s->inmute[1] ? 0 : WM8750_INVOL_TRANSFORM(s->invol[1]));
151 - AUD_set_volume_in_lr(s->audio_be, s->adc_voice[1], s->mute,
152 + audio_be_set_volume_in_lr(s->audio_be, s->adc_voice[1], s->mute,
153 s->inmute[0] ? 0 : WM8750_INVOL_TRANSFORM(s->invol[0]),
154 s->inmute[1] ? 0 : WM8750_INVOL_TRANSFORM(s->invol[1]));
154 - AUD_set_volume_in_lr(s->audio_be, s->adc_voice[2], s->mute,
155 + audio_be_set_volume_in_lr(s->audio_be, s->adc_voice[2], s->mute,
156 s->inmute[0] ? 0 : WM8750_INVOL_TRANSFORM(s->invol[0]),
157 s->inmute[1] ? 0 : WM8750_INVOL_TRANSFORM(s->invol[1]));
158
159 /* FIXME: multiply all volumes by s->outvol[0], s->outvol[1] */
160
161 /* Speaker: LOUT2VOL ROUT2VOL */
161 - AUD_set_volume_out_lr(s->audio_be, s->dac_voice[0], s->mute,
162 + audio_be_set_volume_out_lr(s->audio_be, s->dac_voice[0], s->mute,
163 s->outmute[0] ? 0 : WM8750_OUTVOL_TRANSFORM(s->outvol[4]),
164 s->outmute[1] ? 0 : WM8750_OUTVOL_TRANSFORM(s->outvol[5]));
165
166 /* Headphone: LOUT1VOL ROUT1VOL */
166 - AUD_set_volume_out_lr(s->audio_be, s->dac_voice[1], s->mute,
167 + audio_be_set_volume_out_lr(s->audio_be, s->dac_voice[1], s->mute,
168 s->outmute[0] ? 0 : WM8750_OUTVOL_TRANSFORM(s->outvol[2]),
169 s->outmute[1] ? 0 : WM8750_OUTVOL_TRANSFORM(s->outvol[3]));
170
171 /* MONOOUT: MONOVOL MONOVOL */
171 - AUD_set_volume_out_lr(s->audio_be, s->dac_voice[2], s->mute,
172 + audio_be_set_volume_out_lr(s->audio_be, s->dac_voice[2], s->mute,
173 s->outmute[0] ? 0 : WM8750_OUTVOL_TRANSFORM(s->outvol[6]),
174 s->outmute[1] ? 0 : WM8750_OUTVOL_TRANSFORM(s->outvol[6]));
175 }
@@ -182,18 +183,18 @@ static void wm8750_set_format(WM8750State *s)
183 wm8750_out_flush(s);
184
185 if (s->in[0] && *s->in[0])
185 - AUD_set_active_in(s->audio_be, *s->in[0], 0);
186 + audio_be_set_active_in(s->audio_be, *s->in[0], 0);
187 if (s->out[0] && *s->out[0])
187 - AUD_set_active_out(s->audio_be, *s->out[0], 0);
188 + audio_be_set_active_out(s->audio_be, *s->out[0], 0);
189
190 for (i = 0; i < IN_PORT_N; i ++)
191 if (s->adc_voice[i]) {
191 - AUD_close_in(s->audio_be, s->adc_voice[i]);
192 + audio_be_close_in(s->audio_be, s->adc_voice[i]);
193 s->adc_voice[i] = NULL;
194 }
195 for (i = 0; i < OUT_PORT_N; i ++)
196 if (s->dac_voice[i]) {
196 - AUD_close_out(s->audio_be, s->dac_voice[i]);
197 + audio_be_close_out(s->audio_be, s->dac_voice[i]);
198 s->dac_voice[i] = NULL;
199 }
200
@@ -206,11 +207,11 @@ static void wm8750_set_format(WM8750State *s)
207 in_fmt.freq = s->adc_hz;
208 in_fmt.fmt = AUDIO_FORMAT_S16;
209
209 - s->adc_voice[0] = AUD_open_in(s->audio_be, s->adc_voice[0],
210 + s->adc_voice[0] = audio_be_open_in(s->audio_be, s->adc_voice[0],
211 CODEC ".input1", s, wm8750_audio_in_cb, &in_fmt);
211 - s->adc_voice[1] = AUD_open_in(s->audio_be, s->adc_voice[1],
212 + s->adc_voice[1] = audio_be_open_in(s->audio_be, s->adc_voice[1],
213 CODEC ".input2", s, wm8750_audio_in_cb, &in_fmt);
213 - s->adc_voice[2] = AUD_open_in(s->audio_be, s->adc_voice[2],
214 + s->adc_voice[2] = audio_be_open_in(s->audio_be, s->adc_voice[2],
215 CODEC ".input3", s, wm8750_audio_in_cb, &in_fmt);
216
217 /* Setup output */
@@ -219,12 +220,12 @@ static void wm8750_set_format(WM8750State *s)
220 out_fmt.freq = s->dac_hz;
221 out_fmt.fmt = AUDIO_FORMAT_S16;
222
222 - s->dac_voice[0] = AUD_open_out(s->audio_be, s->dac_voice[0],
223 + s->dac_voice[0] = audio_be_open_out(s->audio_be, s->dac_voice[0],
224 CODEC ".speaker", s, wm8750_audio_out_cb, &out_fmt);
224 - s->dac_voice[1] = AUD_open_out(s->audio_be, s->dac_voice[1],
225 + s->dac_voice[1] = audio_be_open_out(s->audio_be, s->dac_voice[1],
226 CODEC ".headphone", s, wm8750_audio_out_cb, &out_fmt);
227 /* MONOMIX is also in stereo for simplicity */
227 - s->dac_voice[2] = AUD_open_out(s->audio_be, s->dac_voice[2],
228 + s->dac_voice[2] = audio_be_open_out(s->audio_be, s->dac_voice[2],
229 CODEC ".monomix", s, wm8750_audio_out_cb, &out_fmt);
230 /* no sense emulating OUT3 which is a mix of other outputs */
231
@@ -235,9 +236,9 @@ static void wm8750_set_format(WM8750State *s)
236 * for mixing or combining paths to different ports, so we
237 * connect both channels to where the left channel is routed. */
238 if (s->in[0] && *s->in[0])
238 - AUD_set_active_in(s->audio_be, *s->in[0], 1);
239 + audio_be_set_active_in(s->audio_be, *s->in[0], 1);
240 if (s->out[0] && *s->out[0])
240 - AUD_set_active_out(s->audio_be, *s->out[0], 1);
241 + audio_be_set_active_out(s->audio_be, *s->out[0], 1);
242 }
243
244 static void wm8750_clk_update(WM8750State *s, int ext)
@@ -624,7 +625,7 @@ static void wm8750_realize(DeviceState *dev, Error **errp)
625 {
626 WM8750State *s = WM8750(dev);
627
627 - if (!AUD_backend_check(&s->audio_be, errp)) {
628 + if (!audio_be_check(&s->audio_be, errp)) {
629 return;
630 }
631
hw/display/xlnx_dp.c
+8 -8
@@ -331,7 +331,7 @@ static inline void xlnx_dp_audio_activate(XlnxDPState *s)
331 {
332 bool activated = ((s->core_registers[DP_TX_AUDIO_CONTROL]
333 & DP_TX_AUD_CTRL) != 0);
334 - AUD_set_active_out(s->audio_be, s->amixer_output_stream, activated);
334 + audio_be_set_active_out(s->audio_be, s->amixer_output_stream, activated);
335 xlnx_dpdma_set_host_data_location(s->dpdma, DP_AUDIO_DMA_CHANNEL(0),
336 &s->audio_buffer_0);
337 xlnx_dpdma_set_host_data_location(s->dpdma, DP_AUDIO_DMA_CHANNEL(1),
@@ -401,7 +401,7 @@ static void xlnx_dp_audio_callback(void *opaque, int avail)
401 /* Send the buffer through the audio. */
402 if (s->byte_left <= MAX_QEMU_BUFFER_SIZE) {
403 if (s->byte_left != 0) {
404 - written = AUD_write(s->audio_be, s->amixer_output_stream,
404 + written = audio_be_write(s->audio_be, s->amixer_output_stream,
405 &s->out_buffer[s->data_ptr], s->byte_left);
406 } else {
407 int len_to_copy;
@@ -413,12 +413,12 @@ static void xlnx_dp_audio_callback(void *opaque, int avail)
413 while (avail) {
414 len_to_copy = MIN(AUD_CHBUF_MAX_DEPTH, avail);
415 memset(s->out_buffer, 0, len_to_copy);
416 - avail -= AUD_write(s->audio_be, s->amixer_output_stream, s->out_buffer,
417 - len_to_copy);
416 + avail -= audio_be_write(s->audio_be, s->amixer_output_stream,
417 + s->out_buffer, len_to_copy);
418 }
419 }
420 } else {
421 - written = AUD_write(s->audio_be, s->amixer_output_stream,
421 + written = audio_be_write(s->audio_be, s->amixer_output_stream,
422 &s->out_buffer[s->data_ptr], MAX_QEMU_BUFFER_SIZE);
423 }
424 s->byte_left -= written;
@@ -1373,7 +1373,7 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp)
1373 DisplaySurface *surface;
1374 struct audsettings as;
1375
1376 - if (!AUD_backend_check(&s->audio_be, errp)) {
1376 + if (!audio_be_check(&s->audio_be, errp)) {
1377 return;
1378 }
1379
@@ -1395,13 +1395,13 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp)
1395 as.fmt = AUDIO_FORMAT_S16;
1396 as.endianness = 0;
1397
1398 - s->amixer_output_stream = AUD_open_out(s->audio_be,
1398 + s->amixer_output_stream = audio_be_open_out(s->audio_be,
1399 s->amixer_output_stream,
1400 "xlnx_dp.audio.out",
1401 s,
1402 xlnx_dp_audio_callback,
1403 &as);
1404 - AUD_set_volume_out_lr(s->audio_be, s->amixer_output_stream, 0, 255, 255);
1404 + audio_be_set_volume_out_lr(s->audio_be, s->amixer_output_stream, 0, 255, 255);
1405 xlnx_dp_audio_activate(s);
1406 s->vblank = ptimer_init(vblank_hit, s, DP_VBLANK_PTIMER_POLICY);
1407 ptimer_transaction_begin(s->vblank);
hw/usb/dev-audio.c
+9 -9
@@ -669,7 +669,7 @@ static void output_callback(void *opaque, int avail)
669 return;
670 }
671
672 - written = AUD_write(s->audio_be, s->out.voice, data, len);
672 + written = audio_be_write(s->audio_be, s->out.voice, data, len);
673 avail -= written;
674 s->out.buf.cons += written;
675
@@ -683,7 +683,7 @@ static int usb_audio_set_output_altset(USBAudioState *s, int altset)
683 {
684 switch (altset) {
685 case ALTSET_OFF:
686 - AUD_set_active_out(s->audio_be, s->out.voice, false);
686 + audio_be_set_active_out(s->audio_be, s->out.voice, false);
687 break;
688 case ALTSET_STEREO:
689 case ALTSET_51:
@@ -692,7 +692,7 @@ static int usb_audio_set_output_altset(USBAudioState *s, int altset)
692 usb_audio_reinit(USB_DEVICE(s), altset_channels[altset]);
693 }
694 streambuf_init(&s->out.buf, s->buffer, s->out.channels);
695 - AUD_set_active_out(s->audio_be, s->out.voice, true);
695 + audio_be_set_active_out(s->audio_be, s->out.voice, true);
696 break;
697 default:
698 return -1;
@@ -805,7 +805,7 @@ static int usb_audio_set_control(USBAudioState *s, uint8_t attrib,
805 }
806 fprintf(stderr, "\n");
807 }
808 - AUD_set_volume_out(s->audio_be, s->out.voice, &s->out.vol);
808 + audio_be_set_volume_out(s->audio_be, s->out.voice, &s->out.vol);
809 }
810
811 return ret;
@@ -931,7 +931,7 @@ static void usb_audio_unrealize(USBDevice *dev)
931 }
932
933 usb_audio_set_output_altset(s, ALTSET_OFF);
934 - AUD_close_out(s->audio_be, s->out.voice);
934 + audio_be_close_out(s->audio_be, s->out.voice);
935
936 streambuf_fini(&s->out.buf);
937 }
@@ -941,7 +941,7 @@ static void usb_audio_realize(USBDevice *dev, Error **errp)
941 USBAudioState *s = USB_AUDIO(dev);
942 int i;
943
944 - if (!AUD_backend_check(&s->audio_be, errp)) {
944 + if (!audio_be_check(&s->audio_be, errp)) {
945 return;
946 }
947
@@ -978,10 +978,10 @@ static void usb_audio_reinit(USBDevice *dev, unsigned channels)
978 s->out.as.endianness = 0;
979 streambuf_init(&s->out.buf, s->buffer, s->out.channels);
980
981 - s->out.voice = AUD_open_out(s->audio_be, s->out.voice, TYPE_USB_AUDIO,
981 + s->out.voice = audio_be_open_out(s->audio_be, s->out.voice, TYPE_USB_AUDIO,
982 s, output_callback, &s->out.as);
983 - AUD_set_volume_out(s->audio_be, s->out.voice, &s->out.vol);
984 - AUD_set_active_out(s->audio_be, s->out.voice, 0);
983 + audio_be_set_volume_out(s->audio_be, s->out.voice, &s->out.vol);
984 + audio_be_set_active_out(s->audio_be, s->out.voice, 0);
985 }
986
987 static const VMStateDescription vmstate_usb_audio = {
include/qemu/audio-capture.h
+2 -2
@@ -19,13 +19,13 @@ typedef struct CaptureState {
19 QLIST_ENTRY(CaptureState) entries;
20 } CaptureState;
21
22 -CaptureVoiceOut *AUD_add_capture(
22 +CaptureVoiceOut *audio_be_add_capture(
23 AudioBackend *be,
24 struct audsettings *as,
25 struct audio_capture_ops *ops,
26 void *opaque);
27
28 -void AUD_del_capture(
28 +void audio_be_del_capture(
29 AudioBackend *be,
30 CaptureVoiceOut *cap,
31 void *cb_opaque);
include/qemu/audio.h
+21 -22
@@ -109,11 +109,11 @@ typedef struct AudioBackendClass {
109 #endif
110 } AudioBackendClass;
111
112 -bool AUD_backend_check(AudioBackend **be, Error **errp);
112 +bool audio_be_check(AudioBackend **be, Error **errp);
113
114 AudioBackend *audio_be_new(Audiodev *dev, Error **errp);
115
116 -SWVoiceOut *AUD_open_out(
116 +SWVoiceOut *audio_be_open_out(
117 AudioBackend *be,
118 SWVoiceOut *sw,
119 const char *name,
@@ -121,34 +121,33 @@ SWVoiceOut *AUD_open_out(
121 audio_callback_fn callback_fn,
122 const struct audsettings *settings);
123
124 -void AUD_close_out(AudioBackend *be, SWVoiceOut *sw);
125 -size_t AUD_write(AudioBackend *be, SWVoiceOut *sw, void *pcm_buf, size_t size);
126 -int AUD_get_buffer_size_out(AudioBackend *be, SWVoiceOut *sw);
127 -void AUD_set_active_out(AudioBackend *be, SWVoiceOut *sw, bool on);
128 -bool AUD_is_active_out(AudioBackend *be, SWVoiceOut *sw);
124 +void audio_be_close_out(AudioBackend *be, SWVoiceOut *sw);
125 +size_t audio_be_write(AudioBackend *be, SWVoiceOut *sw, void *pcm_buf, size_t size);
126 +int audio_be_get_buffer_size_out(AudioBackend *be, SWVoiceOut *sw);
127 +void audio_be_set_active_out(AudioBackend *be, SWVoiceOut *sw, bool on);
128 +bool audio_be_is_active_out(AudioBackend *be, SWVoiceOut *sw);
129
130 -void AUD_set_volume_out(AudioBackend *be, SWVoiceOut *sw, Volume *vol);
131 -void AUD_set_volume_in(AudioBackend *be, SWVoiceIn *sw, Volume *vol);
130 +
131 +void audio_be_set_volume_out(AudioBackend *be, SWVoiceOut *sw, Volume *vol);
132 +void audio_be_set_volume_in(AudioBackend *be, SWVoiceIn *sw, Volume *vol);
133
134 static inline void
134 -AUD_set_volume_out_lr(AudioBackend *be, SWVoiceOut *sw,
135 - bool mut, uint8_t lvol, uint8_t rvol)
136 -{
137 - AUD_set_volume_out(be, sw, &(Volume) {
135 +audio_be_set_volume_out_lr(AudioBackend *be, SWVoiceOut *sw,
136 + bool mut, uint8_t lvol, uint8_t rvol) {
137 + audio_be_set_volume_out(be, sw, &(Volume) {
138 .mute = mut, .channels = 2, .vol = { lvol, rvol }
139 });
140 }
141
142 static inline void
143 -AUD_set_volume_in_lr(AudioBackend *be, SWVoiceIn *sw,
144 - bool mut, uint8_t lvol, uint8_t rvol)
145 -{
146 - AUD_set_volume_in(be, sw, &(Volume) {
143 +audio_be_set_volume_in_lr(AudioBackend *be, SWVoiceIn *sw,
144 + bool mut, uint8_t lvol, uint8_t rvol) {
145 + audio_be_set_volume_in(be, sw, &(Volume) {
146 .mute = mut, .channels = 2, .vol = { lvol, rvol }
147 });
148 }
149
151 -SWVoiceIn *AUD_open_in(
150 +SWVoiceIn *audio_be_open_in(
151 AudioBackend *be,
152 SWVoiceIn *sw,
153 const char *name,
@@ -157,10 +156,10 @@ SWVoiceIn *AUD_open_in(
156 const struct audsettings *settings
157 );
158
160 -void AUD_close_in(AudioBackend *be, SWVoiceIn *sw);
161 -size_t AUD_read(AudioBackend *be, SWVoiceIn *sw, void *pcm_buf, size_t size);
162 -void AUD_set_active_in(AudioBackend *be, SWVoiceIn *sw, bool on);
163 -bool AUD_is_active_in(AudioBackend *be, SWVoiceIn *sw);
159 +void audio_be_close_in(AudioBackend *be, SWVoiceIn *sw);
160 +size_t audio_be_read(AudioBackend *be, SWVoiceIn *sw, void *pcm_buf, size_t size);
161 +void audio_be_set_active_in(AudioBackend *be, SWVoiceIn *sw, bool on);
162 +bool audio_be_is_active_in(AudioBackend *be, SWVoiceIn *sw);
163
164 void audio_cleanup(void);
165
tests/audio/test-audio.c
+58 -58
@@ -94,7 +94,7 @@ static SWVoiceOut *open_test_voice_out(AudioBackend *be, const char *name,
94 struct audsettings as = default_test_settings;
95 SWVoiceOut *voice;
96
97 - voice = AUD_open_out(be, NULL, name, opaque, cb, &as);
97 + voice = audio_be_open_out(be, NULL, name, opaque, cb, &as);
98 g_assert_nonnull(voice);
99 return voice;
100 }
@@ -104,7 +104,7 @@ static SWVoiceIn *open_test_voice_in(AudioBackend *be, const char *name,
104 {
105 struct audsettings as = default_test_settings;
106
107 - return AUD_open_in(be, NULL, name, opaque, cb, &as);
107 + return audio_be_open_in(be, NULL, name, opaque, cb, &as);
108 }
109
110 /*
@@ -142,8 +142,8 @@ static void test_sine_callback(void *opaque, int avail)
142
143 generate_sine_samples(buffer, frames_to_write, s->frames_written);
144
145 - bytes_written = AUD_write(s->be, s->voice, buffer,
146 - frames_to_write * sizeof(int16_t) * CHANNELS);
145 + bytes_written = audio_be_write(s->be, s->voice, buffer,
146 + frames_to_write * sizeof(int16_t) * CHANNELS);
147 s->frames_written += bytes_written / (sizeof(int16_t) * CHANNELS);
148 }
149
@@ -163,7 +163,7 @@ static void test_audio_out_sine_wave(void)
163 &state, test_sine_callback);
164
165 g_test_message("Playing 440Hz sine wave for %d seconds...", DURATION_SECS);
166 - AUD_set_active_out(state.be, state.voice, true);
166 + audio_be_set_active_out(state.be, state.voice, true);
167
168 /*
169 * Run the audio subsystem until all frames are written or timeout.
@@ -188,8 +188,8 @@ static void test_audio_out_sine_wave(void)
188
189 g_assert_cmpint(state.frames_written, ==, state.total_frames);
190
191 - AUD_set_active_out(state.be, state.voice, false);
192 - AUD_close_out(state.be, state.voice);
191 + audio_be_set_active_out(state.be, state.voice, false);
192 + audio_be_close_out(state.be, state.voice);
193 }
194
195 static void test_audio_prio_list(void)
@@ -224,15 +224,15 @@ static void test_audio_out_active_state(void)
224 be = get_test_audio_backend();
225 voice = open_test_voice_out(be, "test-active", NULL, dummy_audio_callback);
226
227 - g_assert_false(AUD_is_active_out(be, voice));
227 + g_assert_false(audio_be_is_active_out(be, voice));
228
229 - AUD_set_active_out(be, voice, true);
230 - g_assert_true(AUD_is_active_out(be, voice));
229 + audio_be_set_active_out(be, voice, true);
230 + g_assert_true(audio_be_is_active_out(be, voice));
231
232 - AUD_set_active_out(be, voice, false);
233 - g_assert_false(AUD_is_active_out(be, voice));
232 + audio_be_set_active_out(be, voice, false);
233 + g_assert_false(audio_be_is_active_out(be, voice));
234
235 - AUD_close_out(be, voice);
235 + audio_be_close_out(be, voice);
236 }
237
238 static void test_audio_out_buffer_size(void)
@@ -244,13 +244,13 @@ static void test_audio_out_buffer_size(void)
244 be = get_test_audio_backend();
245 voice = open_test_voice_out(be, "test-buffer", NULL, dummy_audio_callback);
246
247 - buffer_size = AUD_get_buffer_size_out(be, voice);
247 + buffer_size = audio_be_get_buffer_size_out(be, voice);
248 g_test_message("Buffer size: %d bytes", buffer_size);
249 g_assert_cmpint(buffer_size, >, 0);
250
251 - AUD_close_out(be, voice);
251 + audio_be_close_out(be, voice);
252
253 - g_assert_cmpint(AUD_get_buffer_size_out(NULL, NULL), ==, 0);
253 + g_assert_cmpint(audio_be_get_buffer_size_out(be, NULL), ==, 0);
254 }
255
256 static void test_audio_out_volume(void)
@@ -263,15 +263,15 @@ static void test_audio_out_volume(void)
263 voice = open_test_voice_out(be, "test-volume", NULL, dummy_audio_callback);
264
265 vol = (Volume){ .mute = false, .channels = 2, .vol = {255, 255} };
266 - AUD_set_volume_out(be, voice, &vol);
266 + audio_be_set_volume_out(be, voice, &vol);
267
268 vol = (Volume){ .mute = true, .channels = 2, .vol = {255, 255} };
269 - AUD_set_volume_out(be, voice, &vol);
269 + audio_be_set_volume_out(be, voice, &vol);
270
271 vol = (Volume){ .mute = false, .channels = 2, .vol = {128, 128} };
272 - AUD_set_volume_out(be, voice, &vol);
272 + audio_be_set_volume_out(be, voice, &vol);
273
274 - AUD_close_out(be, voice);
274 + audio_be_close_out(be, voice);
275 }
276
277 static void test_audio_in_active_state(void)
@@ -286,15 +286,15 @@ static void test_audio_in_active_state(void)
286 return;
287 }
288
289 - g_assert_false(AUD_is_active_in(be, voice));
289 + g_assert_false(audio_be_is_active_in(be, voice));
290
291 - AUD_set_active_in(be, voice, true);
292 - g_assert_true(AUD_is_active_in(be, voice));
291 + audio_be_set_active_in(be, voice, true);
292 + g_assert_true(audio_be_is_active_in(be, voice));
293
294 - AUD_set_active_in(be, voice, false);
295 - g_assert_false(AUD_is_active_in(be, voice));
294 + audio_be_set_active_in(be, voice, false);
295 + g_assert_false(audio_be_is_active_in(be, voice));
296
297 - AUD_close_in(be, voice);
297 + audio_be_close_in(be, voice);
298 }
299
300 static void test_audio_in_volume(void)
@@ -311,12 +311,12 @@ static void test_audio_in_volume(void)
311 }
312
313 vol = (Volume){ .mute = false, .channels = 2, .vol = {255, 255} };
314 - AUD_set_volume_in(be, voice, &vol);
314 + audio_be_set_volume_in(be, voice, &vol);
315
316 vol = (Volume){ .mute = true, .channels = 2, .vol = {255, 255} };
317 - AUD_set_volume_in(be, voice, &vol);
317 + audio_be_set_volume_in(be, voice, &vol);
318
319 - AUD_close_in(be, voice);
319 + audio_be_close_in(be, voice);
320 }
321
322
@@ -416,7 +416,7 @@ static void test_audio_capture(void)
416 state.captured_bytes = 0;
417 state.capture_buffer_size = CAPTURE_BUFFER_SIZE;
418
419 - cap = AUD_add_capture(be, &as, &ops, &state);
419 + cap = audio_be_add_capture(be, &as, &ops, &state);
420 g_assert_nonnull(cap);
421
422 sine_state.be = be;
@@ -427,7 +427,7 @@ static void test_audio_capture(void)
427 &sine_state, test_sine_callback);
428 sine_state.voice = voice;
429
430 - AUD_set_active_out(be, voice, true);
430 + audio_be_set_active_out(be, voice, true);
431
432 start_time = g_get_monotonic_time();
433 while (sine_state.frames_written < sine_state.total_frames ||
@@ -472,10 +472,10 @@ static void test_audio_capture(void)
472 g_assert_cmpfloat(match_ratio, >=, 0.9);
473 }
474
475 - AUD_set_active_out(be, voice, false);
476 - AUD_close_out(be, voice);
475 + audio_be_set_active_out(be, voice, false);
476 + audio_be_close_out(be, voice);
477
478 - AUD_del_capture(be, cap, &state);
478 + audio_be_del_capture(be, cap, &state);
479 g_assert_true(state.destroy_called);
480
481 g_free(state.captured_samples);
@@ -486,24 +486,24 @@ static void test_audio_null_handling(void)
486 AudioBackend *be = get_test_audio_backend();
487 uint8_t buffer[64];
488
489 - /* AUD_is_active_out/in(NULL) should return false */
490 - g_assert_false(AUD_is_active_out(be, NULL));
491 - g_assert_false(AUD_is_active_in(be, NULL));
489 + /* audio_be_is_active_out/in(NULL) should return false */
490 + g_assert_false(audio_be_is_active_out(be, NULL));
491 + g_assert_false(audio_be_is_active_in(be, NULL));
492
493 - /* AUD_get_buffer_size_out(NULL) should return 0 */
494 - g_assert_cmpint(AUD_get_buffer_size_out(be, NULL), ==, 0);
493 + /* audio_be_get_buffer_size_out(NULL) should return 0 */
494 + g_assert_cmpint(audio_be_get_buffer_size_out(be, NULL), ==, 0);
495
496 - /* AUD_write/read(NULL, ...) should return size (no-op) */
497 - g_assert_cmpuint(AUD_write(be, NULL, buffer, sizeof(buffer)), ==,
496 + /* audio_be_write/read(NULL, ...) should return size (no-op) */
497 + g_assert_cmpuint(audio_be_write(be, NULL, buffer, sizeof(buffer)), ==,
498 sizeof(buffer));
499 - g_assert_cmpuint(AUD_read(be, NULL, buffer, sizeof(buffer)), ==,
499 + g_assert_cmpuint(audio_be_read(be, NULL, buffer, sizeof(buffer)), ==,
500 sizeof(buffer));
501
502 /* These should not crash */
503 - AUD_set_active_out(be, NULL, true);
504 - AUD_set_active_out(be, NULL, false);
505 - AUD_set_active_in(be, NULL, true);
506 - AUD_set_active_in(be, NULL, false);
503 + audio_be_set_active_out(be, NULL, true);
504 + audio_be_set_active_out(be, NULL, false);
505 + audio_be_set_active_in(be, NULL, true);
506 + audio_be_set_active_in(be, NULL, false);
507 }
508
509 static void test_audio_multiple_voices(void)
@@ -517,23 +517,23 @@ static void test_audio_multiple_voices(void)
517 out2 = open_test_voice_out(be, "test-multi-out2", NULL, dummy_audio_callback);
518 in1 = open_test_voice_in(be, "test-multi-in1", NULL, dummy_audio_callback);
519
520 - AUD_set_active_out(be, out1, true);
521 - AUD_set_active_out(be, out2, true);
522 - AUD_set_active_in(be, in1, true);
520 + audio_be_set_active_out(be, out1, true);
521 + audio_be_set_active_out(be, out2, true);
522 + audio_be_set_active_in(be, in1, true);
523
524 - g_assert_true(AUD_is_active_out(be, out1));
525 - g_assert_true(AUD_is_active_out(be, out2));
524 + g_assert_true(audio_be_is_active_out(be, out1));
525 + g_assert_true(audio_be_is_active_out(be, out2));
526 if (in1) {
527 - g_assert_true(AUD_is_active_in(be, in1));
527 + g_assert_true(audio_be_is_active_in(be, in1));
528 }
529
530 - AUD_set_active_out(be, out1, false);
531 - AUD_set_active_out(be, out2, false);
532 - AUD_set_active_in(be, in1, false);
530 + audio_be_set_active_out(be, out1, false);
531 + audio_be_set_active_out(be, out2, false);
532 + audio_be_set_active_in(be, in1, false);
533
534 - AUD_close_in(be, in1);
535 - AUD_close_out(be, out2);
536 - AUD_close_out(be, out1);
534 + audio_be_close_in(be, in1);
535 + audio_be_close_out(be, out2);
536 + audio_be_close_out(be, out1);
537 }
538
539 int main(int argc, char **argv)
ui/vnc.c
+2 -2
@@ -1280,7 +1280,7 @@ static void audio_add(VncState *vs)
1280 ops.destroy = audio_capture_destroy;
1281 ops.capture = audio_capture;
1282
1283 - vs->audio_cap = AUD_add_capture(vs->vd->audio_be, &vs->as, &ops, vs);
1283 + vs->audio_cap = audio_be_add_capture(vs->vd->audio_be, &vs->as, &ops, vs);
1284 if (!vs->audio_cap) {
1285 error_report("Failed to add audio capture");
1286 }
@@ -1289,7 +1289,7 @@ static void audio_add(VncState *vs)
1289 static void audio_del(VncState *vs)
1290 {
1291 if (vs->audio_cap) {
1292 - AUD_del_capture(vs->vd->audio_be, vs->audio_cap, vs);
1292 + audio_be_del_capture(vs->vd->audio_be, vs->audio_cap, vs);
1293 vs->audio_cap = NULL;
1294 }
1295 }