audio: remove AUDIO_HOST_ENDIANNESS
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
parent
914cb0878f
commit
eaeafe3074
7 changed files with 9 additions and 15 deletions
|
|
@ -274,7 +274,7 @@ static int audio_pcm_info_eq (struct audio_pcm_info *info, struct audsettings *a
|
|||
&& info->is_signed == is_signed
|
||||
&& info->is_float == is_float
|
||||
&& info->bits == bits
|
||||
&& info->swap_endianness == (as->endianness != AUDIO_HOST_ENDIANNESS);
|
||||
&& info->swap_endianness == (as->endianness != HOST_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as)
|
||||
|
|
@ -320,7 +320,7 @@ void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as)
|
|||
info->nchannels = as->nchannels;
|
||||
info->bytes_per_frame = as->nchannels * mul;
|
||||
info->bytes_per_second = info->freq * info->bytes_per_frame;
|
||||
info->swap_endianness = (as->endianness != AUDIO_HOST_ENDIANNESS);
|
||||
info->swap_endianness = (as->endianness != HOST_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len)
|
||||
|
|
@ -2179,7 +2179,7 @@ audsettings audiodev_to_audsettings(AudiodevPerDirectionOptions *pdo)
|
|||
.freq = pdo->frequency,
|
||||
.nchannels = pdo->channels,
|
||||
.fmt = pdo->format,
|
||||
.endianness = AUDIO_HOST_ENDIANNESS,
|
||||
.endianness = HOST_BIG_ENDIAN,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,12 +31,6 @@
|
|||
|
||||
typedef void (*audio_callback_fn) (void *opaque, int avail);
|
||||
|
||||
#if HOST_BIG_ENDIAN
|
||||
#define AUDIO_HOST_ENDIANNESS 1
|
||||
#else
|
||||
#define AUDIO_HOST_ENDIANNESS 0
|
||||
#endif
|
||||
|
||||
typedef struct audsettings {
|
||||
int freq;
|
||||
int nchannels;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ static int line_out_init(HWVoiceOut *hw, struct audsettings *as,
|
|||
#endif
|
||||
settings.nchannels = SPICE_INTERFACE_PLAYBACK_CHAN;
|
||||
settings.fmt = AUDIO_FORMAT_S16;
|
||||
settings.endianness = AUDIO_HOST_ENDIANNESS;
|
||||
settings.endianness = HOST_BIG_ENDIAN;
|
||||
|
||||
audio_pcm_init_info (&hw->info, &settings);
|
||||
hw->samples = LINE_OUT_SAMPLES;
|
||||
|
|
@ -218,7 +218,7 @@ static int line_in_init(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
|
|||
#endif
|
||||
settings.nchannels = SPICE_INTERFACE_RECORD_CHAN;
|
||||
settings.fmt = AUDIO_FORMAT_S16;
|
||||
settings.endianness = AUDIO_HOST_ENDIANNESS;
|
||||
settings.endianness = HOST_BIG_ENDIAN;
|
||||
|
||||
audio_pcm_init_info (&hw->info, &settings);
|
||||
hw->samples = LINE_IN_SAMPLES;
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
|
|||
as.freq = s->freq;
|
||||
as.nchannels = SHIFT;
|
||||
as.fmt = AUDIO_FORMAT_S16;
|
||||
as.endianness = AUDIO_HOST_ENDIANNESS;
|
||||
as.endianness = HOST_BIG_ENDIAN;
|
||||
|
||||
s->voice = AUD_open_out (
|
||||
&s->card,
|
||||
|
|
|
|||
|
|
@ -650,7 +650,7 @@ static void asc_realize(DeviceState *dev, Error **errp)
|
|||
as.freq = ASC_FREQ;
|
||||
as.nchannels = 2;
|
||||
as.fmt = AUDIO_FORMAT_U8;
|
||||
as.endianness = AUDIO_HOST_ENDIANNESS;
|
||||
as.endianness = HOST_BIG_ENDIAN;
|
||||
|
||||
s->voice = AUD_open_out(&s->card, s->voice, "asc.out", s, asc_out_cb,
|
||||
&as);
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
|
|||
s->tab = ALawDecompressTable;
|
||||
x_law:
|
||||
as.fmt = AUDIO_FORMAT_S16;
|
||||
as.endianness = AUDIO_HOST_ENDIANNESS;
|
||||
as.endianness = HOST_BIG_ENDIAN;
|
||||
s->shift = as.nchannels == 2;
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
|
|||
as.freq = s->freq;
|
||||
as.nchannels = 2;
|
||||
as.fmt = AUDIO_FORMAT_S16;
|
||||
as.endianness = AUDIO_HOST_ENDIANNESS;
|
||||
as.endianness = HOST_BIG_ENDIAN;
|
||||
|
||||
s->voice = AUD_open_out (
|
||||
&s->card,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue