Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 17:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sensible initialization for Audio member variables

Browse source
This commit is contained in:
Stephen Birarda 2013-05-15 11:29:52 -07:00
parent 4693082db0
commit 26c34bb86c
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/Audio.cpp
View file

@ -285,12 +285,19 @@ void outputPortAudioError(PaError error) {
}
Audio::Audio(Oscilloscope* scope) :
_stream(NULL),
_ringBuffer(RING_BUFFER_SAMPLES, PACKET_LENGTH_SAMPLES),
_scope(scope),
_averagedLatency(0.0),
_measuredJitter(0),
_wasStarved(0),
_totalPacketsReceived(0) {
_lastInputLoudness(0),
_mixerLoopbackFlag(false),
_lastVelocity(0),
_lastAcceleration(0),
_totalPacketsReceived(0),
_firstPlaybackTime(),
_packetsReceivedThisPlayback(0) {
outputPortAudioError(Pa_Initialize());
@ -303,8 +310,6 @@ Audio::Audio(Oscilloscope* scope) :
audioCallback,
(void*) this));
_initialized = true;
// start the stream now that sources are good to go
outputPortAudioError(Pa_StartStream(_stream));
@ -312,7 +317,7 @@ Audio::Audio(Oscilloscope* scope) :
}
Audio::~Audio() {
if (_initialized) {
if (_stream) {
outputPortAudioError(Pa_CloseStream(_stream));
outputPortAudioError(Pa_Terminate());
}
@ -365,7 +370,7 @@ void Audio::addReceivedAudioToBuffer(unsigned char* receivedData, int receivedB
}
void Audio::render(int screenWidth, int screenHeight) {
if (_initialized) {
if (_stream) {
glLineWidth(2.0);
glBegin(GL_LINES);
glColor3f(1,1,1);

1
interface/src/Audio.h
View file

@ -35,7 +35,6 @@ public:
void addReceivedAudioToBuffer(unsigned char* receivedData, int receivedBytes);
private:
bool _initialized;
PaStream* _stream;
AudioRingBuffer _ringBuffer;
Oscilloscope* _scope;