diff options
author | Jörg Müller <nexyon@gmail.com> | 2015-08-29 23:42:20 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2015-08-29 23:42:20 +0300 |
commit | 6a80c2c48b403f65b1e9378ec4e447be95f09f62 (patch) | |
tree | 4bb6380f76fa4a84d5233a370630300935c0c41b | |
parent | 0952a8e44ae2eb9617426c5878acf0224a0831b2 (diff) |
Audaspace: fix for building with scons.
Removed duplicated code.
CMake so far built only the now removed version and scons tried to build both.
-rw-r--r-- | intern/audaspace/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/audaspace/intern/AUD_C-API.cpp | 39 |
2 files changed, 2 insertions, 39 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 7fecb1a48a7..b3682a77875 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -164,6 +164,8 @@ set(SRC intern/AUD_SequencerHandle.h intern/AUD_SequencerReader.cpp intern/AUD_SequencerReader.h + intern/AUD_Set.cpp + intern/AUD_Set.h intern/AUD_SilenceFactory.cpp intern/AUD_SilenceFactory.h intern/AUD_SilenceReader.cpp diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index 2d9a8e0ebc8..341f1cd3f6b 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -41,7 +41,6 @@ # include "AUD_PyAPI.h" #endif -#include <set> #include <cstdlib> #include <cstring> #include <cmath> @@ -1224,44 +1223,6 @@ void AUD_Handle_free(AUD_Handle *handle) delete handle; } -void *AUD_createSet() -{ - return new std::set<void *>(); -} - -void AUD_destroySet(void *set) -{ - delete reinterpret_cast<std::set<void *>*>(set); -} - -char AUD_removeSet(void *set, void *entry) -{ - if (set) - return reinterpret_cast<std::set<void *>*>(set)->erase(entry); - return 0; -} - -void AUD_addSet(void *set, void *entry) -{ - if (entry) - reinterpret_cast<std::set<void *>*>(set)->insert(entry); -} - -void *AUD_getSet(void *set) -{ - if (set) { - std::set<void *>* rset = reinterpret_cast<std::set<void *>*>(set); - if (!rset->empty()) { - std::set<void *>::iterator it = rset->begin(); - void *result = *it; - rset->erase(it); - return result; - } - } - - return NULL; -} - const char *AUD_mixdown(AUD_Sound *sound, unsigned int start, unsigned int length, unsigned int buffersize, const char *filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate) { try { |