From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5B9r-0008To-KU for qemu-devel@nongnu.org; Wed, 17 Jun 2015 07:05:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5B9n-0006yD-JW for qemu-devel@nongnu.org; Wed, 17 Jun 2015 07:05:27 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:38102) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5B9n-0006xz-9i for qemu-devel@nongnu.org; Wed, 17 Jun 2015 07:05:23 -0400 Received: by wibdq8 with SMTP id dq8so49184995wib.1 for ; Wed, 17 Jun 2015 04:05:22 -0700 (PDT) From: "=?UTF-8?B?S8WRdsOhZ8OzIFpvbHTDoW4=?=" Message-ID: <55815474.6060909@gmail.com> Date: Wed, 17 Jun 2015 13:05:24 +0200 MIME-Version: 1.0 References: <9d0c3109b26c78d7be59f54527255f2af81bc68b.1434458391.git.DirtY.iCE.hu@gmail.com> <87a8vyg3wi.fsf@blackfin.pond.sub.org> In-Reply-To: <87a8vyg3wi.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit 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: Markus Armbruster Cc: Peter Maydell , Michael Walle , qemu-devel@nongnu.org, Gerd Hoffmann 2015-06-17 10:01 keltezéssel, Markus Armbruster írta: > "Kővágó, Zoltán" writes: > >> 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. > [...] >> 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_req *req, >> bytes_per_sec = freq << (nchannels == 2); >> >> switch (obt->fmt) { >> - case AUD_FMT_S8: >> - case AUD_FMT_U8: >> + case AUDIO_FORMAT_S8: >> + case AUDIO_FORMAT_U8: >> break; >> >> - case AUD_FMT_S16: >> - case AUD_FMT_U16: >> + case AUDIO_FORMAT_S16: >> + case AUDIO_FORMAT_U16: >> bytes_per_sec <<= 1; >> break; >> >> - case AUD_FMT_S32: >> - case AUD_FMT_U32: >> + case AUDIO_FORMAT_S32: >> + case AUDIO_FORMAT_U32: >> bytes_per_sec <<= 2; >> break; >> + >> + case AUDIO_FORMAT_MAX: >> + break; > > Can this happen? Not under normal circumstances, but gcc warns otherwise. >> } >> >> threshold = (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 = { >> .freq = 44100, >> .nchannels = 2, >> - .fmt = AUD_FMT_S16, >> + .fmt = AUDIO_FORMAT_S16, >> .endianness = AUDIO_HOST_ENDIANNESS, >> } >> }, >> @@ -87,7 +87,7 @@ static struct { >> .settings = { >> .freq = 44100, >> .nchannels = 2, >> - .fmt = AUD_FMT_S16, >> + .fmt = AUDIO_FORMAT_S16, >> .endianness = AUDIO_HOST_ENDIANNESS, >> } >> }, >> @@ -219,58 +219,61 @@ static char *audio_alloc_prefix (const char *s) >> return r; >> } >> >> -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"; >> >> - case AUD_FMT_U16: >> + case AUDIO_FORMAT_U16: >> return "U16"; >> >> - case AUD_FMT_S8: >> + case AUDIO_FORMAT_S8: >> return "S8"; >> >> - case AUD_FMT_S16: >> + case AUDIO_FORMAT_S16: >> return "S16"; >> >> - case AUD_FMT_U32: >> + case AUDIO_FORMAT_U32: >> return "U32"; >> >> - case AUD_FMT_S32: >> + case AUDIO_FORMAT_S32: >> return "S32"; >> + >> + case AUDIO_FORMAT_MAX: > > default: would be more defensive. Same elsewhere. Ok, I'll change them to default. >> + abort(); >> } >> >> dolog ("Bogus audfmt %d returning S16\n", fmt); >> return "S16"; >> } > [...] >