From patchwork Tue Sep 13 12:52:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 114485 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E6BAFB70D6 for ; Tue, 13 Sep 2011 22:53:25 +1000 (EST) Received: from localhost ([::1]:45740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R3SUM-0000A1-GW for incoming@patchwork.ozlabs.org; Tue, 13 Sep 2011 08:53:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R3SU6-0008Ms-OJ for qemu-devel@nongnu.org; Tue, 13 Sep 2011 08:53:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R3SU2-00072q-Ol for qemu-devel@nongnu.org; Tue, 13 Sep 2011 08:53:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49443) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R3SU2-00072f-Cw for qemu-devel@nongnu.org; Tue, 13 Sep 2011 08:53:02 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8DCr1td029329 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 13 Sep 2011 08:53:01 -0400 Received: from neno.neno (ovpn-116-40.ams2.redhat.com [10.36.116.40]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8DCqw8A004603; Tue, 13 Sep 2011 08:53:00 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 13 Sep 2011 14:52:41 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] vawaudio: port to FILE* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org QEMUFile * is only intended for Migration. Using it for anything else just adds pain and a layer of buffers for no good reason. Signed-off-by: Juan Quintela --- audio/wavaudio.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/audio/wavaudio.c b/audio/wavaudio.c index aed1817..837b86d 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -30,7 +30,7 @@ typedef struct WAVVoiceOut { HWVoiceOut hw; - QEMUFile *f; + FILE *f; int64_t old_ticks; void *pcm_buf; int total_samples; @@ -76,7 +76,10 @@ static int wav_run_out (HWVoiceOut *hw, int live) dst = advance (wav->pcm_buf, rpos << hw->info.shift); hw->clip (dst, src, convert_samples); - qemu_put_buffer (wav->f, dst, convert_samples << hw->info.shift); + if (fwrite (dst, convert_samples << hw->info.shift, 1, wav->f) != + convert_samples << hw->info.shift) { + printf("wav_run_out: short write\n"); + } rpos = (rpos + convert_samples) % hw->samples; samples -= convert_samples; @@ -152,7 +155,7 @@ static int wav_init_out (HWVoiceOut *hw, struct audsettings *as) le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4); le_store (hdr + 32, 1 << (bits16 + stereo), 2); - wav->f = qemu_fopen (conf.wav_path, "wb"); + wav->f = fopen (conf.wav_path, "wb"); if (!wav->f) { dolog ("Failed to open wave file `%s'\nReason: %s\n", conf.wav_path, strerror (errno)); @@ -161,7 +164,10 @@ static int wav_init_out (HWVoiceOut *hw, struct audsettings *as) return -1; } - qemu_put_buffer (wav->f, hdr, sizeof (hdr)); + if (fwrite (hdr, sizeof (hdr), 1, wav->f) != sizeof (hdr)) { + printf("wav_init_out: short write\n"); + return -1; + } return 0; } @@ -180,13 +186,17 @@ static void wav_fini_out (HWVoiceOut *hw) le_store (rlen, rifflen, 4); le_store (dlen, datalen, 4); - qemu_fseek (wav->f, 4, SEEK_SET); - qemu_put_buffer (wav->f, rlen, 4); + fseek (wav->f, 4, SEEK_SET); + if (fwrite (rlen, 1, 4, wav->f) != 4) { + printf("wav_fini_out: short write\n"); + } - qemu_fseek (wav->f, 32, SEEK_CUR); - qemu_put_buffer (wav->f, dlen, 4); + fseek (wav->f, 32, SEEK_CUR); + if (fwrite (dlen, 1, 4, wav->f) != 4) { + printf("wav_fini_out: short write\n"); + } - qemu_fclose (wav->f); + fclose (wav->f); wav->f = NULL; g_free (wav->pcm_buf);