player picture receive listener

doc/client.dox.in

@@ -808,6 +808,7 @@ EXCLUDE                = "@abs_top_srcdir@/src/client/interceptederrorexception.
                          "@abs_top_srcdir@/src/test" \
                          "@abs_top_srcdir@/src/include/abstractsocket.h" \
                          "@abs_top_srcdir@/src/include/linkercontrol.h" \
+                         "@abs_top_srcdir@/src/include/iplayerpiclistener.h" \
                          "@abs_top_srcdir@/src/common/icardfactory.h" \
                          "@abs_top_srcdir@/src/common/iplayer.h" \
                          "@abs_top_srcdir@/src/common/stdplayer.h" \

src/client/abstractclient.cpp

@@ -69,13 +69,13 @@ struct cardEqualsDescription : public std::binary_function < NetMauMau::Common::
 using namespace NetMauMau::Client;
 
 AbstractClient::AbstractClient(const std::string &pName, const unsigned char *data, std::size_t len,
-							   const std::string &server, uint16_t port) : m_connection(pName,
-										   server, port), m_pName(pName), m_pngData(data),
-	m_pngDataLen(len), m_cards(), m_openCard(0L), m_disconnectNow(false) {}
+							   const std::string &server, uint16_t port) : IPlayerPicListener(),
+	m_connection(pName, server, port), m_pName(pName), m_pngData(data), m_pngDataLen(len),
+	m_cards(), m_openCard(0L), m_disconnectNow(false) {}
 
 AbstractClient::AbstractClient(const std::string &pName, const std::string &server, uint16_t port)
