4 files changed, 94 insertions, 1 deletions
diff --git a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
index 3ec5a7a..22019b4 100644
--- a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
+++ b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -75,6 +75,7 @@
 #include <Swiften/Parser/PayloadParsers/PubSubEventParser.h>
 #include <Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/UserLocationParser.h>
+#include <Swiften/Parser/PayloadParsers/UserTuneParser.h>
 
 using namespace boost;
 
@@ -135,6 +136,7 @@ FullPayloadParserFactoryCollection::FullPayloadParserFactoryCollection() {
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<S5BProxyRequestParser> >("query", "http://jabber.org/protocol/bytestreams"));
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<WhiteboardParser> >("wb", "http://swift.im/whiteboard"));
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<UserLocationParser> >("geoloc", "http://jabber.org/protocol/geoloc"));
+	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<UserTuneParser> >("tune", "http://jabber.org/protocol/tune"));
 	factories_.push_back(boost::make_shared<DeliveryReceiptParserFactory>());
 	factories_.push_back(boost::make_shared<DeliveryReceiptRequestParserFactory>());
 	factories_.push_back(boost::make_shared<GenericPayloadParserFactory<IdleParser> >("idle", "urn:xmpp:idle:1"));
diff --git a/Swiften/Parser/PayloadParsers/UserTuneParser.cpp b/Swiften/Parser/PayloadParsers/UserTuneParser.cpp
new file mode 100644
index 0000000..bb299e4
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/UserTuneParser.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#include <Swiften/Parser/PayloadParsers/UserTuneParser.h>
+
+#include <boost/lexical_cast.hpp>
+
+using namespace Swift;
+
+UserTuneParser::UserTuneParser() : level(0) {
+}
+
+UserTuneParser::~UserTuneParser() {
+}
+
+void UserTuneParser::handleStartElement(const std::string&, const std::string&, const AttributeMap&) {
+	if (level == 1) {
+		currentText = "";
+	}
+	++level;
+}
+
+void UserTuneParser::handleEndElement(const std::string& element, const std::string&) {
+	--level;
+	if (level == 1) {
+		try {
+			if (element == "artist") {
+				getPayloadInternal()->setArtist(currentText);
+			}
+			else if (element == "length") {
+				getPayloadInternal()->setLength(boost::lexical_cast<unsigned int>(currentText));
+			}
+			else if (element == "rating") {
+				getPayloadInternal()->setRating(boost::lexical_cast<unsigned int>(currentText));
+			}
+			else if (element == "source") {
+				getPayloadInternal()->setSource(currentText);
+			}
+			else if (element == "title") {
+				getPayloadInternal()->setTitle(currentText);
+			}
+			else if (element == "track") {
+				getPayloadInternal()->setTrack(currentText);
+			}
+			else if (element == "URI") {
+				getPayloadInternal()->setURI(currentText);
+			}
+		}
+		catch (const boost::bad_lexical_cast&) {
+		}
+	}
+}
+
+void UserTuneParser::handleCharacterData(const std::string& data) {
+	currentText += data;
+}
diff --git a/Swiften/Parser/PayloadParsers/UserTuneParser.h b/Swiften/Parser/PayloadParsers/UserTuneParser.h
new file mode 100644
index 0000000..1cfadea
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/UserTuneParser.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+#include <string>
+
+#include <Swiften/Base/Override.h>
+#include <Swiften/Base/API.h>
+#include <Swiften/Parser/GenericPayloadParser.h>
+#include <Swiften/Elements/UserTune.h>
+
+namespace Swift {
+	class SWIFTEN_API UserTuneParser : public GenericPayloadParser<UserTune> {
+		public:
+			UserTuneParser();
+			virtual ~UserTuneParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
+			virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
+			virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+
+		private:
+			int level;
+			std::string currentText;
+	};
+}
diff --git a/Swiften/Parser/SConscript b/Swiften/Parser/SConscript
index 0a6972e..4d6db11 100644
--- a/Swiften/Parser/SConscript
+++ b/Swiften/Parser/SConscript
@@ -74,6 +74,7 @@ sources = [
 		"PayloadParsers/DeliveryReceiptParser.cpp",
 		"PayloadParsers/DeliveryReceiptRequestParser.cpp",
 		"PayloadParsers/UserLocationParser.cpp",
+		"PayloadParsers/UserTuneParser.cpp",
 		"PayloadParsers/WhiteboardParser.cpp",
 		"PayloadParsers/PubSubErrorParserFactory.cpp",
 		"PlatformXMLParserFactory.cpp",