I had to include an enum for audio sampling formats into qapi, but that
meant duplicating the audfmt_e enum. This patch replaces audfmt_e and
associated values with the qapi generated AudioFormat enum.
This patch is mostly a search-and-replace, except for switches where the
qapi generated AUDIO_FORMAT_MAX caused problems.
Signed-off-by: Kővágó, Zoltán
---
audio/audio.h | 12 +
audio/alsaaudio.c | 53 +++--
audio/audio.c | 97 +--
audio/audio_win_int.c | 18
audio/ossaudio.c | 30 ++--
audio/paaudio.c | 28 +--
audio/sdlaudio.c | 26 +--
audio/spiceaudio.c| 4 +-
audio/wavaudio.c | 17 ---
audio/wavcapture.c| 2 +-
hw/arm/omap2.c| 2 +-
hw/audio/ac97.c | 2 +-
hw/audio/adlib.c | 2 +-
hw/audio/cs4231a.c| 6 +--
hw/audio/es1370.c | 4 +-
hw/audio/gus.c| 2 +-
hw/audio/hda-codec.c | 18
hw/audio/lm4549.c | 6 +--
hw/audio/milkymist-ac97.c | 2 +-
hw/audio/pcspk.c | 2 +-
hw/audio/sb16.c | 14 +++---
hw/audio/wm8750.c | 6 +--
hw/display/xlnx_dp.c | 2 +-
hw/input/tsc210x.c| 2 +-
hw/usb/dev-audio.c| 2 +-
ui/vnc.c | 26 +--
26 files changed, 196 insertions(+), 189 deletions(-)
diff --git a/audio/audio.h b/audio/audio.h
index f4339a185e..02f29a3b3e 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -26,18 +26,10 @@
#define QEMU_AUDIO_H
#include "qemu/queue.h"
+#include "qapi/qapi-types-audio.h"
typedef void (*audio_callback_fn) (void *opaque, int avail);
-typedef enum {
-AUD_FMT_U8,
-AUD_FMT_S8,
-AUD_FMT_U16,
-AUD_FMT_S16,
-AUD_FMT_U32,
-AUD_FMT_S32
-} audfmt_e;
-
#ifdef HOST_WORDS_BIGENDIAN
#define AUDIO_HOST_ENDIANNESS 1
#else
@@ -47,7 +39,7 @@ typedef enum {
struct audsettings {
int freq;
int nchannels;
-audfmt_e fmt;
+AudioFormat fmt;
int endianness;
};
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 635be73bf4..5bd034267f 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -87,7 +87,7 @@ struct alsa_params_req {
struct alsa_params_obt {
int freq;
-audfmt_e fmt;
+AudioFormat fmt;
int endianness;
int nchannels;
snd_pcm_uframes_t samples;
@@ -294,16 +294,16 @@ static int alsa_write (SWVoiceOut *sw, void *buf, int len)
return audio_pcm_sw_write (sw, buf, len);
}
-static snd_pcm_format_t aud_to_alsafmt (audfmt_e fmt, int endianness)
+static snd_pcm_format_t aud_to_alsafmt (AudioFormat fmt, int endianness)
{
switch (fmt) {
-case AUD_FMT_S8:
+case AUDIO_FORMAT_S8:
return SND_PCM_FORMAT_S8;
-case AUD_FMT_U8:
+case AUDIO_FORMAT_U8:
return SND_PCM_FORMAT_U8;
-case AUD_FMT_S16:
+case AUDIO_FORMAT_S16:
if (endianness) {
return SND_PCM_FORMAT_S16_BE;
}
@@ -311,7 +311,7 @@ static snd_pcm_format_t aud_to_alsafmt (audfmt_e fmt, int
endianness)
return SND_PCM_FORMAT_S16_LE;
}
-case AUD_FMT_U16:
+case AUDIO_FORMAT_U16:
if (endianness) {
return SND_PCM_FORMAT_U16_BE;
}
@@ -319,7 +319,7 @@ static snd_pcm_format_t aud_to_alsafmt (audfmt_e fmt, int
endianness)
return SND_PCM_FORMAT_U16_LE;
}
-case AUD_FMT_S32:
+case AUDIO_FORMAT_S32:
if (endianness) {
return SND_PCM_FORMAT_S32_BE;
}
@@ -327,7 +327,7 @@ static snd_pcm_format_t aud_to_alsafmt (audfmt_e fmt, int
endianness)
return SND_PCM_FORMAT_S32_LE;
}
-case AUD_FMT_U32:
+case AUDIO_FORMAT_U32:
if (endianness) {
return SND_PCM_FORMAT_U32_BE;
}
@@ -344,58 +344,58 @@ static snd_pcm_format_t aud_to_alsafmt (audfmt_e fmt, int
endianness)
}
}
-static int alsa_to_audfmt (snd_pcm_format_t alsafmt, audfmt_e *fmt,
+static int alsa_to_audfmt (snd_pcm_format_t alsafmt, AudioFormat *fmt,
int *endianness)
{
switch (alsafmt) {
case SND_PCM_FORMAT_S8:
*endianness = 0;
-*fmt = AUD_FMT_S8;
+*fmt = AUDIO_FORMAT_S8;
break;
case SND_PCM_FORMAT_U8:
*endianness = 0;
-*fmt = AUD_FMT_U8;
+*fmt = AUDIO_FORMAT_U8;
break;
case SND_PCM_FORMAT_S16_LE:
*endianness = 0;
-*fmt = AUD_FMT_S16;
+*fmt = AUDIO_FORMAT_S16;
break;
case SND_PCM_FORMAT_U16_LE:
*endianness = 0;
-*fmt = AUD_FMT_U16;
+*fmt = AUDIO_FORMAT_U16;
break;
case SND_PCM_FORMAT_S16_BE:
*endianness = 1;
-*fmt = AUD_FMT_S16;
+*fmt = AUDIO_FORMAT_S16;
break;
case SND_PCM_FORMAT_U16_BE:
*endianness = 1;
-*fmt = AUD_FMT_U16;
+*fmt =
