Merge remote-tracking branch 'origin/master' into fix_deadlock_using_rxmessage_queue

Author: gaudryc

hardware/LogitechMediaServer.cpp

@@ -105,8 +105,6 @@ bool CLogitechMediaServer::StartHardware()
 
 	StartHeartbeatThread();
 
-	ReloadNodes();
-
 	//Start worker thread
 	m_stoprequested = false;
 	m_thread = boost::shared_ptr<boost::thread>(new boost::thread(boost::bind(&CLogitechMediaServer::Do_Work, this)));
@@ -282,9 +280,12 @@ void CLogitechMediaServer::Do_Node_Work(const LogitechMediaServerNode &Node)
 						if (sYear == "0") sYear = "";
 						if (sYear != "")
 							sYear = " (" + sYear + ")";
+
+						sLabel = sArtist + " - " + sTitle + sYear;
 					}
+					else
+						sLabel = "(empty playlist)";
 
-					sLabel = sArtist + " - " + sTitle + sYear;
 					sStatus = sLabel;
 				}
 			}
@@ -308,6 +309,9 @@ void CLogitechMediaServer::Do_Work()
 
 	_log.Log(LOG_STATUS, "Logitech Media Server: Worker started...");
 
+	ReloadNodes();
+	ReloadPlaylists();
+
 	while (!m_stoprequested)
 	{
 		sleep_milliseconds(500);
@@ -509,26 +513,23 @@ bool CLogitechMediaServer::WriteToHardware(const char *pdata, const unsigned cha
 			{
 			case light2_sOn:
 			case light2_sGroupOn:
-				SendCommand(itt->ID, "PowerOn");
-				return true;
+				return SendCommand(itt->ID, "PowerOn");
 			case light2_sOff:
 			case light2_sGroupOff:
-				SendCommand(itt->ID, "PowerOff");
-				return true;
+				return SendCommand(itt->ID, "PowerOff");
 			case gswitch_sPlay:
 				SendCommand(itt->ID, "NowPlaying");
-				SendCommand(itt->ID, "Play");
-				return true;
+				return SendCommand(itt->ID, "Play");
+			case gswitch_sPlayPlaylist:
+				sParam = GetPlaylistByRefID(iParam);
+				return SendCommand(itt->ID, "PlayPlaylist", sParam);
 			case gswitch_sStop:
-				SendCommand(itt->ID, "Stop");
-				return true;
+				return SendCommand(itt->ID, "Stop");
 			case gswitch_sPause:
-				SendCommand(itt->ID, "Pause");
-				return true;
+				return SendCommand(itt->ID, "Pause");
 			case gswitch_sSetVolume:
 				sParam = boost::lexical_cast<std::string>(iParam);
-				SendCommand(itt->ID, "SetVolume", sParam);
-				return true;
+				return SendCommand(itt->ID, "SetVolume", sParam);
 			default:
 				return true;
 			}
@@ -576,7 +577,44 @@ void CLogitechMediaServer::ReloadNodes()
 		_log.Log(LOG_ERROR, "Logitech Media Server: No player-switches found.");
 }
 
-void CLogitechMediaServer::SendCommand(const int ID, const std::string &command, const std::string &param)
+void CLogitechMediaServer::ReloadPlaylists()
+{
+	m_playlists.clear();
+
+	std::string sPostdata = "{\"id\":1,\"method\":\"slim.request\",\"params\":[\"\",[\"playlists\",0,999]]}";
+	Json::Value root = Query(m_IP, m_Port, sPostdata);
+
+	int totPlaylists = root["count"].asInt();
+	if (totPlaylists > 0) {
+		_log.Log(LOG_STATUS, "Logitech Media Server: %i playlist(s) found.", totPlaylists);
+		for (int ii = 0; ii < totPlaylists; ii++)
+		{
+			LMSPlaylistNode pnode;
+
+			pnode.ID = root["playlists_loop"][ii]["id"].asInt();
+			pnode.Name = root["playlists_loop"][ii]["playlist"].asString();
+			pnode.refID = pnode.ID % 256;
+
+			m_playlists.push_back(pnode);
+		}
+	}
+	else
+		_log.Log(LOG_STATUS, "Logitech Media Server: No playlists found.");
+}
+
+std::string CLogitechMediaServer::GetPlaylistByRefID(const int ID)
+{
+	std::vector<CLogitechMediaServer::LMSPlaylistNode>::const_iterator itt;
+
+	for (itt = m_playlists.begin(); itt != m_playlists.end(); ++itt) {
+		if (itt->refID == ID) return itt->Name;
+	}
+
+	_log.Log(LOG_ERROR, "Logitech Media Server: Playlist ID %d not found.", ID);
+	return "";
+}
+
+bool CLogitechMediaServer::SendCommand(const int ID, const std::string &command, const std::string &param)
 {
 	std::vector<std::vector<std::string> > result;
 	std::string sPlayerId = "";
@@ -640,6 +678,10 @@ void CLogitechMediaServer::SendCommand(const int ID, const std::string &command,
 		else if (command == "Play") {
 			sLMSCmnd = "\"button\", \"play.single\"";
 		}
+		else if (command == "PlayPlaylist") {
+			if (param == "") return false;
+			sLMSCmnd = "\"playlist\", \"play\", \"" + param + "\"";
+		}
 		else if (command == "Pause") {
 			sLMSCmnd = "\"button\", \"pause.single\"";
 		}
@@ -653,22 +695,51 @@ void CLogitechMediaServer::SendCommand(const int ID, const std::string &command,
 			sLMSCmnd = "\"power\", \"0\"";
 		}
 		else if (command == "SetVolume") {
+			if (param == "") return false;
 			sLMSCmnd = "\"mixer\", \"volume\", \"" + param + "\"";
 		}
 
 		if (sLMSCmnd != "")
 		{
 			std::string sPostdata = "{\"id\":1,\"method\":\"slim.request\",\"params\":[\"" + sPlayerId + "\",[" + sLMSCmnd + "]]}";
 			Json::Value root = Query(m_IP, m_Port, sPostdata);
+
+			sPostdata = "{\"id\":1,\"method\":\"slim.request\",\"params\":[\"" + sPlayerId + "\",[\"status\",\"-\",1,\"tags:uB\"]]}";
+			root = Query(m_IP, m_Port, sPostdata);
+
+			if (root["player_connected"].asString() == "1")
+			{
+				std::string sPower = root["power"].asString();
+				std::string sMode = root["mode"].asString();
+
+				if (command == "Stop")
+					return sMode == "stop";
+				else if (command == "Pause")
+					return sMode == "pause";
+				else if (command == "Play")
+					return sMode == "play";
+				else if (command == "PlayPlaylist")
+					return sMode == "play";
+				else if (command == "PowerOn")
+					return sPower == "1";
+				else if (command == "PowerOff")
+					return sPower == "0";
+				else
+					return false;
+			}
+			else
+				return false;
 		}
 		else
 		{
 			_log.Log(LOG_ERROR, "Logitech Media Server: (%s) Command: '%s'. Unknown command.", result[0][0].c_str(), command.c_str());
+			return false;
 		}
 	}
 	else
 	{
 		_log.Log(LOG_ERROR, "Logitech Media Server: (%d) Command: '%s'. Device not found.", ID, command.c_str());
+		return false;
 	}
 }
 
@@ -686,6 +757,23 @@ void CLogitechMediaServer::SendText(const std::string &playerIP, const std::stri
 	}
 }
 
