Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2010-08-16 15:41:07 +0400
committerJoerg Mueller <nexyon@gmail.com>2010-08-16 15:41:07 +0400
commit25fec1592efade86233c0ba71212dc973b618ad1 (patch)
tree8c6eccaf24d7bf4fa72c5cfc1ca86511d2df0c9d /intern/audaspace/FX/AUD_PitchFactory.cpp
parenta91d538f47171a40463016b91c22d39d694d923a (diff)
parent2b7a774ab0dfd3bc66240b387a586b5122ab2661 (diff)
Audaspace (GSoC): First merging commit
* All audaspace changes from the GSoC branch including the aud Python module * This commit also includes some minor changes in source/gameengine/Ketsji/KX_PythonInit.cpp: - Fixing names of some constants - removing outdated stopDSP() python function - Autoinclusion of bge instead of GameLogic - Fix for some error messages: GameLogic -> bge.logic
Diffstat (limited to 'intern/audaspace/FX/AUD_PitchFactory.cpp')
-rw-r--r--intern/audaspace/FX/AUD_PitchFactory.cpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/intern/audaspace/FX/AUD_PitchFactory.cpp b/intern/audaspace/FX/AUD_PitchFactory.cpp
index 5f814283c12..be285562db3 100644
--- a/intern/audaspace/FX/AUD_PitchFactory.cpp
+++ b/intern/audaspace/FX/AUD_PitchFactory.cpp
@@ -29,20 +29,11 @@
AUD_PitchFactory::AUD_PitchFactory(AUD_IFactory* factory, float pitch) :
AUD_EffectFactory(factory),
- m_pitch(pitch) {}
-
-AUD_PitchFactory::AUD_PitchFactory(float pitch) :
- AUD_EffectFactory(0),
- m_pitch(pitch) {}
-
-AUD_IReader* AUD_PitchFactory::createReader()
+ m_pitch(pitch)
{
- AUD_IReader* reader = getReader();
-
- if(reader != 0)
- {
- reader = new AUD_PitchReader(reader, m_pitch); AUD_NEW("reader")
- }
+}
- return reader;
+AUD_IReader* AUD_PitchFactory::createReader() const
+{
+ return new AUD_PitchReader(getReader(), m_pitch);
}