Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 09:42:23 +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 efe1adafc8
commit 1fd1791952
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()
{
delete oldestData;
delete newestData;
delete[] sourceData;
}
int AudioSource::loadDataFromFile(const char *filename) {
// FILE *soundFile = fopen(filename, "r");
//
// // get length of file:
// std::fseek(soundFile, 0, SEEK_END);
// lengthInSamples = std::ftell(soundFile) / sizeof(int16_t);
// std::rewind(soundFile);
//
// sourceData = new int16_t[lengthInSamples];
// std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile);
//
// std::fclose(soundFile);
//
FILE *soundFile = fopen(filename, "r");
// get length of file:
std::fseek(soundFile, 0, SEEK_END);
lengthInSamples = std::ftell(soundFile) / sizeof(int16_t);
std::rewind(soundFile);
sourceData = new int16_t[lengthInSamples];
std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile);
std::fclose(soundFile);
return 0;
}

18
Source/AudioSource.h
View file

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