+std::vector<CLogitechMediaServer::LMSPlaylistNode> CLogitechMediaServer::GetPlaylists()
+{
+	return m_playlists;
+}
+
+int CLogitechMediaServer::GetPlaylistRefID(const std::string &name)
+{
+	std::vector<CLogitechMediaServer::LMSPlaylistNode>::const_iterator itt;
+
+	for (itt = m_playlists.begin(); itt != m_playlists.end(); ++itt) {
+		if (itt->Name == name) return itt->refID;
+	}
+
+	_log.Log(LOG_ERROR, "Logitech Media Server: Playlist '%s' not found.", name.c_str());
+	return 0;
+}
+
 //Webserver helpers
 namespace http {
 	namespace server {
@@ -757,6 +845,34 @@ namespace http {
 			}
 		}
 
+		void CWebServer::Cmd_LMSGetPlaylists(WebEmSession & session, const request& req, Json::Value &root)
+		{
+			std::string hwid = request::findValue(&req, "idx");
+			if (hwid == "")
+				return;
+			int iHardwareID = atoi(hwid.c_str());
+			CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardware(iHardwareID);
+			if (pBaseHardware == NULL)
+				return;
+			if (pBaseHardware->HwdType != HTYPE_LogitechMediaServer)
+				return;
+			CLogitechMediaServer *pHardware = (CLogitechMediaServer*)pBaseHardware;
+
+			root["status"] = "OK";
+			root["title"] = "Cmd_LMSGetPlaylists";
+
+			std::vector<CLogitechMediaServer::LMSPlaylistNode> m_nodes = pHardware->GetPlaylists();
+			std::vector<CLogitechMediaServer::LMSPlaylistNode>::const_iterator itt;
+
+			int ii = 0;
+			for (itt = m_nodes.begin(); itt != m_nodes.end(); ++itt) {
+				root["result"][ii]["id"] = itt->ID;
+				root["result"][ii]["refid"] = itt->refID;
+				root["result"][ii]["Name"] = itt->Name;
+				ii++;
+			}
+		}
+
 		void CWebServer::Cmd_LMSMediaCommand(WebEmSession & session, const request& req, Json::Value &root)
 		{
 			std::string sIdx = request::findValue(&req, "idx");

hardware/LogitechMediaServer.h

@@ -21,6 +21,13 @@ class CLogitechMediaServer : public CDomoticzHardwareBase
 		std::string		sShortStatus;
 	};
 public:
+	struct LMSPlaylistNode
+	{
+		int				ID;
+		int				refID;
+		std::string		Name;
+	};
+
 	CLogitechMediaServer(const int ID, const std::string IPAddress, const int Port, const int PollIntervalsec, const int PingTimeoutms);
 	CLogitechMediaServer(const int ID, const std::string IPAddress, const int Port);
 	CLogitechMediaServer(const int ID);
@@ -32,8 +39,10 @@ class CLogitechMediaServer : public CDomoticzHardwareBase
 	void RemoveAllNodes();
 	void SetSettings(const int PollIntervalsec, const int PingTimeoutms);
 	void Restart();
-	void SendCommand(const int ID, const std::string &command, const std::string &param = "");
+	bool SendCommand(const int ID, const std::string &command, const std::string &param = "");
 	void SendText(const std::string &playerIP, const std::string &subject, const std::string &text, const int duration);
+	std::vector<LMSPlaylistNode> GetPlaylists();
+	int GetPlaylistRefID(const std::string &name);
 private:
 	_eNotificationTypes	NotificationType(_eMediaStatus nStatus);
 	void Do_Work();
@@ -46,8 +55,11 @@ class CLogitechMediaServer : public CDomoticzHardwareBase
 	void Do_Node_Work(const LogitechMediaServerNode &Node);
 	void UpdateNodeStatus(const LogitechMediaServerNode &Node, const _eMediaStatus nStatus, const std::string sStatus, const bool bPingOK);
 	void ReloadNodes();
+	void ReloadPlaylists();
+	std::string GetPlaylistByRefID(const int ID);
 
 	std::vector<LogitechMediaServerNode> m_nodes;
+	std::vector<LMSPlaylistNode> m_playlists;
 
 	int m_iThreadsRunning;
 	int m_iPollInterval;

hardware/hardwaretypes.h

@@ -138,6 +138,7 @@
 #define gswitch_sPause				0x13
 #define gswitch_sPlay				0x14
 #define gswitch_sSetVolume			0x15
+#define gswitch_sPlayPlaylist		0x16
 //--------------
 
 #define pTypeLux		0xF6

main/EventSystem.cpp

@@ -6,6 +6,7 @@
 #include "SQLHelper.h"
 #include "Logger.h"
 #include "../hardware/hardwaretypes.h"
+#include "../hardware/LogitechMediaServer.h"
 #include <iostream>
 #include "../httpclient/HTTPClient.h"
 #include "localtime_r.h"
@@ -2705,7 +2706,7 @@ bool CEventSystem::ScheduleEvent(std::string deviceName, const std::string &Acti
 	std::vector<std::vector<std::string> > result;
 
 	if (isScene) {
-		result = m_sql.safe_query("SELECT ID FROM	Scenes WHERE (Name == '%q')",
+		result = m_sql.safe_query("SELECT ID FROM Scenes WHERE (Name == '%q')",
 			deviceName.c_str());
 	}
 	else {
@@ -2776,6 +2777,19 @@ bool CEventSystem::ScheduleEvent(int deviceID, std::string Action, bool isScene,
 		Action = Action.substr(0, 10);
 	}
 
+	if (Action.find("Play Playlist") == 0)
+	{
+		CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardwareByType(HTYPE_LogitechMediaServer);
+		if (pBaseHardware == NULL) return false;
+		CLogitechMediaServer *pHardware = (CLogitechMediaServer*)pBaseHardware;
+
+		int iPlaylistID = pHardware->GetPlaylistRefID(Action.substr(14).c_str());
+		if (iPlaylistID == 0) return false;
+
+		_level = iPlaylistID;
+		Action = Action.substr(0, 13);
+	}
+
 	int DelayTime = 1;
 
 	if (randomTimer > 0) {

main/RFXNames.cpp

@@ -2012,6 +2012,11 @@ bool GetLightCommand(
 			cmd = gswitch_sPlay;
 			return true;
 		}
+		else if (switchcmd == "Play Playlist")
+		{
+			cmd = gswitch_sPlayPlaylist;
+			return true;
+		}
 		else if (switchcmd == "Set Volume")
 		{
 			cmd = gswitch_sSetVolume;

main/WebServer.cpp

@@ -386,6 +386,7 @@ namespace http {
 
 			RegisterCommandCode("lmssetmode", boost::bind(&CWebServer::Cmd_LMSSetMode, this, _1, _2, _3));
 			RegisterCommandCode("lmsgetnodes", boost::bind(&CWebServer::Cmd_LMSGetNodes, this, _1, _2, _3));
+			RegisterCommandCode("lmsgetplaylists", boost::bind(&CWebServer::Cmd_LMSGetPlaylists, this, _1, _2, _3));
 			RegisterCommandCode("lmsmediacommand", boost::bind(&CWebServer::Cmd_LMSMediaCommand, this, _1, _2, _3));
 
 			RegisterCommandCode("savefibarolinkconfig", boost::bind(&CWebServer::Cmd_SaveFibaroLinkConfig, this, _1, _2, _3));

main/WebServer.h

@@ -116,6 +116,7 @@ class CWebServer : public session_store
 	void Cmd_KodiMediaCommand(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_LMSSetMode(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_LMSGetNodes(WebEmSession & session, const request& req, Json::Value &root);
+	void Cmd_LMSGetPlaylists(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_LMSMediaCommand(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_SaveFibaroLinkConfig(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_GetFibaroLinkConfig(WebEmSession & session, const request& req, Json::Value &root);

main/mainworker.cpp

@@ -9669,8 +9669,10 @@ bool MainWorker::SwitchLightInt(const std::vector<std::string> &sd, std::string
 			}
 			else if (switchtype == STYPE_Media)
 			{
-				level = (level < 0) ? 0 : level;
-				level = (level > 100) ? 100 : level;
+				if (switchcmd == "Set Volume") {
+					level = (level < 0) ? 0 : level;
+					level = (level > 100) ? 100 : level;
+				}
 			}
 			else 
 				level = (level > 15) ? 15 : level;
@@ -9699,9 +9701,6 @@ bool MainWorker::SwitchLightInt(const std::vector<std::string> &sd, std::string
 			}
 
 			if (!IsTesting) {
-				//Skip for LMS SetVolume
-				if ((pHardware->HwdType == HTYPE_LogitechMediaServer) && (lcmd.LIGHTING2.cmnd == gswitch_sSetVolume))
-					return true;
 				//send to internal for now (later we use the ACK)
 				PushAndWaitRxMessage(m_hardwaredevices[hindex],(const unsigned char *)&lcmd);
 			}