Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/worklist/hifi into shifty

Browse source
This commit is contained in:
Andrzej Kapolka 2013-09-04 16:12:34 -07:00
commit a60be83fc7
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -238,8 +238,10 @@ Application::~Application() {
_sharedVoxelSystem.changeTree(new VoxelTree); _sharedVoxelSystem.changeTree(new VoxelTree);
delete Menu::getInstance(); _audio.shutdown();
delete Menu::getInstance();
delete _oculusProgram; delete _oculusProgram;
delete _settings; delete _settings;
delete _networkAccessManager; delete _networkAccessManager;

2
interface/src/Audio.cpp
View file

@ -448,7 +448,7 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) :
gettimeofday(&_lastReceiveTime, NULL); gettimeofday(&_lastReceiveTime, NULL);
} }
Audio::~Audio() { void Audio::shutdown() {
if (_stream) { if (_stream) {
outputPortAudioError(Pa_CloseStream(_stream)); outputPortAudioError(Pa_CloseStream(_stream));
outputPortAudioError(Pa_Terminate()); outputPortAudioError(Pa_Terminate());

3
interface/src/Audio.h
View file

@ -33,7 +33,8 @@ class Audio : public QObject {
public: public:
// initializes audio I/O // initializes audio I/O
Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples); Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples);
~Audio();
void shutdown();
void reset(); void reset();
void render(int screenWidth, int screenHeight); void render(int screenWidth, int screenHeight);