From patchwork Fri Jun 12 12:33:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 483538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C11BD140562 for ; Fri, 12 Jun 2015 22:33:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=RW4f3iht; dkim-atps=neutral Received: from localhost ([::1]:51032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3O9g-0008G3-M2 for incoming@patchwork.ozlabs.org; Fri, 12 Jun 2015 08:33:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3O93-0007EN-4r for qemu-devel@nongnu.org; Fri, 12 Jun 2015 08:33:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3O90-0004D6-OZ for qemu-devel@nongnu.org; Fri, 12 Jun 2015 08:33:13 -0400 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:33702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3O90-0004Cr-E7 for qemu-devel@nongnu.org; Fri, 12 Jun 2015 08:33:10 -0400 Received: by wiwd19 with SMTP id d19so17332086wiw.0 for ; Fri, 12 Jun 2015 05:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=melRZJIpR43RsbDN8Ctm4h5/YlRoIH4++HrDW3VOun4=; b=RW4f3ihtwxsAhAXrbAJ7jeAZ7IaMlQNvhiX+BUO6o04Ol28tdXB39uad++xD5Jcjpo /WRFQnMlDqZR+K2GIIMMCGG0UIHbC8H3Ak+wZ3Vk8AHrvOu4Fm1cpv7FiKcyqhd9tWp7 FHpwHJcFpRa4QGcWW5oVkmYR6iFMz6CpGAOsxczJAy2NCEEgeE/FWJc5zipkV9pYbPFa qhgPK/84ee3vmzz6wH+BwMZqqJBGltEkLQxDTDu4832/EZCMTI6r2eF80+TD4nzI4dfG D4bUXrYKotwo8QaM5jv0uv8HuYVLVskcMKmUT/dWjZCCb/+EHMHf/y0sSnkERdMvgtEs pVkA== X-Received: by 10.180.104.167 with SMTP id gf7mr6632931wib.3.1434112389839; Fri, 12 Jun 2015 05:33:09 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (94-21-76-230.pool.digikabel.hu. [94.21.76.230]) by mx.google.com with ESMTPSA id m2sm2569153wiy.7.2015.06.12.05.33.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jun 2015 05:33:09 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Fri, 12 Jun 2015 14:33:03 +0200 Message-Id: <634461d71ca0c1fe596a4ab599959028acdbcc5f.1434111578.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22e Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 02/12] audio: remove plive 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 It was useless even 3 years ago, so it can probably safely go away: https://lists.nongnu.org/archive/html/qemu-devel/2012-03/msg02427.html Signed-off-by: Kővágó, Zoltán --- audio/audio.c | 12 ------------ audio/audio_template.h | 41 ----------------------------------------- 2 files changed, 53 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index cb1cba9..5be4b15 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -30,7 +30,6 @@ #define AUDIO_CAP "audio" #include "audio_int.h" -/* #define DEBUG_PLIVE */ /* #define DEBUG_LIVE */ /* #define DEBUG_OUT */ /* #define DEBUG_CAPTURE */ @@ -66,7 +65,6 @@ static struct { int hertz; int64_t ticks; } period; - int plive; int try_poll_in; int try_poll_out; } conf = { @@ -95,7 +93,6 @@ static struct { }, .period = { .hertz = 100 }, - .plive = 0, .try_poll_in = 1, .try_poll_out = 1, }; @@ -1443,9 +1440,6 @@ static void audio_run_out (AudioState *s) while (sw) { sw1 = sw->entries.le_next; if (!sw->active && !sw->callback.fn) { -#ifdef DEBUG_PLIVE - dolog ("Finishing with old voice\n"); -#endif audio_close_out (sw); } sw = sw1; @@ -1637,12 +1631,6 @@ static struct audio_option audio_options[] = { .valp = &conf.period.hertz, .descr = "Timer period in HZ (0 - use lowest possible)" }, - { - .name = "PLIVE", - .tag = AUD_OPT_BOOL, - .valp = &conf.plive, - .descr = "(undocumented)" - }, { /* End of list */ } }; diff --git a/audio/audio_template.h b/audio/audio_template.h index f716d97..99b27b2 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -398,10 +398,6 @@ SW *glue (AUD_open_, TYPE) ( ) { AudioState *s = &glob_audio_state; -#ifdef DAC - int live = 0; - SW *old_sw = NULL; -#endif if (audio_bug (AUDIO_FUNC, !card || !name || !callback_fn || !as)) { dolog ("card=%p name=%p callback_fn=%p as=%p\n", @@ -426,29 +422,6 @@ SW *glue (AUD_open_, TYPE) ( return sw; } -#ifdef DAC - if (conf.plive && sw && (!sw->active && !sw->empty)) { - live = sw->total_hw_samples_mixed; - -#ifdef DEBUG_PLIVE - dolog ("Replacing voice %s with %d live samples\n", SW_NAME (sw), live); - dolog ("Old %s freq %d, bits %d, channels %d\n", - SW_NAME (sw), sw->info.freq, sw->info.bits, sw->info.nchannels); - dolog ("New %s freq %d, bits %d, channels %d\n", - name, - as->freq, - (as->fmt == AUD_FMT_S16 || as->fmt == AUD_FMT_U16) ? 16 : 8, - as->nchannels); -#endif - - if (live) { - old_sw = sw; - old_sw->callback.fn = NULL; - sw = NULL; - } - } -#endif - if (!glue (conf.fixed_, TYPE).enabled && sw) { glue (AUD_close_, TYPE) (card, sw); sw = NULL; @@ -481,20 +454,6 @@ SW *glue (AUD_open_, TYPE) ( sw->callback.fn = callback_fn; sw->callback.opaque = callback_opaque; -#ifdef DAC - if (live) { - int mixed = - (live << old_sw->info.shift) - * old_sw->info.bytes_per_second - / sw->info.bytes_per_second; - -#ifdef DEBUG_PLIVE - dolog ("Silence will be mixed %d\n", mixed); -#endif - sw->total_hw_samples_mixed += mixed; - } -#endif - #ifdef DEBUG_AUDIO dolog ("%s\n", name); audio_pcm_print_info ("hw", &sw->hw->info);