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

2021-04-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Renamed the 'RadioTraffic.com Traffic Reconciliation' to
	'Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)'
	in rdadmin(1).
	* Added a new 'RadioTraffic.com Traffic Reconciliation' report.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-06 13:44:43 -04:00
parent 26e323f672
commit 8933a074b9
10 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -20731,3 +20731,8 @@
* Fixed a bug in rdimport(1) where the title of an existing cart
would be overwritten with a default title even when no title
was found in the file metadata.
2021-04-06 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'RadioTraffic.com Traffic Reconciliation' to
'Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)'
in rdadmin(1).
* Added a new 'RadioTraffic.com Traffic Reconciliation' report.

4
lib/librd_cs.ts
View File

@ -877,6 +877,10 @@
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_de.ts
View File

@ -873,6 +873,10 @@
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_es.ts
View File

@ -873,6 +873,10 @@
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_fr.ts
View File

@ -843,6 +843,10 @@
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_nb.ts
View File

@ -873,6 +873,10 @@
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_nn.ts
View File

@ -873,6 +873,10 @@
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

4
lib/librd_pt_BR.ts
View File

@ -873,6 +873,10 @@
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

9
lib/rdreport.cpp
View File

@ -613,6 +613,10 @@ bool RDReport::generateReport(const QDate &startdate,const QDate &enddate,
ret=ExportRadioTraffic(filename,startdate,enddate,mixname,0);
break;
case RDReport::RadioTraffic2:
ret=ExportRadioTraffic(filename,startdate,enddate,mixname,1);
break;
case RDReport::VisualTraffic:
ret=ExportDeltaflex(filename,startdate,enddate,mixname);
break;
@ -697,6 +701,9 @@ QString RDReport::filterText(RDReport::ExportFilter filter)
return QObject::tr("NPR/DS SoundExchange Report");
case RDReport::RadioTraffic:
return QObject::tr("Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)");
case RDReport::RadioTraffic2:
return QObject::tr("RadioTraffic.com Traffic Reconciliation");
case RDReport::VisualTraffic:
@ -771,6 +778,7 @@ bool RDReport::multipleDaysAllowed(RDReport::ExportFilter filter)
case RDReport::CbsiDeltaFlex:
case RDReport::TextLog:
case RDReport::RadioTraffic:
case RDReport::RadioTraffic2:
case RDReport::VisualTraffic:
case RDReport::CounterPoint:
case RDReport::CounterPoint2:
@ -804,6 +812,7 @@ bool RDReport::multipleMonthsAllowed(RDReport::ExportFilter filter)
case RDReport::TextLog:
case RDReport::BmiEmr:
case RDReport::RadioTraffic:
case RDReport::RadioTraffic2:
case RDReport::VisualTraffic:
case RDReport::CounterPoint:
case RDReport::CounterPoint2:

5
lib/rdreport.h
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Report Descriptor
//
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 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 as
@ -37,7 +37,8 @@ class RDReport
CounterPoint=7,Music1=8,MusicSummary=9,WideOrbit=10,
NprSoundExchange=11,MusicPlayout=12,NaturalLog=13,
MusicClassical=14,MrMaster=15,SpinCount=16,CutLog=17,
CounterPoint2=18,ResultsReport=19,LastFilter=20};
CounterPoint2=18,ResultsReport=19,RadioTraffic2=20,
LastFilter=21};
enum ExportOs {Linux=0,Windows=1};
enum ExportType {Generic=0,Traffic=1,Music=2};
enum StationType {TypeOther=0,TypeAm=1,TypeFm=2,TypeLast=3};