From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KGfIa-0004tJ-UC for qemu-devel@nongnu.org; Wed, 09 Jul 2008 15:25:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KGfIZ-0004sk-OQ for qemu-devel@nongnu.org; Wed, 09 Jul 2008 15:25:56 -0400 Received: from [199.232.76.173] (port=51677 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KGfIZ-0004sZ-Eb for qemu-devel@nongnu.org; Wed, 09 Jul 2008 15:25:55 -0400 Received: from savannah.gnu.org ([199.232.41.3]:49067 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KGfIY-0001kc-Mg for qemu-devel@nongnu.org; Wed, 09 Jul 2008 15:25:55 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KGfI8-0004xQ-QY for qemu-devel@nongnu.org; Wed, 09 Jul 2008 19:25:28 +0000 Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KGfI8-0004xI-J5 for qemu-devel@nongnu.org; Wed, 09 Jul 2008 19:25:28 +0000 MIME-Version: 1.0 Errors-To: malc Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: malc Message-Id: Date: Wed, 09 Jul 2008 19:25:28 +0000 Subject: [Qemu-devel] [4864] Warn about rejected buffer/period size/ time when it was specified by the user Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4864 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4864 Author: malc Date: 2008-07-09 19:25:28 +0000 (Wed, 09 Jul 2008) Log Message: ----------- Warn about rejected buffer/period size/time when it was specified by the user Modified Paths: -------------- trunk/audio/alsaaudio.c Modified: trunk/audio/alsaaudio.c =================================================================== --- trunk/audio/alsaaudio.c 2008-07-09 19:25:24 UTC (rev 4863) +++ trunk/audio/alsaaudio.c 2008-07-09 19:25:28 UTC (rev 4864) @@ -67,6 +67,7 @@ snd_pcm_format_t fmt; int nchannels; int size_in_usec; + int override_mask; unsigned int buffer_size; unsigned int period_size; }; @@ -364,7 +365,7 @@ goto err; } - if (obt - req->buffer_size) + if ((req->override_mask & 2) && (obt - req->buffer_size)) dolog ("Requested buffer %s %u was rejected, using %lu\n", size_in_usec ? "time" : "size", req->buffer_size, obt); } @@ -403,7 +404,7 @@ goto err; } - if (obt - req->period_size) + if ((req->override_mask & 1) && (obt - req->period_size)) dolog ("Requested period %s %u was rejected, using %lu\n", size_in_usec ? "time" : "size", req->period_size, obt); } @@ -624,6 +625,8 @@ req.period_size = conf.period_size_out; req.buffer_size = conf.buffer_size_out; req.size_in_usec = conf.size_in_usec_out; + req.override_mask = !!conf.period_size_out_overridden + | (!!conf.buffer_size_out_overridden << 1); if (alsa_open (0, &req, &obt, &handle)) { return -1; @@ -702,6 +705,8 @@ req.period_size = conf.period_size_in; req.buffer_size = conf.buffer_size_in; req.size_in_usec = conf.size_in_usec_in; + req.override_mask = !!conf.period_size_in_overridden + | (!!conf.buffer_size_in_overridden << 1); if (alsa_open (1, &req, &obt, &handle)) { return -1;