Revision: 39926
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39926
Author: xiaoxiangquan
Date: 2011-09-05 14:44:11 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
add missing files after merging
Added Paths:
-----------
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
branches/soc-2011-garlic/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
branches/soc-2011-garlic/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_AnimateableProperty.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_AnimateableProperty.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_FileWriter.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_FileWriter.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_I3DHandle.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_IHandle.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_IWriter.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_JOSResampleFactory.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_ReferenceHandler.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_ResampleReader.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_ResampleReader.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_SequencerEntry.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_SequencerEntry.h
branches/soc-2011-garlic/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/soc-2011-garlic/intern/audaspace/intern/AUD_SequencerHandle.h
branches/soc-2011-garlic/intern/audaspace/sndfile/AUD_SndFileWriter.cpp
branches/soc-2011-garlic/intern/audaspace/sndfile/AUD_SndFileWriter.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_speaker.h
branches/soc-2011-garlic/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-garlic/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-garlic/source/blender/collada/AnimationExporter.h
branches/soc-2011-garlic/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-garlic/source/blender/imbuf/intern/indexer.c
branches/soc-2011-garlic/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2011-garlic/source/blender/makesdna/DNA_speaker_types.h
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_speaker.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-garlic/source/creator/CMakeLists.txt.orig
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_Action.h
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_ActionManager.h
Added:
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
===================================================================
---
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
(rev 0)
+++
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
2011-09-05 14:44:11 UTC (rev 39926)
@@ -0,0 +1,42 @@
+/*
+ * $Id: AUD_DynamicIIRFilterFactory.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ *
+ * ***** 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/FX/AUD_DynamicIIRFilterFactory.cpp
+ * \ingroup audfx
+ */
+
+#include "AUD_DynamicIIRFilterFactory.h"
+#include "AUD_DynamicIIRFilterReader.h"
+
+AUD_DynamicIIRFilterFactory::AUD_DynamicIIRFilterFactory(AUD_Reference<AUD_IFactory>
factory) :
+ AUD_EffectFactory(factory)
+{
+}
+
+AUD_Reference<AUD_IReader> AUD_DynamicIIRFilterFactory::createReader()
+{
+ return new AUD_DynamicIIRFilterReader(getReader(), this);
+}
Property changes on:
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
___________________________________________________________________
Added: svn:executable
+ *
Added:
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
===================================================================
--- branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
(rev 0)
+++ branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
2011-09-05 14:44:11 UTC (rev 39926)
@@ -0,0 +1,65 @@
+/*
+ * $Id: AUD_DynamicIIRFilterFactory.h 39792 2011-08-30 09:15:55Z nexyon $
+ *
+ * ***** 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/FX/AUD_DynamicIIRFilterFactory.h
+ * \ingroup audfx
+ */
+
+#ifndef AUD_DYNAMICIIRFILTERFACTORY
+#define AUD_DYNAMICIIRFILTERFACTORY
+
+#include "AUD_EffectFactory.h"
+#include <vector>
+
+/**
+ * This factory creates a IIR filter reader.
+ *
+ * This means that on sample rate change the filter recalculates its
+ * coefficients.
+ */
+class AUD_DynamicIIRFilterFactory : public AUD_EffectFactory
+{
+public:
+ /**
+ * Creates a new Dynmic IIR filter factory.
+ * \param factory The input factory.
+ */
+ AUD_DynamicIIRFilterFactory(AUD_Reference<AUD_IFactory> factory);
+
+ virtual AUD_Reference<AUD_IReader> createReader();
+
+ /**
+ * Recalculates the filter coefficients.
+ * \param rate The sample rate of the audio data.
+ * \param[out] b The input filter coefficients.
+ * \param[out] a The output filter coefficients.
+ */
+ virtual void recalculateCoefficients(AUD_SampleRate rate,
+
std::vector<float>& b,
+
std::vector<float>& a)=0;
+};
+
+#endif // AUD_DYNAMICIIRFILTERFACTORY
Property changes on:
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
___________________________________________________________________
Added: svn:executable
+ *
Added:
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
===================================================================
--- branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
(rev 0)
+++ branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
2011-09-05 14:44:11 UTC (rev 39926)
@@ -0,0 +1,45 @@
+/*
+ * $Id: AUD_DynamicIIRFilterReader.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ *
+ * ***** 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/FX/AUD_DynamicIIRFilterReader.cpp
+ * \ingroup audfx
+ */
+
+#include "AUD_DynamicIIRFilterReader.h"
+
+AUD_DynamicIIRFilterReader::AUD_DynamicIIRFilterReader(AUD_Reference<AUD_IReader>
reader,
+
AUD_Reference<AUD_DynamicIIRFilterFactory> factory) :
+ AUD_IIRFilterReader(reader, std::vector<float>(), std::vector<float>())
+{
+ sampleRateChanged(reader->getSpecs().rate);
+}
+
+void AUD_DynamicIIRFilterReader::sampleRateChanged(AUD_SampleRate rate)
+{
+ std::vector<float> a, b;
+ m_factory->recalculateCoefficients(rate, b, a);
+ setCoefficients(b, a);
+}
Property changes on:
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
===================================================================
--- branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
(rev 0)
+++ branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
2011-09-05 14:44:11 UTC (rev 39926)
@@ -0,0 +1,56 @@
+/*
+ * $Id: AUD_DynamicIIRFilterReader.h 39792 2011-08-30 09:15:55Z nexyon $
+ *
+ * ***** 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/FX/AUD_DynamicIIRFilterReader.h
+ * \ingroup audfx
+ */
+
+#ifndef AUD_DYNAMICIIRFILTERREADER
+#define AUD_DYNAMICIIRFILTERREADER
+
+#include "AUD_IIRFilterReader.h"
+#include "AUD_DynamicIIRFilterFactory.h"
+
+/**
+ * This class is for dynamic infinite impulse response filters with simple
+ * coefficients that change depending on the sample rate.
+ */
+class AUD_DynamicIIRFilterReader : public AUD_IIRFilterReader
+{
+private:
+ /**
+ * The factory for dynamically recalculating filter coefficients.
+ */
+ AUD_Reference<AUD_DynamicIIRFilterFactory> m_factory;
+
+public:
+ AUD_DynamicIIRFilterReader(AUD_Reference<AUD_IReader> reader,
+
AUD_Reference<AUD_DynamicIIRFilterFactory> factory);
+
+ virtual void sampleRateChanged(AUD_SampleRate rate);
+};
+
+#endif // AUD_DYNAMICIIRFILTERREADER
Property changes on:
branches/soc-2011-garlic/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/soc-2011-garlic/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
===================================================================
--- branches/soc-2011-garlic/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
(rev 0)
+++ branches/soc-2011-garlic/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
2011-09-05 14:44:11 UTC (rev 39926)
@@ -0,0 +1,305 @@
+/*
+ * $Id: AUD_FFMPEGWriter.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ *
+ * ***** 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.
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
