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

2021-08-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 'SERVICES.INCLUDE_MUS_IMPORT_MARKERS' field to the database.
	* Added a 'SERVICES.INCLUDE_TFC_IMPORT_MARKERS' field to the database.
	* Added a 'LOGS.INCLUDE_MUS_IMPORT_MARKERS' field to the database.
	* Added a 'LOGS.INCLUDE_TFC_IMPORT_MARKERS' field to the database.
	* Incremented the database version to 354.
	* Replaced the 'Include Import Marker in Finished Logs' checkbox
	with 'Include Music Import Markers in Finished Logs' and
	'Include Traffic Import Markers in Finished Logs' checkboxes in
	the 'Edit Service' dialog in rdadmin(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-08-31 13:24:57 -04:00
parent fc61172a55
commit e30fe2b0b7
21 changed files with 304 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rdlogmanager/generate_log.cpp
View File

@@ -365,7 +365,7 @@ void GenerateLog::musicData()
RDLog *log=new RDLog(logname);
if(((log->linkState(RDLog::SourceMusic)==RDLog::LinkDone)||
(log->linkState(RDLog::SourceTraffic)==RDLog::LinkDone))) {
if(log->includeImportMarkers()) {
if(log->includeImportMarkers(RDLog::SourceMusic)) {
if(QMessageBox::question(this,"RDLogManager - "+tr("Music Exists"),
tr("The log for")+" "+
rda->shortDateString(gen_date_edit->date())+" "+
@@ -446,7 +446,7 @@ void GenerateLog::trafficData()
rda->station(),rda->config(),svc->name());
RDLog *log=new RDLog(logname);
if((log->linkState(RDLog::SourceTraffic)==RDLog::LinkDone)) {
if(log->includeImportMarkers()) {
if(log->includeImportMarkers(RDLog::SourceTraffic)) {
if(QMessageBox::question(this,"RDLogManager - "+tr("Traffic Exists"),
tr("The log for")+" "+
rda->shortDateString(gen_date_edit->date())+" "+
@@ -508,9 +508,9 @@ void GenerateLog::fileScanData()
if(gen_music_enabled) {
if(QFile::exists(svc->
importFilename(RDSvc::Music,gen_date_edit->date()))) {
gen_music_button->setEnabled(log->includeImportMarkers()||
(log->linkState(RDLog::SourceMusic)==
RDLog::LinkMissing));
gen_music_button->
setEnabled(log->includeImportMarkers(RDLog::SourceMusic)||
(log->linkState(RDLog::SourceMusic)==RDLog::LinkMissing));
gen_mus_avail_label->
setPixmap(rda->iconEngine()->listIcon(RDIconEngine::GreenBall));
}
@@ -530,7 +530,7 @@ void GenerateLog::fileScanData()
gen_traffic_button->
setEnabled(((!gen_music_enabled)||
(log->linkState(RDLog::SourceMusic)==RDLog::LinkDone))&&
(log->includeImportMarkers()||
(log->includeImportMarkers(RDLog::SourceTraffic)||
(log->linkState(RDLog::SourceTraffic)==
RDLog::LinkMissing)));
gen_tfc_avail_label->

4
rdlogmanager/logobject.cpp
View File

@@ -132,7 +132,7 @@ void LogObject::userData()
log->name().toUtf8().constData());
exit(RDApplication::ExitLogLinkFailed);
}
if((!log->includeImportMarkers())&&
if((!log->includeImportMarkers(RDLog::SourceMusic))&&
(log->linkState(RDLog::SourceMusic)!=RDLog::LinkMissing)) {
fprintf(stderr,
"rdlogmanager: music for log \"%s\" cannot be reimported\n",
@@ -178,7 +178,7 @@ void LogObject::userData()
(const char *)log->name().toUtf8());
exit(RDApplication::ExitLogLinkFailed);
}
if((!log->includeImportMarkers())&&
if((!log->includeImportMarkers(RDLog::SourceTraffic))&&
(log->linkState(RDLog::SourceTraffic)!=RDLog::LinkMissing)) {
fprintf(stderr,
"rdlogmanager: traffic for log \"%s\" cannot be reimported\n",