From 50c1e9fb4037cd9f225177ff9e6e5603c11c4776 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Mon, 15 Dec 2014 22:41:35 -0800
Subject: [PATCH] Fixes for missing audio device.

---
 interface/src/Audio.cpp               | 7 ++++++-
 libraries/audio/src/AudioRingBuffer.h | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 101d16d3ba..bf176e0415 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -450,7 +450,9 @@ void Audio::start() {
         qDebug() << "Unable to set up audio output because of a problem with output format.";
     }
 
-    _inputFrameBuffer.initialize( _inputFormat.channelCount(), _audioInput->bufferSize() * 8 );
+    if (_audioInput) {
+        _inputFrameBuffer.initialize( _inputFormat.channelCount(), _audioInput->bufferSize() * 8 );
+    }
     _inputGain.initialize();
     _sourceGain.initialize();
     _noiseSource.initialize();
@@ -1935,6 +1937,9 @@ int Audio::calculateNumberOfFrameSamples(int numBytes) const {
 }
 
 float Audio::getAudioOutputMsecsUnplayed() const {
+    if (!_audioOutput) {
+        return 0.0f;
+    }
     int bytesAudioOutputUnplayed = _audioOutput->bufferSize() - _audioOutput->bytesFree();
     float msecsAudioOutputUnplayed = bytesAudioOutputUnplayed / (float)_outputFormat.bytesForDuration(USECS_PER_MSEC);
     return msecsAudioOutputUnplayed;
diff --git a/libraries/audio/src/AudioRingBuffer.h b/libraries/audio/src/AudioRingBuffer.h
index f033ffa80f..9239527df3 100644
--- a/libraries/audio/src/AudioRingBuffer.h
+++ b/libraries/audio/src/AudioRingBuffer.h
@@ -62,7 +62,7 @@ public:
     float getNextOutputFrameLoudness() const;
 
     int samplesAvailable() const;
-    int framesAvailable() const { return samplesAvailable() / _numFrameSamples; }
+    int framesAvailable() const { return (_numFrameSamples == 0) ? 0 : samplesAvailable() / _numFrameSamples; }
 
     int getNumFrameSamples() const { return _numFrameSamples; }