From e0752cef547c214f9c4a25215fc57cdd1e80d194 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Dec 2014 15:35:37 -0800
Subject: [PATCH] remove collision sound creation calls

---
 interface/src/Audio.h                          | 3 ---
 interface/src/avatar/MyAvatar.cpp              | 7 ++-----
 libraries/audio/src/AbstractAudioInterface.h   | 2 --
 libraries/entities/src/EntityCollisionSystem.h | 1 -
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index 12fbc6398c..667acb25ec 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -87,9 +87,6 @@ public:
     float getAudioAverageInputLoudness() const { return _lastInputLoudness; }
 
     void setNoiseGateEnabled(bool noiseGateEnabled) { _noiseGateEnabled = noiseGateEnabled; }
-    
-    virtual void startCollisionSound(float magnitude, float frequency, float noise, float duration, bool flashScreen);
-    virtual void startDrumSound(float volume, float frequency, float duration, float decay);
 
     void setReceivedAudioStreamSettings(const InboundAudioStream::Settings& settings) { _receivedAudioStream.setSettings(settings); }
 
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 1219aa7c99..42ce5994fd 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1662,11 +1662,8 @@ void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTim
         //  Base frequency is modified upward by the angle of the collision
         //  Noise is a function of the angle of collision
         //  Duration of the sound is a function of both base frequency and velocity of impact
-        DependencyManager::get<Audio>()->startCollisionSound(
-            std::min(COLLISION_LOUDNESS * velocityTowardCollision, 1.0f),
-            frequency * (1.0f + velocityTangentToCollision / velocityTowardCollision),
-            std::min(velocityTangentToCollision / velocityTowardCollision * NOISE_SCALING, 1.0f),
-            1.0f - DURATION_SCALING * powf(frequency, 0.5f) / velocityTowardCollision, false);
+        
+        // COLLISION SOUND API in Audio has been removed
     }
 }
 
diff --git a/libraries/audio/src/AbstractAudioInterface.h b/libraries/audio/src/AbstractAudioInterface.h
index b5a7be9849..656d3c1f58 100644
--- a/libraries/audio/src/AbstractAudioInterface.h
+++ b/libraries/audio/src/AbstractAudioInterface.h
@@ -25,8 +25,6 @@ class AbstractAudioInterface : public QObject {
 public:
     AbstractAudioInterface(QObject* parent = 0) : QObject(parent) {};
     
-    virtual void startCollisionSound(float magnitude, float frequency, float noise, float duration, bool flashScreen) = 0;
-    virtual void startDrumSound(float volume, float frequency, float duration, float decay) = 0;
 public slots:
     virtual bool outputLocalInjector(bool isStereo, qreal volume, AudioInjector* injector) = 0;
 };
diff --git a/libraries/entities/src/EntityCollisionSystem.h b/libraries/entities/src/EntityCollisionSystem.h
index d3963cd05b..82e135b3c0 100644
--- a/libraries/entities/src/EntityCollisionSystem.h
+++ b/libraries/entities/src/EntityCollisionSystem.h
@@ -49,7 +49,6 @@ public:
     void updateCollisionWithEntities(EntityItem* Entity);
     void updateCollisionWithAvatars(EntityItem* Entity);
     void queueEntityPropertiesUpdate(EntityItem* Entity);
-    void updateCollisionSound(EntityItem* Entity, const glm::vec3 &penetration, float frequency);
 
 signals:
     void entityCollisionWithVoxel(const EntityItemID& entityItemID, const VoxelDetail& voxel, const Collision& collision);