diff options
author | Jörg Müller <nexyon@gmail.com> | 2017-08-18 09:24:12 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2017-08-18 09:24:12 +0300 |
commit | 986267300ba42a5c99d2802cd701803dd558e389 (patch) | |
tree | 9bf6a84f8e3ebb8d01e5617b1cccfd2693cc1345 /extern/audaspace/src/sequence/Superpose.cpp | |
parent | d0dad0260434c4420fa9756264c1cc5e745e5ec9 (diff) |
Audaspace: Moving audaspace 1.3 into extern.
Deleting the old internal audaspace.
Major changes from there are:
- The whole library was refactored to use C++11.
- Many stability and performance improvements.
- Major Python API refactor:
- Most requested: Play self generated sounds using numpy arrays.
- For games: Sound list, random sounds and dynamic music.
- Writing sounds to files.
- Sequencing API.
- Opening sound devices, eg. Jack.
- Ability to choose different OpenAL devices in the user settings.
Diffstat (limited to 'extern/audaspace/src/sequence/Superpose.cpp')
-rw-r--r-- | extern/audaspace/src/sequence/Superpose.cpp | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/extern/audaspace/src/sequence/Superpose.cpp b/extern/audaspace/src/sequence/Superpose.cpp new file mode 100644 index 00000000000..3d13f7db627 --- /dev/null +++ b/extern/audaspace/src/sequence/Superpose.cpp @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright 2009-2016 Jörg Müller + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ******************************************************************************/ + +#include "sequence/Superpose.h" +#include "sequence/SuperposeReader.h" + +AUD_NAMESPACE_BEGIN + +Superpose::Superpose(std::shared_ptr<ISound> sound1, std::shared_ptr<ISound> sound2) : + m_sound1(sound1), m_sound2(sound2) +{ +} + +std::shared_ptr<IReader> Superpose::createReader() +{ + std::shared_ptr<IReader> reader1 = m_sound1->createReader(); + std::shared_ptr<IReader> reader2 = m_sound2->createReader(); + + return std::shared_ptr<IReader>(new SuperposeReader(reader1, reader2)); +} + +AUD_NAMESPACE_END |