From f4ae671a1fc8ae7a1951c2c2d93e7fdf2bc01e02 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 11 Feb 2015 16:44:16 -0500 Subject: [PATCH] 2015-02-11 Fred Gleason * Added support for 'Conductor', 'Song-ID', 'Year', 'Outcue' and 'Description' fields in 'rlm/rlm_padpoint.c'. * Fixed a bug when generating the 'Year' field in RLM updates in 'rdairplay/rlmhost.cpp'. --- ChangeLog | 5 +++++ rdairplay/rlmhost.cpp | 2 +- rlm/rlm_padpoint.c | 12 +++++++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ccb41750..1cdb340d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14752,3 +14752,8 @@ 'lib/rdreport.cpp' and 'lib/rdreport.h'. 2015-02-06 Fred Gleason * Cleaned up Qt object calls in 'rdlogmanager/'. +2015-02-11 Fred Gleason + * Added support for 'Conductor', 'Song-ID', 'Year', 'Outcue' and + 'Description' fields in 'rlm/rlm_padpoint.c'. + * Fixed a bug when generating the 'Year' field in RLM updates + in 'rdairplay/rlmhost.cpp'. diff --git a/rdairplay/rlmhost.cpp b/rdairplay/rlmhost.cpp index b289cabe..20f59b95 100644 --- a/rdairplay/rlmhost.cpp +++ b/rdairplay/rlmhost.cpp @@ -188,7 +188,7 @@ void RLMHost::loadMetadata(const RDLogLine *logline,struct rlm_pad *pad, pad->rlm_carttype=logline->cartType(); if(!logline->year().isNull()) { snprintf(pad->rlm_year,5,"%s", - (const char *)logline->year().toString("YYYY")); + (const char *)logline->year().toString("yyyy")); } if(!logline->groupName().isEmpty()) { snprintf(pad->rlm_group,11,"%s", diff --git a/rlm/rlm_padpoint.c b/rlm/rlm_padpoint.c index 9617081e..1330d200 100644 --- a/rlm/rlm_padpoint.c +++ b/rlm/rlm_padpoint.c @@ -1,6 +1,6 @@ /* rlm_padpoint.c * - * (C) Copyright 2012 Fred Gleason + * (C) Copyright 2012-2015 Fred Gleason * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -150,7 +150,8 @@ void rlm_padpoint_RLMPadDataSent(void *ptr,const struct rlm_svc *svc, break; } if((flag==1)||((flag==2)&&(log->log_onair!=0))) { - snprintf(str,1501,"%06u~%u~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s", + snprintf(str,1501, + "%06u~%u~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s~%s", now->rlm_cartnum, now->rlm_len, now->rlm_year, @@ -165,7 +166,12 @@ void rlm_padpoint_RLMPadDataSent(void *ptr,const struct rlm_svc *svc, now->rlm_pub, now->rlm_userdef, now->rlm_isrc, - now->rlm_isci); + now->rlm_isci, + now->rlm_conductor, + now->rlm_song_id, + now->rlm_year, + now->rlm_outcue, + now->rlm_description); RLMSendUdp(ptr,rlm_padpoint_addresses+i*16,rlm_padpoint_ports[i], str,strlen(str)); snprintf(msg,1500,"rlm_padpoint: sending pad update: \"%s\"",str);