-	: m_connection(pName, server, port), m_pName(pName), m_pngData(0L), m_pngDataLen(0), m_cards(),
-	  m_openCard(0L), m_disconnectNow(false) {}
+	: IPlayerPicListener(), m_connection(pName, server, port), m_pName(pName), m_pngData(0L),
+	  m_pngDataLen(0), m_cards(), m_openCard(0L), m_disconnectNow(false) {}
 
 AbstractClient::~AbstractClient() {
 
@@ -121,7 +121,7 @@ throw(NetMauMau::Common::Exception::SocketException) {
 Connection::PLAYERINFOS AbstractClient::playerList(bool playerPNG, timeval *timeout)
 throw(NetMauMau::Common::Exception::SocketException) {
 	m_connection.setTimeout(timeout);
-	return m_connection.playerList(playerPNG);
+	return m_connection.playerList(this, playerPNG);
 }
 
 void AbstractClient::play(timeval *timeout) throw(NetMauMau::Common::Exception::SocketException) {
@@ -184,11 +184,16 @@ void AbstractClient::play(timeval *timeout) throw(NetMauMau::Common::Exception::
 					std::string plPic;
 
 					m_connection >> msg;
+
+					beginReceivePlayerPicture(msg);
+
 					m_connection >> plPic;
 
 					const std::vector<NetMauMau::Common::BYTE>
 					&plPicPng(NetMauMau::Common::base64_decode(plPic));
 
+					endReceivePlayerPicture(msg);
+
 					playerJoined(msg, plPic == "-" ? 0L : plPicPng.data(),
 								 plPic == "-" ? 0 : plPicPng.size());
 
@@ -406,4 +411,8 @@ uint16_t AbstractClient::getDefaultPort() {
 	return SERVER_PORT;
 }
 
+void AbstractClient::beginReceivePlayerPicture(const std::string &) const throw() {}
+
+void AbstractClient::endReceivePlayerPicture(const std::string &) const throw() {}
+
 // kate: indent-mode cstyle; indent-width 4; replace-tabs off; tab-width 4; 

src/client/clientconnection.cpp

@@ -101,7 +101,7 @@ throw(NetMauMau::Common::Exception::SocketException) {
 }
 #pragma GCC diagnostic pop
 
-Connection::PLAYERINFOS Connection::playerList(bool playerPNG)
+Connection::PLAYERINFOS Connection::playerList(const IPlayerPicListener *hdl,  bool playerPNG)
 throw(NetMauMau::Common::Exception::SocketException) {
 
 	PLAYERINFOS plv;
@@ -121,12 +121,17 @@ throw(NetMauMau::Common::Exception::SocketException) {
 
 		*this >> pl;
 
-		if(playerPNG) *this >> pic;
+		if(playerPNG) {
+			hdl->beginReceivePlayerPicture(pl);
+			*this >> pic;
+		}
 
 		while(pl != "PLAYERLISTEND") {
 
 			const std::vector<NetMauMau::Common::BYTE> &pp(NetMauMau::Common::base64_decode(pic));
 
+			if(playerPNG) hdl->endReceivePlayerPicture(pl);
+
 			NetMauMau::Common::BYTE *ppd = 0L;
 
 			if(!pic.empty() && pic != "-") {
@@ -140,7 +145,13 @@ throw(NetMauMau::Common::Exception::SocketException) {
 
 			*this >> pl;
 
-			if(playerPNG) *this >> pic;
+			const bool ple = (pl == "PLAYERLISTEND");
+
+			if(playerPNG) {
+				if(!ple) hdl->beginReceivePlayerPicture(pl);
+
+				*this >> pic;
+			}
 		}
 
 	} else {

src/include/Makefile.am

@@ -1,4 +1,5 @@
 pkginclude_HEADERS = abstractclient.h clientconnection.h timeoutexception.h icard.h \
 	linkercontrol.h abstractconnection.h abstractsocket.h socketexception.h cardtools.h \
 	shutdownexception.h playerlistexception.h capabilitiesexception.h protocolerrorexception.h \
-	connectionrejectedexception.h versionmismatchexception.h nonetmaumauserverexception.h
+	connectionrejectedexception.h versionmismatchexception.h nonetmaumauserverexception.h \
+	iplayerpiclistener.h

src/include/abstractclient.h

@@ -106,8 +106,9 @@
 
 #include <vector>
 
-#include "icard.h"
+#include "iplayerpiclistener.h"
 #include "clientconnection.h"
+#include "icard.h"
 
 namespace NetMauMau {
 
@@ -135,7 +136,7 @@ namespace Client {
  *
  * @note All data is transferred as UTF-8 encoded byte strings
  */
-class _EXPORT AbstractClient {
+class _EXPORT AbstractClient : protected IPlayerPicListener {
 	DISALLOW_COPY_AND_ASSIGN(AbstractClient)
 public:
 	/// @copydoc Connection::CAPABILITIES
@@ -390,6 +391,9 @@ class _EXPORT AbstractClient {
 	virtual void playerJoined(const std::string &player, const unsigned char *pngData,
 							  std::size_t len) const = 0;
 
+	virtual void beginReceivePlayerPicture(const std::string &player) const throw() _CONST;
+	virtual void endReceivePlayerPicture(const std::string &player) const throw() _CONST;
+
 	/**
 	 * @brief A player got rejected to join the game
 	 *

src/include/clientconnection.h

@@ -32,6 +32,8 @@ namespace NetMauMau {
 
 namespace Client {
 
+class IPlayerPicListener;
+
 /**
  * @brief Handles the connection from the client to a server
  */
@@ -65,7 +67,8 @@ class _EXPORT Connection : public Common::AbstractConnection {
 	virtual void connect(const unsigned char *pngData,
 						 std::size_t pngDataLen) throw(Common::Exception::SocketException);
 	CAPABILITIES capabilities() throw(NetMauMau::Common::Exception::SocketException);
-	PLAYERINFOS playerList(bool playerPNG) throw(Common::Exception::SocketException);
+	PLAYERINFOS playerList(const IPlayerPicListener *hdl,
+						   bool playerPNG) throw(Common::Exception::SocketException);
 
 	void setTimeout(struct timeval *timeout);
 

src/include/iplayerpiclistener.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2014 by Heiko Schäfer <heiko@rangun.de>
+ *
+ * This file is part of NetMauMau.
+ *
+ * NetMauMau is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * NetMauMau is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NetMauMau.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NETMAUMAU_IPLAYERPICHANDLER_H
+#define NETMAUMAU_IPLAYERPICHANDLER_H
+
+#include <string>
+
+#include "linkercontrol.h"
+
+namespace NetMauMau {
+
+namespace Client {
+
+class IPlayerPicListener {
+	DISALLOW_COPY_AND_ASSIGN(IPlayerPicListener)
+public:
+	virtual ~IPlayerPicListener() {}
+
+	virtual void beginReceivePlayerPicture(const std::string &player) const throw() = 0;
+	virtual void endReceivePlayerPicture(const std::string &player) const throw() = 0;
+
+protected:
+	IPlayerPicListener() {}
+};
+
+}
+
+}
+
+#endif /* NETMAUMAU_IPLAYERPICHANDLER_H */
+
+// kate: indent-mode cstyle; indent-width 4; replace-tabs off; tab-width 4; 

src/server/Makefile.am

@@ -9,7 +9,7 @@ endif
 DISTCLEANFILES = $(man1_MANS)
 
 noinst_HEADERS = serverconnection.h serverplayer.h servereventhandler.h game.h \
-	serverplayerexception.h
+	serverplayerexception.h ai-icon.h
 
 if PIDFILE
 nmm_server_CPPFLAGS = -DPIDFILE="\"$(localstatedir)/run/$(PACKAGE).pid\""