diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:26:59 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:26:59 +0400 |
commit | c7dcbdb830b3db615df1722922d0d40660ac3b5e (patch) | |
tree | 70cf5d6769dc6b8abbc2138719848ed8838a028e /intern | |
parent | 9424b1ceff992f420fe6315acabfb7138cd0026e (diff) |
Removing outdated files.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/intern/AUD_DefaultMixer.cpp | 77 | ||||
-rw-r--r-- | intern/audaspace/intern/AUD_DefaultMixer.h | 59 |
2 files changed, 0 insertions, 136 deletions
diff --git a/intern/audaspace/intern/AUD_DefaultMixer.cpp b/intern/audaspace/intern/AUD_DefaultMixer.cpp deleted file mode 100644 index 20471d6e874..00000000000 --- a/intern/audaspace/intern/AUD_DefaultMixer.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * Copyright 2009-2011 Jörg Hermann Müller - * - * This file is part of AudaSpace. - * - * Audaspace 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. - * - * AudaSpace 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 Audaspace; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file audaspace/intern/AUD_DefaultMixer.cpp - * \ingroup audaspaceintern - */ - - -#include "AUD_DefaultMixer.h" -#ifdef WITH_SAMPLERATE -#include "AUD_SRCResampleReader.h" -#else -#include "AUD_LinearResampleReader.h" -#endif -#include "AUD_ChannelMapperReader.h" -#include "AUD_ChannelMapperFactory.h" - -#include <cstring> - -AUD_DefaultMixer::AUD_DefaultMixer(AUD_DeviceSpecs specs) : - AUD_Mixer(specs) -{ -} - -AUD_IReader* AUD_DefaultMixer::prepare(AUD_IReader* reader) -{ - // hacky for now, until a better channel mapper reader is available - AUD_ChannelMapperFactory cmf(NULL, m_specs); - - AUD_Specs specs = reader->getSpecs(); - - // if channel count is lower in output, rechannel before resampling - if(specs.channels < m_specs.channels) - { - reader = new AUD_ChannelMapperReader(reader, - cmf.getMapping(specs.channels)); - specs.channels = m_specs.channels; - } - - // resample - if(specs.rate != m_specs.rate) -#ifdef WITH_SAMPLERATE - reader = new AUD_SRCResampleReader(reader, m_specs.specs); -#else - reader = new AUD_LinearResampleReader(reader, m_specs.specs); -#endif - - // rechannel - if(specs.channels != m_specs.channels) - reader = new AUD_ChannelMapperReader(reader, - cmf.getMapping(specs.channels)); - - return reader; -} diff --git a/intern/audaspace/intern/AUD_DefaultMixer.h b/intern/audaspace/intern/AUD_DefaultMixer.h deleted file mode 100644 index a347141b5e0..00000000000 --- a/intern/audaspace/intern/AUD_DefaultMixer.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * Copyright 2009-2011 Jörg Hermann Müller - * - * This file is part of AudaSpace. - * - * Audaspace 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. - * - * AudaSpace 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 Audaspace; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file audaspace/intern/AUD_DefaultMixer.h - * \ingroup audaspaceintern - */ - - -#ifndef AUD_DEFAULTMIXER -#define AUD_DEFAULTMIXER - -#include "AUD_Mixer.h" - -/** - * This class is able to mix audiosignals of different channel count and sample - * rate and convert it to a specific output format. - * It uses a default ChannelMapperFactory and a SRCResampleFactory for - * the perparation. - */ -class AUD_DefaultMixer : public AUD_Mixer -{ -public: - /** - * Creates the mixer. - */ - AUD_DefaultMixer(AUD_DeviceSpecs specs); - - /** - * This funuction prepares a reader for playback. - * \param reader The reader to prepare. - * \return The reader that should be used for playback. - */ - virtual AUD_IReader* prepare(AUD_IReader* reader); -}; - -#endif //AUD_DEFAULTMIXER |