From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z58Hc-0005TM-C8 for qemu-devel@nongnu.org; Wed, 17 Jun 2015 04:01:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z58HS-000495-3W for qemu-devel@nongnu.org; Wed, 17 Jun 2015 04:01:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58642) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z58HR-00048p-Qu for qemu-devel@nongnu.org; Wed, 17 Jun 2015 04:01:05 -0400 From: Markus Armbruster References: <9d0c3109b26c78d7be59f54527255f2af81bc68b.1434458391.git.DirtY.iCE.hu@gmail.com> Date: Wed, 17 Jun 2015 10:01:01 +0200 In-Reply-To: <9d0c3109b26c78d7be59f54527255f2af81bc68b.1434458391.git.DirtY.iCE.hu@gmail.com> (=?utf-8?B?IkvFkXbDoWfDsywgWm9sdMOhbiIncw==?= message of "Tue, 16 Jun 2015 14:49:08 +0200") Message-ID: <87a8vyg3wi.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 5/6] audio: use qapi AudioFormat instead of audfmt_e List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?B?S8WRdsOhZ8OzLCBab2x0w6Fu?= Cc: Peter Maydell , Michael Walle , qemu-devel@nongnu.org, Gerd Hoffmann "K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n" writes: > I had to include an enum for audio sampling formats into qapi, but that m= eant > 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. [...] > diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c > index 6315b2d..4d38f5d 100644 > --- a/audio/alsaaudio.c > +++ b/audio/alsaaudio.c [...] > @@ -639,19 +639,22 @@ static int alsa_open (int in, struct alsa_params_re= q *req, > bytes_per_sec =3D freq << (nchannels =3D=3D 2); >=20=20 > switch (obt->fmt) { > - case AUD_FMT_S8: > - case AUD_FMT_U8: > + case AUDIO_FORMAT_S8: > + case AUDIO_FORMAT_U8: > break; >=20=20 > - case AUD_FMT_S16: > - case AUD_FMT_U16: > + case AUDIO_FORMAT_S16: > + case AUDIO_FORMAT_U16: > bytes_per_sec <<=3D 1; > break; >=20=20 > - case AUD_FMT_S32: > - case AUD_FMT_U32: > + case AUDIO_FORMAT_S32: > + case AUDIO_FORMAT_U32: > bytes_per_sec <<=3D 2; > break; > + > + case AUDIO_FORMAT_MAX: > + break; Can this happen? > } >=20=20 > threshold =3D (conf->threshold * bytes_per_sec) / 1000; > diff --git a/audio/audio.c b/audio/audio.c > index 5be4b15..112b57b 100644 > --- a/audio/audio.c > +++ b/audio/audio.c > @@ -75,7 +75,7 @@ static struct { > .settings =3D { > .freq =3D 44100, > .nchannels =3D 2, > - .fmt =3D AUD_FMT_S16, > + .fmt =3D AUDIO_FORMAT_S16, > .endianness =3D AUDIO_HOST_ENDIANNESS, > } > }, > @@ -87,7 +87,7 @@ static struct { > .settings =3D { > .freq =3D 44100, > .nchannels =3D 2, > - .fmt =3D AUD_FMT_S16, > + .fmt =3D AUDIO_FORMAT_S16, > .endianness =3D AUDIO_HOST_ENDIANNESS, > } > }, > @@ -219,58 +219,61 @@ static char *audio_alloc_prefix (const char *s) > return r; > } >=20=20 > -static const char *audio_audfmt_to_string (audfmt_e fmt) > +static const char *audio_audfmt_to_string (AudioFormat fmt) > { > switch (fmt) { > - case AUD_FMT_U8: > + case AUDIO_FORMAT_U8: > return "U8"; >=20=20 > - case AUD_FMT_U16: > + case AUDIO_FORMAT_U16: > return "U16"; >=20=20 > - case AUD_FMT_S8: > + case AUDIO_FORMAT_S8: > return "S8"; >=20=20 > - case AUD_FMT_S16: > + case AUDIO_FORMAT_S16: > return "S16"; >=20=20 > - case AUD_FMT_U32: > + case AUDIO_FORMAT_U32: > return "U32"; >=20=20 > - case AUD_FMT_S32: > + case AUDIO_FORMAT_S32: > return "S32"; > + > + case AUDIO_FORMAT_MAX: default: would be more defensive. Same elsewhere. > + abort(); > } >=20=20 > dolog ("Bogus audfmt %d returning S16\n", fmt); > return "S16"; > } [...]