fix teardown of recording and ScriptEngine(s)

assignment-client/src/Agent.cpp

@@ -96,7 +96,6 @@ Agent::Agent(ReceivedMessage& message) :
     DependencyManager::set<recording::Recorder>();
     DependencyManager::set<recording::ClipCache>();
 
-    DependencyManager::set<ScriptCache>();
     DependencyManager::set<RecordingScriptingInterface>();
     DependencyManager::set<UsersScriptingInterface>();
 
@@ -177,6 +176,8 @@ void Agent::run() {
     // Create ScriptEngines on threaded-assignment thread then move to main thread.
     DependencyManager::set<ScriptEngines>(ScriptEngine::AGENT_SCRIPT)->moveToThread(qApp->thread());
 
+    DependencyManager::set<ScriptCache>();
+
     // make sure we request our script once the agent connects to the domain
     auto nodeList = DependencyManager::get<NodeList>();
 
@@ -360,6 +361,9 @@ void Agent::scriptRequestFinished() {
 }
 
 void Agent::executeScript() {
+    // the following block is scoped so that any shared pointers we take here
+    // are cleared before we call setFinished at the end of the function
+    {
         _scriptEngine = scriptEngineFactory(ScriptEngine::AGENT_SCRIPT, _scriptContents, _payload);
 
         // setup an Avatar for the script to use
@@ -385,7 +389,7 @@ void Agent::executeScript() {
         _scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
 
         auto player = DependencyManager::get<recording::Deck>();
-    connect(player.data(), &recording::Deck::playbackStateChanged, [=] {
+        connect(player.data(), &recording::Deck::playbackStateChanged, [&player, &scriptedAvatar] {
             if (player->isPlaying()) {
                 auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
                 if (recordingInterface->getPlayFromCurrentLocation()) {
@@ -490,7 +494,7 @@ void Agent::executeScript() {
 
         DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
 
-    QMetaObject::invokeMethod(&_avatarAudioTimer, "start");
+        _avatarAudioTimer.start();
 
         // Agents should run at 45hz
         static const int AVATAR_DATA_HZ = 45;
@@ -507,7 +511,18 @@ void Agent::executeScript() {
         Frame::clearFrameHandler(AUDIO_FRAME_TYPE);
         Frame::clearFrameHandler(AVATAR_FRAME_TYPE);
 
-    DependencyManager::destroy<RecordingScriptingInterface>();
+        if (recordingInterface->isPlaying()) {
+            recordingInterface->stopPlaying();
+        }
+
+        if (recordingInterface->isRecording()) {
+            recordingInterface->stopRecording();
+        }
+
+        avatarDataTimer->stop();
+        _avatarAudioTimer.stop();
+    }
+
     setFinished(true);
 }
 
@@ -859,17 +874,25 @@ void Agent::aboutToFinish() {
     DependencyManager::destroy<SoundCache>();
     DependencyManager::destroy<AudioScriptingInterface>();
 
+    DependencyManager::destroy<RecordingScriptingInterface>();
     DependencyManager::destroy<recording::Deck>();
     DependencyManager::destroy<recording::Recorder>();
     DependencyManager::destroy<recording::ClipCache>();
-    DependencyManager::destroy<ScriptEngine>();
+
+    // drop our shared pointer to the script engine, then ask ScriptEngines to shutdown scripting
+    // this ensures that the ScriptEngine goes down before ScriptEngines
+    _scriptEngine.clear();
+
+    {
+        DependencyManager::get<ScriptEngines>()->shutdownScripting();
+    }
+    
+    DependencyManager::destroy<ScriptEngines>();
 
     DependencyManager::destroy<AssignmentDynamicFactory>();
 
     DependencyManager::destroy<ScriptableAvatar>();
 
-    QMetaObject::invokeMethod(&_avatarAudioTimer, "stop");
-
     // cleanup codec & encoder
     if (_codec && _encoder) {
         _codec->releaseEncoder(_encoder);

libraries/avatars-renderer/src/avatars-renderer/Head.cpp

@@ -14,7 +14,6 @@
 #include <gpu/Batch.h>
 
 #include <NodeList.h>
-#include <recording/Deck.h>
 #include <DependencyManager.h>
 #include <GeometryUtil.h>
 #include <trackers/FaceTracker.h>