From: Juho Vähä-Herttua <juhovh@iki.fi>
Date: Sun, 13 May 2012 12:05:16 +0000 (+0300)
Subject: Add metadata checking of SET_PARAMETERS to RAOP handler
X-Git-Tag: upstream/0.9.0~4^2~79
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=036dec08fadaec2c059dd795341de4e81a539bca;p=deb_shairplay.git

Add metadata checking of SET_PARAMETERS to RAOP handler
---

diff --git a/src/lib/raop.c b/src/lib/raop.c
index fc57fee..d85756b 100644
--- a/src/lib/raop.c
+++ b/src/lib/raop.c
@@ -280,21 +280,29 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response)
 		http_response_add_header(res, "Transport", buffer);
 		http_response_add_header(res, "Session", "DEADBEEF");
 	} else if (!strcmp(method, "SET_PARAMETER")) {
+		const char *content_type;
 		const char *data;
 		int datalen;
-		char *datastr;
 
+		content_type = http_request_get_header(request, "Content-Type");
 		data = http_request_get_data(request, &datalen);
-		datastr = calloc(1, datalen+1);
-		if (data && datastr && conn->raop_rtp) {
-			memcpy(datastr, data, datalen);
-			if (!strncmp(datastr, "volume: ", 8)) {
-				float vol = 0.0;
-				sscanf(datastr+8, "%f", &vol);
-				raop_rtp_set_volume(conn->raop_rtp, vol);
+		if (!strcmp(content_type, "text/parameters")) {
+			char *datastr;
+			datastr = calloc(1, datalen+1);
+			if (data && datastr && conn->raop_rtp) {
+				memcpy(datastr, data, datalen);
+				if (!strncmp(datastr, "volume: ", 8)) {
+					float vol = 0.0;
+					sscanf(datastr+8, "%f", &vol);
+					raop_rtp_set_volume(conn->raop_rtp, vol);
+				}
 			}
+			free(datastr);
+		} else if (!strcmp(content_type, "image/jpeg")) {
+			logger_log(&conn->raop->logger, LOGGER_INFO, "UNHANDLED: Got image data of %d bytes", datalen);
+		} else if (!strcmp(content_type, "application/x-dmap-tagged")) {
+			logger_log(&conn->raop->logger, LOGGER_INFO, "UNHANDLED: Got metadata of %d bytes", datalen);
 		}
-		free(datastr);
 	} else if (!strcmp(method, "FLUSH")) {
 		const char *rtpinfo;
 		int next_seq = -1;