From 661221a189cb946598d214430253766d6a8c0f1c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 12 Jan 2015 16:04:00 -0800
Subject: [PATCH] repairs to AudioScriptingInterface playSound

---
 examples/lobby.js                               |  8 +++++---
 interface/src/Audio.cpp                         |  2 +-
 libraries/audio/src/AudioScriptingInterface.cpp |  3 ++-
 libraries/audio/src/Sound.cpp                   | 15 ++++++++++++---
 libraries/audio/src/Sound.h                     |  8 ++++++--
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/examples/lobby.js b/examples/lobby.js
index b03be7c29b..15a8aca328 100644
--- a/examples/lobby.js
+++ b/examples/lobby.js
@@ -138,8 +138,10 @@ function drawLobby() {
     // add an attachment on this avatar so other people see them in the lobby
     MyAvatar.attach(HELMET_ATTACHMENT_URL, "Neck", {x: 0, y: 0, z: 0}, Quat.fromPitchYawRollDegrees(0, 0, 0), 1.15);
     
-    // start the drone sound
-    currentDrone = Audio.playSound(droneSound, { stereo: true, loop: true, localOnly: true, volume: DRONE_VOLUME });
+    if (droneSound.downloaded) {
+      // start the drone sound
+      currentDrone = Audio.playSound(droneSound, { stereo: true, loop: true, localOnly: true, volume: DRONE_VOLUME });
+    }
     
     // start one of our muzak sounds
     playRandomMuzak();
@@ -353,7 +355,7 @@ function update(deltaTime) {
     Overlays.editOverlay(descriptionText, { position: textOverlayPosition() });
 
     // if the reticle is up then we may need to play the next muzak
-    if (!Audio.isInjectorPlaying(currentMuzakInjector)) {
+    if (currentMuzakInjector && !Audio.isInjectorPlaying(currentMuzakInjector)) {
       playNextMuzak();
     }
   }
diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index bd106d9bc6..844386c9e5 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -880,7 +880,7 @@ bool Audio::outputLocalInjector(bool isStereo, qreal volume, AudioInjector* inje
         localFormat.setChannelCount(isStereo ? 2 : 1);
         
         QAudioOutput* localOutput = new QAudioOutput(getNamedAudioDeviceForMode(QAudio::AudioOutput, _outputAudioDeviceName),
-                                                     localFormat, this);
+                                                     localFormat);
         localOutput->setVolume(volume);
         
         // move the localOutput to the same thread as the local injector buffer
diff --git a/libraries/audio/src/AudioScriptingInterface.cpp b/libraries/audio/src/AudioScriptingInterface.cpp
index 8cd133ad40..120c7a6b5a 100644
--- a/libraries/audio/src/AudioScriptingInterface.cpp
+++ b/libraries/audio/src/AudioScriptingInterface.cpp
@@ -13,7 +13,8 @@
 
 void registerAudioMetaTypes(QScriptEngine* engine) {
     qScriptRegisterMetaType(engine, injectorOptionsToScriptValue, injectorOptionsFromScriptValue);
-    qScriptRegisterMetaType(engine, soundToScriptValue, soundFromScriptValue);
+    qScriptRegisterMetaType(engine, soundSharedPointerToScriptValue, soundSharedPointerFromScriptValue);
+    qScriptRegisterMetaType(engine, soundPointerToScriptValue, soundPointerFromScriptValue);
 }
 
 AudioScriptingInterface& AudioScriptingInterface::getInstance() {
diff --git a/libraries/audio/src/Sound.cpp b/libraries/audio/src/Sound.cpp
index 54ff61d66a..cc41a849e7 100644
--- a/libraries/audio/src/Sound.cpp
+++ b/libraries/audio/src/Sound.cpp
@@ -29,13 +29,22 @@
 #include "AudioEditBuffer.h"
 #include "Sound.h"
 
-QScriptValue soundToScriptValue(QScriptEngine* engine, SharedSoundPointer const& in) {
+static int soundMetaTypeId = qRegisterMetaType<Sound*>();
+
+QScriptValue soundSharedPointerToScriptValue(QScriptEngine* engine, SharedSoundPointer const& in) {
     return engine->newQObject(in.data());
 }
 
-void soundFromScriptValue(const QScriptValue &object, SharedSoundPointer &out) {
+void soundSharedPointerFromScriptValue(const QScriptValue& object, SharedSoundPointer &out) {
     out = SharedSoundPointer(qobject_cast<Sound*>(object.toQObject()));
-    qDebug() << "Sound from script value" << out.data();
+}
+
+QScriptValue soundPointerToScriptValue(QScriptEngine* engine, Sound* const& in) {
+    return engine->newQObject(in);
+}
+
+void soundPointerFromScriptValue(const QScriptValue &object, Sound* &out) {
+    out = qobject_cast<Sound*>(object.toQObject());
 }
 
 Sound::Sound(const QUrl& url, bool isStereo) :
diff --git a/libraries/audio/src/Sound.h b/libraries/audio/src/Sound.h
index 02b75417e8..9aa92feea1 100644
--- a/libraries/audio/src/Sound.h
+++ b/libraries/audio/src/Sound.h
@@ -45,8 +45,12 @@ private:
 typedef QSharedPointer<Sound> SharedSoundPointer;
 
 Q_DECLARE_METATYPE(SharedSoundPointer)
+QScriptValue soundSharedPointerToScriptValue(QScriptEngine* engine, SharedSoundPointer const& in);
+void soundSharedPointerFromScriptValue(const QScriptValue& object, SharedSoundPointer &out);
+
+Q_DECLARE_METATYPE(Sound*)
+QScriptValue soundPointerToScriptValue(QScriptEngine* engine, Sound* const& in);
+void soundPointerFromScriptValue(const QScriptValue& object, Sound* &out);
 
-QScriptValue soundToScriptValue(QScriptEngine* engine, SharedSoundPointer const& in);
-void soundFromScriptValue(const QScriptValue& object, SharedSoundPointer& out);
 
 #endif // hifi_Sound_h