From 0f18a9651b8f3e328dd8d387636266cd7d727b21 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Dec 2014 14:53:36 -0800
Subject: [PATCH] replace audio with AudioIOStatsRenderer in ApplicationOverlay

---
 interface/src/Audio.h                        |  2 ++
 interface/src/audio/AudioIOStatsRenderer.cpp |  8 +++++---
 interface/src/audio/AudioIOStatsRenderer.h   | 10 +++++++---
 interface/src/ui/ApplicationOverlay.cpp      |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index 4d4d83b8cc..977e74723c 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -105,6 +105,8 @@ public:
     bool mousePressEvent(int x, int y);
     
     void renderToolBox(int x, int y, bool boxed);
+    
+    const AudioIOStats& getStats() const { return _stats; }
 
     float getInputRingBufferMsecsAvailable() const;
     float getAudioOutputMsecsUnplayed() const;
diff --git a/interface/src/audio/AudioIOStatsRenderer.cpp b/interface/src/audio/AudioIOStatsRenderer.cpp
index 044835c517..fc62ff4cfb 100644
--- a/interface/src/audio/AudioIOStatsRenderer.cpp
+++ b/interface/src/audio/AudioIOStatsRenderer.cpp
@@ -16,16 +16,18 @@
 #include <NodeList.h>
 #include <Util.h>
 
+#include "Audio.h"
 #include "AudioIOStats.h"
 
 #include "AudioIOStatsRenderer.h"
 
-AudioIOStatsRenderer::AudioIOStatsRenderer(const AudioIOStats* stats) :
-    _stats(stats),
+AudioIOStatsRenderer::AudioIOStatsRenderer() :
+    _stats(NULL),
     _isEnabled(false),
     _shouldShowInjectedStreams(false)
 {
-    
+    // grab the stats object from the audio I/O singleton
+    _stats = &DependencyManager::get<Audio>()->getStats();
 }
 
 #ifdef _WIN32
diff --git a/interface/src/audio/AudioIOStatsRenderer.h b/interface/src/audio/AudioIOStatsRenderer.h
index a95ba7ef35..c5bf9007a3 100644
--- a/interface/src/audio/AudioIOStatsRenderer.h
+++ b/interface/src/audio/AudioIOStatsRenderer.h
@@ -14,18 +14,22 @@
 
 #include <QObject>
 
+#include <DependencyManager.h>
+
 class AudioIOStats;
 class AudioStreamStats;
 
-class AudioIOStatsRenderer : public QObject {
+class AudioIOStatsRenderer : public QObject, public DependencyManager::Dependency {
     Q_OBJECT
 public:
-    AudioIOStatsRenderer(const AudioIOStats* audioIOStats);
-    
     void render(const float* color, int width, int height);
+    
+    friend class DependencyManager;
 public slots:
     void toggle() { _isEnabled = !_isEnabled; }
     void toggleShowInjectedStreams() { _shouldShowInjectedStreams = !_shouldShowInjectedStreams; }
+protected:
+    AudioIOStatsRenderer();
 private:
     // audio stats methods for rendering
     void renderAudioStreamStats(const AudioStreamStats* streamStats, int horizontalOffset, int& verticalOffset,
diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp
index cbd5ca29d5..655169a778 100644
--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@@ -15,6 +15,7 @@
 #include <PerfStat.h>
 
 #include "audio/AudioScope.h"
+#include "audio/AudioIOStatsRenderer.h"
 #include "Application.h"
 #include "ApplicationOverlay.h"
 #include "devices/OculusManager.h"
@@ -830,8 +831,7 @@ void ApplicationOverlay::renderAudioMeter() {
     audio->renderToolBox(MIRROR_VIEW_LEFT_PADDING + AUDIO_METER_GAP, audioMeterY, boxed);
     
     DependencyManager::get<AudioScope>()->render(glWidget->width(), glWidget->height());
-
-    audio->renderStats(WHITE_TEXT, glWidget->width(), glWidget->height());
+    DependencyManager::get<AudioIOStatsRenderer>()->render(WHITE_TEXT, glWidget->width(), glWidget->height());
 
     glBegin(GL_QUADS);
     if (isClipping) {