Merge branch 'dev'

Homegear · Feb 20, 2018 · d2d2d18 · d2d2d18
2 parents 8ca9ced + 1f08bd6
commit d2d2d18
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/misc/State Directory/audio/Silence_250ms.mp3 b/misc/State Directory/audio/Silence_250ms.mp3
diff --git a/misc/State Directory/audio/Silence_2s.mp3 b/misc/State Directory/audio/Silence_2s.mp3
diff --git a/src/Interfaces.cpp b/src/Interfaces.cpp
@@ -62,6 +62,7 @@ void Interfaces::create()
 				GD::physicalInterface = device;
 			}
 		}
+		if(!GD::physicalInterface) GD::physicalInterface = std::make_shared<ISonosInterface>(std::make_shared<BaseLib::Systems::PhysicalInterfaceSettings>());
 	}
 	catch(const std::exception& ex)
 	{

diff --git a/src/PhysicalInterfaces/ISonosInterface.h b/src/PhysicalInterfaces/ISonosInterface.h
@@ -41,10 +41,11 @@ class ISonosInterface : public BaseLib::Systems::IPhysicalInterface
 	ISonosInterface(std::shared_ptr<BaseLib::Systems::PhysicalInterfaceSettings> settings);
 	virtual ~ISonosInterface();
 
-	virtual std::string listenAddress() = 0;
-	virtual int32_t listenPort() = 0;
-	virtual std::string ttsProgram() = 0;
-	virtual std::string dataPath() = 0;
+	virtual std::string listenAddress() { return "::1"; }
+	virtual int32_t listenPort() { return 7373; }
+	virtual std::string ttsProgram() { return ""; }
+	virtual std::string dataPath() { return ""; }
+    virtual void sendPacket(std::shared_ptr<BaseLib::Systems::Packet> packet) {}
 protected:
 	BaseLib::Output _out;
 };

diff --git a/src/SonosCentral.cpp b/src/SonosCentral.cpp
@@ -434,11 +434,26 @@ void SonosCentral::deletePeer(uint64_t id)
 		}
 
 		raiseRPCDeleteDevices(deviceAddresses, deviceInfo);
+
+        {
+            std::lock_guard<std::mutex> peersGuard(_peersMutex);
+            if(_peersBySerial.find(peer->getSerialNumber()) != _peersBySerial.end()) _peersBySerial.erase(peer->getSerialNumber());
+            if(_peersById.find(id) != _peersById.end()) _peersById.erase(id);
+        }
+
+        if(_currentPeer && _currentPeer->getID() == id) _currentPeer.reset();
+
+        int32_t i = 0;
+        while(peer.use_count() > 1 && i < 600)
+        {
+            if(_currentPeer && _currentPeer->getID() == id) _currentPeer.reset();
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            i++;
+        }
+        if(i == 600) GD::out.printError("Error: Peer deletion took too long.");
+
 		peer->deleteFromDatabase();
-		_peersMutex.lock();
-		if(_peersBySerial.find(peer->getSerialNumber()) != _peersBySerial.end()) _peersBySerial.erase(peer->getSerialNumber());
-		if(_peersById.find(id) != _peersById.end()) _peersById.erase(id);
-		_peersMutex.unlock();
+
 		GD::out.printMessage("Removed Sonos peer " + std::to_string(peer->getID()));
 	}
 	catch(const std::exception& ex)

diff --git a/src/SonosPeer.cpp b/src/SonosPeer.cpp
@@ -2191,7 +2191,7 @@ void SonosPeer::playLocalFile(std::string filename, bool now, bool unmute, int32
 		playlistFilename = BaseLib::Http::encodeURL(playlistFilename);
 
 		std::string silence2sPlaylistFilename = "silence_2s.m3u";
-		playlistContent = "#EXTM3U\n#EXTINF:0,<Homegear><TTS><TTS>\nhttp://" + GD::physicalInterface->listenAddress() + ':' + std::to_string(GD::physicalInterface->listenPort()) + "/Silence_2s.mp3\n";
+		playlistContent = "#EXTM3U\n#EXTINF:0,<Homegear><TTS><TTS>\nhttp://" + GD::physicalInterface->listenAddress() + ':' + std::to_string(GD::physicalInterface->listenPort()) + "/Silence_250ms.mp3\n";
 		std::string silencePlaylistFilepath = tempPath + silence2sPlaylistFilename;
 		BaseLib::Io::writeFile(silencePlaylistFilepath, playlistContent);
 		silence2sPlaylistFilename = BaseLib::Http::encodeURL(silence2sPlaylistFilename);