From 986267300ba42a5c99d2802cd701803dd558e389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Fri, 18 Aug 2017 08:24:12 +0200 Subject: 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. --- extern/audaspace/src/fx/SoundList.cpp | 84 +++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 extern/audaspace/src/fx/SoundList.cpp (limited to 'extern/audaspace/src/fx/SoundList.cpp') diff --git a/extern/audaspace/src/fx/SoundList.cpp b/extern/audaspace/src/fx/SoundList.cpp new file mode 100644 index 00000000000..81239ca5baa --- /dev/null +++ b/extern/audaspace/src/fx/SoundList.cpp @@ -0,0 +1,84 @@ +/******************************************************************************* +* Copyright 2015-2016 Juan Francisco Crespo Galán +* +* 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 "fx/SoundList.h" +#include "Exception.h" + +#include +#include +#include + +AUD_NAMESPACE_BEGIN + +SoundList::SoundList(bool random) : +m_random(random) +{ + std::srand(time(NULL)); +} + +SoundList::SoundList(std::vector>& list, bool random) : +m_list(list), m_random(random) +{ + std::srand(time(NULL)); +} + +std::shared_ptr SoundList::createReader() +{ + if(m_list.size() > 0) + { + m_mutex.lock(); + + if(!m_random){ + m_index++; + if(m_index >= m_list.size()) + m_index = 0; + } + else + { + int temp; + do{ + temp = std::rand() % m_list.size(); + } while(temp == m_index && m_list.size()>1); + m_index = temp; + } + auto reader = m_list[m_index]->createReader(); + m_mutex.unlock(); + return reader; + } + else + AUD_THROW(FileException, "The sound list is empty"); +} + +void SoundList::addSound(std::shared_ptr sound) +{ + m_list.push_back(sound); +} + +void SoundList::setRandomMode(bool random) +{ + m_random = random; +} + +bool SoundList::getRandomMode() +{ + return m_random; +} + +int SoundList::getSize() +{ + return m_list.size(); +} +AUD_NAMESPACE_END \ No newline at end of file -- cgit v1.2.3