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

Merge branch 'master' into RDImport

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Patrick Linstruth
2018-10-17 08:43:20 -07:00
parent 9cf8ad6fd0 2ba30d10c4
commit c265cc6044
162 changed files with 8552 additions and 18831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/rdimport/rdimport.cpp
View File

@@ -70,6 +70,7 @@ MainObject::MainObject(QObject *parent)
import_group=NULL;
import_verbose=false;
import_log_syslog=false;
import_log_file=false;
import_log_directory="";
import_log_filename="";
import_single_cart=false;
@@ -455,6 +456,7 @@ MainObject::MainObject(QObject *parent)
rda->config()->setLogDirectory(import_log_directory);
rda->config()->setLogPattern(import_log_filename);
rda->config()->setLogFacility(RDConfig::LogFile);
import_log_file=true;
}
import_cut_markers=new MarkerSet();
@@ -2025,7 +2027,10 @@ void MainObject::Log(RDConfig::LogPriority prio,const QString &msg) const
{
QString m=msg;
if(!import_drop_box) {
if (import_drop_box||import_log_syslog||import_log_file) {
rda->log(prio,m.replace(QRegExp("^rdimport: "),"").simplified());
}
else {
if(prio==RDConfig::LogErr) {
fprintf(stderr,"%s",(const char *)msg);
fflush(stderr);
@@ -2035,9 +2040,6 @@ void MainObject::Log(RDConfig::LogPriority prio,const QString &msg) const
fflush(stdout);
}
}
if(prio==RDConfig::LogErr||import_verbose) {
rda->log(prio,m.replace(QRegExp("^rdimport: "),"").simplified());
}
}

1
utils/rdimport/rdimport.h
View File

@@ -79,6 +79,7 @@ class MainObject : public QObject
RDGroup *import_group;
bool import_verbose;
bool import_log_syslog;
bool import_log_file;
QString import_log_directory;
QString import_log_filename;
bool import_to_mono;