From 54116cbc85a712d506723d78509acbbc6b5baa1a Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 4 Sep 2013 16:04:36 -0700
Subject: [PATCH 1/2] Testing audio shutdown before menu destruction.

---
 interface/src/Application.cpp | 4 +++-
 interface/src/Audio.cpp       | 2 +-
 interface/src/Audio.h         | 3 ++-
 interface/src/Menu.cpp        | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 51766fbafc..6e5ea5842a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -238,8 +238,10 @@ Application::~Application() {
 
     _sharedVoxelSystem.changeTree(new VoxelTree);
 
-    delete Menu::getInstance();
+    _audio.shutdown();
 
+    delete Menu::getInstance();
+    
     delete _oculusProgram;
     delete _settings;
     delete _networkAccessManager;
diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 0d4b268fcc..d98577eaaf 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -448,7 +448,7 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) :
     gettimeofday(&_lastReceiveTime, NULL);
 }
 
-Audio::~Audio() {    
+void Audio::shutdown() {
     if (_stream) {
         outputPortAudioError(Pa_CloseStream(_stream));
         outputPortAudioError(Pa_Terminate());
diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index bf99fd3f42..8409f5ca84 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -33,7 +33,8 @@ class Audio : public QObject {
 public:
     // initializes audio I/O
     Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples);
-    ~Audio();
+    
+    void shutdown();
 
     void reset(); 
     void render(int screenWidth, int screenHeight);
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 65afc605b0..be24a71f7d 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -416,6 +416,8 @@ Menu::Menu() :
 Menu::~Menu() {
     bandwidthDetailsClosed();
     voxelStatsDetailsClosed();
+    
+    qDebug() << "menu deleted\n";
 }
 
 void Menu::loadSettings(QSettings* settings) {

From 9ed698e04cbbd04152fd0f5622442c29184812c1 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 4 Sep 2013 16:10:13 -0700
Subject: [PATCH 2/2] Remove debug statement.

---
 interface/src/Menu.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index be24a71f7d..65afc605b0 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -416,8 +416,6 @@ Menu::Menu() :
 Menu::~Menu() {
     bandwidthDetailsClosed();
     voxelStatsDetailsClosed();
-    
-    qDebug() << "menu deleted\n";
 }
 
 void Menu::loadSettings(QSettings* settings) {