Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-09-08 08:29:57 +02:00
Code Issues Projects Releases Wiki Activity

2015-02-11 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* 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'.
This commit is contained in:
Fred Gleason 2015-02-11 16:44:16 -05:00
parent b09942e494
commit f4ae671a1f
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -14752,3 +14752,8 @@
'lib/rdreport.cpp' and 'lib/rdreport.h'.
2015-02-06 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up Qt object calls in 'rdlogmanager/'.
2015-02-11 Fred Gleason <fredg@paravelsystems.com>
* 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'.

2
rdairplay/rlmhost.cpp
View File

@ -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",

12
rlm/rlm_padpoint.c
View File

@ -1,6 +1,6 @@
/* rlm_padpoint.c
*
* (C) Copyright 2012 Fred Gleason <fredg@paravelsystems.com>
* (C) Copyright 2012-2015 Fred Gleason <fredg@paravelsystems.com>
*
* 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);