From 707973f1e5216f20c3b3f8d4939da85dde273e33 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 21 Jan 2015 12:05:12 -0800
Subject: [PATCH] solve collision in PositionGetter with AddressManager

---
 libraries/audio-client/src/AudioClient.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index c6d3115d1a..82f7612e3d 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -68,8 +68,8 @@ class QAudioInput;
 class QAudioOutput;
 class QIODevice;
 
-typedef glm::vec3 (*PositionGetter)();
-typedef glm::quat (*OrientationGetter)();
+typedef glm::vec3 (*AudioPositionGetter)();
+typedef glm::quat (*AudioOrientationGetter)();
 
 class AudioClient : public AbstractAudioInterface, public Dependency {
     Q_OBJECT
@@ -126,8 +126,8 @@ public:
     int getOutputStarveDetectionThreshold() { return _outputStarveDetectionThreshold; }
     void setOutputStarveDetectionThreshold(int threshold) { _outputStarveDetectionThreshold = threshold; }
     
-    void setPositionGetter(PositionGetter positionGetter) { _positionGetter = positionGetter; }
-    void setOrientationGetter(OrientationGetter orientationGetter) { _orientationGetter = orientationGetter; }
+    void setPositionGetter(AudioPositionGetter positionGetter) { _positionGetter = positionGetter; }
+    void setOrientationGetter(AudioOrientationGetter orientationGetter) { _orientationGetter = orientationGetter; }
 
     static const float CALLBACK_ACCELERATOR_RATIO;
     
@@ -277,8 +277,8 @@ private:
     
     AudioNoiseGate _inputGate;
     
-    PositionGetter _positionGetter;
-    OrientationGetter _orientationGetter;
+    AudioPositionGetter _positionGetter;
+    AudioOrientationGetter _orientationGetter;
 };