videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Remove useless trivial audio mixer

This commit is contained in:
Rémi Denis-Courmont 2011-08-08 18:04:14 +03:00
parent 7c7f4ce035
commit 59b3691969
4 changed files with 1 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/LIST
View File

@ -335,7 +335,6 @@ $Id$
* transform: filter for horizontal and vertical image flips and 90° rotations
* tremor: a vorbis audio decoder using the libvorbisidec (aka tremor) library
* trivial_channel_mixer: Simple channel mixer plugin
* trivial_mixer: Trivial audio mixer plugin
* ts: MPEG-TS demuxer
* tta: Lossless True Audio parser
* twolame: a mp1 mp2 audio encoder based on twolame

4
modules/audio_mixer/Modules.am
View File

@ -1,8 +1,6 @@
SOURCES_trivial_mixer = trivial.c
SOURCES_float32_mixer = float32.c
SOURCES_fixed32_mixer = fixed32.c
libvlc_LTLIBRARIES += \
libfloat32_mixer_plugin.la \
libfixed32_mixer_plugin.la \
libtrivial_mixer_plugin.la
libfixed32_mixer_plugin.la

71
modules/audio_mixer/trivial.c
View File

@ -1,71 +0,0 @@
/*****************************************************************************
* trivial.c : trivial mixer plug-in (1 input, no downmixing)
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_aout_mixer.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Create( vlc_object_t * );
static void DoNothing( audio_mixer_t *, aout_buffer_t *p_buffer, float );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_description( N_("Dummy audio mixer") )
set_capability( "audio mixer", 1 )
set_callbacks( Create, NULL )
vlc_module_end ()
/*****************************************************************************
* Create: allocate trivial mixer
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
audio_mixer_t *p_mixer = (audio_mixer_t *)p_this;
p_mixer->mix = DoNothing;
return 0;
}
static void DoNothing( audio_mixer_t *p_mixer, aout_buffer_t *p_buffer,
float multiplier )
{
(void) p_mixer;
(void) p_buffer;
(void) multiplier;
}

1
po/POTFILES.in
View File

@ -314,7 +314,6 @@ modules/audio_filter/spatializer/spatializer.cpp
modules/audio_filter/spatializer/tuning.h
modules/audio_mixer/fixed32.c
modules/audio_mixer/float32.c
modules/audio_mixer/trivial.c
modules/audio_output/adummy.c
modules/audio_output/alsa.c
modules/audio_output/amem.c