Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 18:52:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove jitter buffer changes from AudioSource class

Browse source
This commit is contained in:
Stephen Birarda 2013-02-01 14:31:28 -08:00
parent 8d3eb1559a
commit 8aa62b34b7
2 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/AudioSource.cpp
View file

@ -10,23 +10,22 @@
AudioSource::~AudioSource() AudioSource::~AudioSource()
{ {
delete oldestData; delete[] sourceData;
delete newestData;
} }
int AudioSource::loadDataFromFile(const char *filename) { int AudioSource::loadDataFromFile(const char *filename) {
// FILE *soundFile = fopen(filename, "r"); FILE *soundFile = fopen(filename, "r");
//
// // get length of file: // get length of file:
// std::fseek(soundFile, 0, SEEK_END); std::fseek(soundFile, 0, SEEK_END);
// lengthInSamples = std::ftell(soundFile) / sizeof(int16_t); lengthInSamples = std::ftell(soundFile) / sizeof(int16_t);
// std::rewind(soundFile); std::rewind(soundFile);
//
// sourceData = new int16_t[lengthInSamples]; sourceData = new int16_t[lengthInSamples];
// std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile); std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile);
//
// std::fclose(soundFile); std::fclose(soundFile);
//
return 0; return 0;
} }

18
Source/AudioSource.h
View file

@ -15,19 +15,11 @@
class AudioSource { class AudioSource {
public: public:
glm::vec3 position; glm::vec3 position;
int16_t *sourceData;
struct JitterBuffer { int lengthInSamples;
int16_t *audioData; int samplePointer;
timeval receiveTime;
AudioSource() { samplePointer = 0; sourceData = NULL; }
~JitterBuffer() { delete[] audioData; }
} *oldestData, *newestData;
// int lengthInSamples;
// int samplePointer;
// AudioSource() { samplePointer = 0; lengthInSamples = 0; }
AudioSource() { oldestData = NULL; newestData = NULL; }
~AudioSource(); ~AudioSource();
int loadDataFromFile(const char *filename); int loadDataFromFile(const char *filename);