Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-07 15:42:34 +02:00
Code Issues Projects Releases Wiki Activity

2018-05-30 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Implemented '%v/%V' metadata wildcards for event length (seconds).
This commit is contained in:
Fred Gleason 2018-05-30 18:37:24 +00:00
parent fb48347eba
commit adc747d35e
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16963,3 +16963,5 @@
2018-05-30 Fred Gleason <fredg@paravelsystems.com> 2018-05-30 Fred Gleason <fredg@paravelsystems.com>
* Merged pull request #000200, "Set SCHEDULED_AT when adding to * Merged pull request #000200, "Set SCHEDULED_AT when adding to
the STACK". the STACK".
2018-05-30 Fred Gleason <fredg@paravelsystems.com>
* Implemented '%v/%V' metadata wildcards for event length (seconds).

2
docs/opsguide/metadata_wildcards.xml
View File

@ -36,7 +36,7 @@
<row><entry><userinput>%s</userinput></entry><entry><userinput>%S</userinput></entry><entry>Song ID</entry></row> <row><entry><userinput>%s</userinput></entry><entry><userinput>%S</userinput></entry><entry>Song ID</entry></row>
<row><entry><userinput>%t</userinput></entry><entry><userinput>%T</userinput></entry><entry>Title</entry></row> <row><entry><userinput>%t</userinput></entry><entry><userinput>%T</userinput></entry><entry>Title</entry></row>
<row><entry><userinput>%u</userinput></entry><entry><userinput>%U</userinput></entry><entry>User Definied</entry></row> <row><entry><userinput>%u</userinput></entry><entry><userinput>%U</userinput></entry><entry>User Definied</entry></row>
<row><entry><userinput>%v</userinput></entry><entry><userinput>%V</userinput></entry><entry>[Unassigned]</entry></row> <row><entry><userinput>%v</userinput></entry><entry><userinput>%V</userinput></entry><entry>Event length (seconds, rounded down)</entry></row>
<row><entry><userinput>%w</userinput></entry><entry><userinput>%W</userinput></entry><entry>[Unassigned]</entry></row> <row><entry><userinput>%w</userinput></entry><entry><userinput>%W</userinput></entry><entry>[Unassigned]</entry></row>
<row><entry><userinput>%x</userinput></entry><entry><userinput>%X</userinput></entry><entry>[Unassigned]</entry></row> <row><entry><userinput>%x</userinput></entry><entry><userinput>%X</userinput></entry><entry>[Unassigned]</entry></row>
<row><entry><userinput>%y</userinput></entry><entry><userinput>%Y</userinput></entry><entry>Release Year</entry></row> <row><entry><userinput>%y</userinput></entry><entry><userinput>%Y</userinput></entry><entry>Release Year</entry></row>

6
lib/rdnownext.cpp
View File

@ -81,6 +81,8 @@ void RDResolveNowNext(QString *str,RDLogLine **loglines,int encoding)
if(loglines[0]!=NULL) { if(loglines[0]!=NULL) {
str->replace("%n",QString().sprintf("%06u",loglines[0]->cartNumber())); str->replace("%n",QString().sprintf("%06u",loglines[0]->cartNumber()));
str->replace("%h",QString().sprintf("%d",loglines[0]->effectiveLength())); str->replace("%h",QString().sprintf("%d",loglines[0]->effectiveLength()));
str->replace("%v",
QString().sprintf("%d",loglines[0]->effectiveLength()/1000));
str->replace("%g",RDResolveNowNextEncode(loglines[0]->groupName(), str->replace("%g",RDResolveNowNextEncode(loglines[0]->groupName(),
encoding)); encoding));
str->replace("%t", str->replace("%t",
@ -107,6 +109,7 @@ void RDResolveNowNext(QString *str,RDLogLine **loglines,int encoding)
else { // No NOW PLAYING Event else { // No NOW PLAYING Event
str->replace("%n",""); str->replace("%n","");
str->replace("%h",""); str->replace("%h","");
str->replace("%v","");
str->replace("%g",""); str->replace("%g","");
str->replace("%t",""); str->replace("%t","");
str->replace("%a",""); str->replace("%a","");
@ -131,6 +134,8 @@ void RDResolveNowNext(QString *str,RDLogLine **loglines,int encoding)
if(loglines[1]!=NULL) { if(loglines[1]!=NULL) {
str->replace("%N",QString().sprintf("%06u",loglines[1]->cartNumber())); str->replace("%N",QString().sprintf("%06u",loglines[1]->cartNumber()));
str->replace("%H",QString().sprintf("%d",loglines[1]->effectiveLength())); str->replace("%H",QString().sprintf("%d",loglines[1]->effectiveLength()));
str->replace("%V",
QString().sprintf("%d",loglines[1]->effectiveLength()/1000));
str->replace("%G",RDResolveNowNextEncode(loglines[1]->groupName(), str->replace("%G",RDResolveNowNextEncode(loglines[1]->groupName(),
encoding)); encoding));
str->replace("%T",RDResolveNowNextEncode(loglines[1]->title(),encoding)); str->replace("%T",RDResolveNowNextEncode(loglines[1]->title(),encoding));
@ -156,6 +161,7 @@ void RDResolveNowNext(QString *str,RDLogLine **loglines,int encoding)
else { // No NEXT Event else { // No NEXT Event
str->replace("%N",""); str->replace("%N","");
str->replace("%H",""); str->replace("%H","");
str->replace("%V","");
str->replace("%G",""); str->replace("%G","");
str->replace("%T",""); str->replace("%T","");
str->replace("%A",""); str->replace("%A","");