From 1a7f17632e2305d2e64125e7e6f3d9b3e1152745 Mon Sep 17 00:00:00 2001
From: emeric <emeric@nas>
Date: Fri, 10 Oct 2014 20:50:34 +0200
Subject: [PATCH] [Remote] Removed Revision payload

---
 Makefile.am                                        |  5 +++++
 src/remote/proto/collection.proto                  |  6 ------
 .../server/AudioCollectionRequestHandler.cpp       | 14 +++++---------
 .../server/AudioCollectionRequestHandler.hpp       |  2 +-
 test/RemoteClientServer.cpp                        |  3 +--
 5 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 Makefile.am

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 00000000..588149ae
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,5 @@
+
+AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
+
+SUBDIRS = test src
+
diff --git a/src/remote/proto/collection.proto b/src/remote/proto/collection.proto
index df39ef1c..4c8737ec 100644
--- a/src/remote/proto/collection.proto
+++ b/src/remote/proto/collection.proto
@@ -11,11 +11,6 @@ message AudioCollectionRequest
 		required uint32	size			= 2;	// Number of elements requested. Server may not honor this size if too big
 	}
 
-	message GetRevision
-	{
-
-	}
-
 	message GetGenreList
 	{
 		required BatchParameter batch_parameter = 1;
@@ -73,7 +68,6 @@ message AudioCollectionRequest
 
 	required Type	type			= 1;
 
-	optional GetRevision	get_revision	= 2;
 	optional GetGenreList	get_genres	= 3;
 	optional GetArtistList	get_artists	= 4;
 	optional GetReleaseList	get_releases	= 5;
diff --git a/src/remote/server/AudioCollectionRequestHandler.cpp b/src/remote/server/AudioCollectionRequestHandler.cpp
index 10c89609..e882d78e 100644
--- a/src/remote/server/AudioCollectionRequestHandler.cpp
+++ b/src/remote/server/AudioCollectionRequestHandler.cpp
@@ -48,14 +48,10 @@ AudioCollectionRequestHandler::process(const AudioCollectionRequest& request, Au
 	switch (request.type())
 	{
 		case AudioCollectionRequest::TypeGetRevision:
-			if (request.has_get_revision())
-			{
-				res = processGetRevision(request.get_revision(), *response.mutable_revision());
-				if (res)
-					response.set_type(AudioCollectionResponse::TypeRevision);
-			}
-			else
-				LMS_LOG(MOD_REMOTE, SEV_ERROR) << "Bad AudioCollectionRequest::TypeGetRevision";
+			// No payload
+			res = processGetRevision(*response.mutable_revision());
+			if (res)
+				response.set_type(AudioCollectionResponse::TypeRevision);
 			break;
 
 		case AudioCollectionRequest::TypeGetGenreList:
@@ -365,7 +361,7 @@ AudioCollectionRequestHandler::processGetCoverArt(const AudioCollectionRequest::
 }
 
 bool
-AudioCollectionRequestHandler::processGetRevision(const AudioCollectionRequest::GetRevision& request, AudioCollectionResponse::Revision& response)
+AudioCollectionRequestHandler::processGetRevision(AudioCollectionResponse::Revision& response)
 {
 
 	bool res = false;
diff --git a/src/remote/server/AudioCollectionRequestHandler.hpp b/src/remote/server/AudioCollectionRequestHandler.hpp
index 5bb6759f..66c38a1e 100644
--- a/src/remote/server/AudioCollectionRequestHandler.hpp
+++ b/src/remote/server/AudioCollectionRequestHandler.hpp
@@ -36,7 +36,7 @@ class AudioCollectionRequestHandler
 
 	private:
 
-		bool processGetRevision(const AudioCollectionRequest::GetRevision& request, AudioCollectionResponse::Revision& response);
+		bool processGetRevision(AudioCollectionResponse::Revision& response);
 		bool processGetArtists(const AudioCollectionRequest::GetArtistList& request, AudioCollectionResponse::ArtistList& response);
 		bool processGetGenres(const AudioCollectionRequest::GetGenreList& request, AudioCollectionResponse::GenreList& response);
 		bool processGetReleases(const AudioCollectionRequest::GetReleaseList& request, AudioCollectionResponse::ReleaseList& response);
diff --git a/test/RemoteClientServer.cpp b/test/RemoteClientServer.cpp
index 7af7f973..afd4628f 100644
--- a/test/RemoteClientServer.cpp
+++ b/test/RemoteClientServer.cpp
@@ -24,9 +24,9 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/asio.hpp>
+#include <boost/asio/ssl.hpp>
 #include <boost/foreach.hpp>
 
-#include "remote/server/Server.hpp"
 #include "remote/messages/Header.hpp"
 #include "messages.pb.h"
 
@@ -441,7 +441,6 @@ class TestClient
 			request.set_type( Remote::ClientMessage::AudioCollectionRequest );
 
 			request.mutable_audio_collection_request()->set_type( Remote::AudioCollectionRequest::TypeGetRevision);
-			request.mutable_audio_collection_request()->mutable_get_revision();
 
 			sendMsg(request);