Merge branch 'dev'

Homegear · Jul 7, 2016 · 65d3088 · 65d3088
2 parents 2fe09c4 + f182317
commit 65d3088
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/KodiInterface.cpp b/src/KodiInterface.cpp
@@ -39,7 +39,7 @@ KodiInterface::KodiInterface()
 	_out.setPrefix(GD::out.getPrefix() + "Kodi interface: ");
 
 	signal(SIGPIPE, SIG_IGN);
-	_socket = std::unique_ptr<BaseLib::SocketOperations>(new BaseLib::SocketOperations(GD::bl));
+	_socket = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(GD::bl));
 
 	_jsonEncoder.reset(new BaseLib::RPC::JsonEncoder(GD::bl));
 	_jsonDecoder.reset(new BaseLib::RPC::JsonDecoder(GD::bl));
@@ -247,7 +247,7 @@ void KodiInterface::startListening()
 	{
 		stopListening();
 		if(_hostname.empty()) return;
-		_socket = std::unique_ptr<BaseLib::SocketOperations>(new BaseLib::SocketOperations(GD::bl, _hostname, std::to_string(_port)));
+		_socket = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(GD::bl, _hostname, std::to_string(_port)));
 		GD::bl->threadManager.start(_listenThread, true, &KodiInterface::listen, this);
 	}
     catch(const std::exception& ex)

diff --git a/src/KodiInterface.h b/src/KodiInterface.h
@@ -68,7 +68,7 @@ class KodiInterface
 	};
 
 	BaseLib::Output _out;
-	std::unique_ptr<BaseLib::SocketOperations> _socket;
+	std::unique_ptr<BaseLib::TcpSocket> _socket;
 	std::string _hostname;
 	int32_t _port = 9090;
 	std::unique_ptr<BaseLib::RPC::JsonEncoder> _jsonEncoder;

diff --git a/src/MyPeer.cpp b/src/MyPeer.cpp
@@ -507,7 +507,7 @@ void MyPeer::getValuesFromPacket(std::shared_ptr<MyPacket> packet, std::vector<F
 						if(frame->channel == -2)
 						{
 							startChannel = 0;
-							endChannel = (_rpcDevice->functions.end()--)->first;
+							endChannel = _rpcDevice->functions.rbegin()->first;
 						}
 						else endChannel = startChannel;
 						for(int32_t l = startChannel; l <= endChannel; l++)