put timestamp at end of ellipse

components/raop/raop.c

@@ -631,14 +631,14 @@ static bool handle_rtsp(raop_ctx_t *ctx, int sock)
 				LOG_INFO("[%p]: received metadata (ts: %d)\n\tartist: %s\n\talbum:  %s\n\ttitle:  %s",
 						 ctx, timestamp, metadata.artist ? metadata.artist : "", metadata.album ? metadata.album : "", 
                          metadata.title ? metadata.title : "");
-                success = ctx->cmd_cb(RAOP_METADATA, timestamp, metadata.artist, metadata.album, metadata.title);
+                success = ctx->cmd_cb(RAOP_METADATA, metadata.artist, metadata.album, metadata.title, timestamp);
 				free_metadata(&metadata);
 			}
 		} else if (body && ((p = kd_lookup(headers, "Content-Type")) != NULL) && strcasestr(p, "image/jpeg")) {			
             uint32_t timestamp = 0;
             if ((p = kd_lookup(headers, "RTP-Info")) != NULL) sscanf(p, "%*[^=]=%d", &timestamp);
             LOG_INFO("[%p]: received JPEG image of %d bytes (ts:%d)", ctx, len, timestamp);            
-			ctx->cmd_cb(RAOP_ARTWORK, timestamp, body, len);
+			ctx->cmd_cb(RAOP_ARTWORK, body, len, timestamp);
 		} else {
 			char *dump = kd_dump(headers);
 			LOG_INFO("Unhandled SET PARAMETER\n%s", dump);

components/raop/raop_sink.c

@@ -131,13 +131,11 @@ static bool cmd_handler(raop_event_t event, ...) {
 		displayer_control(DISPLAYER_SUSPEND);
 		break;
 	case RAOP_METADATA: {
-        uint32_t timestamp = va_arg(args, uint32_t);
 		char *artist = va_arg(args, char*), *album = va_arg(args, char*), *title = va_arg(args, char*);
 		displayer_metadata(artist, album, title);
 		break;
 	}	
 	case RAOP_ARTWORK: {
-        uint32_t timestamp = va_arg(args, uint32_t);
 		uint8_t *data = va_arg(args, uint8_t*);
 		displayer_artwork(data);
 		break;