forked from bartvdbraak/blender
Audaspace: fix for building with scons.
Removed duplicated code. CMake so far built only the now removed version and scons tried to build both.
This commit is contained in:
parent
0952a8e44a
commit
6a80c2c48b
@ -164,6 +164,8 @@ set(SRC
|
|||||||
intern/AUD_SequencerHandle.h
|
intern/AUD_SequencerHandle.h
|
||||||
intern/AUD_SequencerReader.cpp
|
intern/AUD_SequencerReader.cpp
|
||||||
intern/AUD_SequencerReader.h
|
intern/AUD_SequencerReader.h
|
||||||
|
intern/AUD_Set.cpp
|
||||||
|
intern/AUD_Set.h
|
||||||
intern/AUD_SilenceFactory.cpp
|
intern/AUD_SilenceFactory.cpp
|
||||||
intern/AUD_SilenceFactory.h
|
intern/AUD_SilenceFactory.h
|
||||||
intern/AUD_SilenceReader.cpp
|
intern/AUD_SilenceReader.cpp
|
||||||
|
@ -41,7 +41,6 @@
|
|||||||
# include "AUD_PyAPI.h"
|
# include "AUD_PyAPI.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <set>
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
@ -1224,44 +1223,6 @@ void AUD_Handle_free(AUD_Handle *handle)
|
|||||||
delete 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)
|
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 {
|
try {
|
||||||
|
Loading…
Reference in New Issue
Block a user