From 79616c012e702d6ae3871ac3046fc22f88f063b4 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Sun, 27 Feb 2011 23:02:21 +0530 Subject: Revert "Add volume ramping feature - envelop fix" This reverts commit 8eaa40b6f4cae749610770c85ba500f326d59b50. Conflicts: src/pulsecore/envelope.c (part of a patch series removing all ramping code) --- src/pulsecore/envelope.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/pulsecore/envelope.h') diff --git a/src/pulsecore/envelope.h b/src/pulsecore/envelope.h index 4fa36579..5296415a 100644 --- a/src/pulsecore/envelope.h +++ b/src/pulsecore/envelope.h @@ -49,8 +49,5 @@ pa_envelope_item *pa_envelope_replace(pa_envelope *e, pa_envelope_item *i, const void pa_envelope_remove(pa_envelope *e, pa_envelope_item *i); void pa_envelope_apply(pa_envelope *e, pa_memchunk *chunk); void pa_envelope_rewind(pa_envelope *e, size_t n_bytes); -void pa_envelope_restart(pa_envelope* e); -pa_bool_t pa_envelope_is_finished(pa_envelope* e); -int32_t pa_envelope_length(pa_envelope *e); #endif -- cgit From 50e289d52ad73a919084621a32245350c446781b Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Sun, 27 Feb 2011 23:02:25 +0530 Subject: Revert "Add new subsystem for applying envelopes (such as volume ramps) to audio signals" This reverts commit 95a98fe6f2002c9dd448b70bb6944541b5616df3. Conflicts: src/Makefile.am src/pulsecore/envelope.c src/pulsecore/envelope.h src/tests/envelope-test.c (part of a patch series removing all ramping code) --- src/pulsecore/envelope.h | 53 ------------------------------------------------ 1 file changed, 53 deletions(-) delete mode 100644 src/pulsecore/envelope.h (limited to 'src/pulsecore/envelope.h') diff --git a/src/pulsecore/envelope.h b/src/pulsecore/envelope.h deleted file mode 100644 index 5296415a..00000000 --- a/src/pulsecore/envelope.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef foopulseenvelopehfoo -#define foopulseenvelopehfoo - -/*** - This file is part of PulseAudio. - - Copyright 2007 Lennart Poettering - - PulseAudio is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - PulseAudio is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#include -#include - -#include - -#define PA_ENVELOPE_POINTS_MAX 4U - -typedef struct pa_envelope pa_envelope; -typedef struct pa_envelope_item pa_envelope_item; - -typedef struct pa_envelope_def { - unsigned n_points; - - pa_usec_t points_x[PA_ENVELOPE_POINTS_MAX]; - struct { - int32_t i[PA_ENVELOPE_POINTS_MAX]; - float f[PA_ENVELOPE_POINTS_MAX]; - } points_y; -} pa_envelope_def; - -pa_envelope *pa_envelope_new(const pa_sample_spec *ss); -void pa_envelope_free(pa_envelope *e); -pa_envelope_item *pa_envelope_add(pa_envelope *e, const pa_envelope_def *def); -pa_envelope_item *pa_envelope_replace(pa_envelope *e, pa_envelope_item *i, const pa_envelope_def *def); -void pa_envelope_remove(pa_envelope *e, pa_envelope_item *i); -void pa_envelope_apply(pa_envelope *e, pa_memchunk *chunk); -void pa_envelope_rewind(pa_envelope *e, size_t n_bytes); - -#endif -- cgit