Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 15:20:29 +01:00
Code Issues Projects Releases Wiki Activity

2018-11-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'SERVICES.MUS_WIN_PATH', 'SERVICES.MUS_WIN_PREIMPORT_CMD'
	'SERVICES.TFC_WIN_PATH', and 'SERVICES.TFC_WIN_PREIMPORT_CMD' fields
	from the database.
	* Incremented the database version to 300.
	* Removed the 'RDSvc::ImportOs' enumeration.
	* Removed the 'Windows Import Path' and 'Windows Preimport Command'
	fields from the 'Edit Service' dialog in rdadmin(1).
This commit is contained in:
Fred Gleason
2018-11-21 09:56:54 -05:00
parent ce560d1c25
commit 10b08d65a8
18 changed files with 171 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/dbversion.h
View File

@@ -24,7 +24,7 @@
/*
* Current Database Version
*/
#define RD_VERSION_DATABASE 299
#define RD_VERSION_DATABASE 300
#endif // DBVERSION_H

33
lib/rdsvc.cpp
View File

@@ -264,34 +264,33 @@ void RDSvc::setTrackCart(ImportSource src,const QString &str)
}
QString RDSvc::importPath(ImportSource src,ImportOs os) const
QString RDSvc::importPath(ImportSource src) const
{
QString fieldname=SourceString(src)+OsString(os)+"PATH";
QString fieldname=SourceString(src)+"PATH";
return RDGetSqlValue("SERVICES","NAME",svc_name,fieldname).
toString();
}
void RDSvc::setImportPath(ImportSource src,ImportOs os,const QString &path)
void RDSvc::setImportPath(ImportSource src,const QString &path)
const
{
QString fieldname=SourceString(src)+OsString(os)+"PATH";
QString fieldname=SourceString(src)+"PATH";
SetRow(fieldname,path);
}
QString RDSvc::preimportCommand(ImportSource src,ImportOs os) const
QString RDSvc::preimportCommand(ImportSource src) const
{
QString fieldname=SourceString(src)+OsString(os)+"PREIMPORT_CMD";
QString fieldname=SourceString(src)+"PREIMPORT_CMD";
return RDGetSqlValue("SERVICES","NAME",svc_name,fieldname).
toString();
}
void RDSvc::setPreimportCommand(ImportSource src,ImportOs os,
const QString &path) const
void RDSvc::setPreimportCommand(ImportSource src,const QString &path) const
{
QString fieldname=SourceString(src)+OsString(os)+"PREIMPORT_CMD";
QString fieldname=SourceString(src)+"PREIMPORT_CMD";
SetRow(fieldname,path);
}
@@ -1453,22 +1452,6 @@ QString RDSvc::SourceString(ImportSource src) const
}
QString RDSvc::OsString(ImportOs os) const
{
QString fieldname;
switch(os) {
case RDSvc::Linux:
fieldname="";
break;
case RDSvc::Windows:
fieldname="WIN_";
break;
}
return fieldname;
}
QString RDSvc::FieldString(ImportField field) const
{
QString fieldname;

11
lib/rdsvc.h
View File

@@ -35,7 +35,6 @@ class RDSvc : public QObject
{
Q_OBJECT
public:
enum ImportOs {Linux=0,Windows=1};
enum ImportSource {Traffic=0,Music=1};
enum ImportField {CartNumber=0,ExtData=3,ExtEventId=4,ExtAnncType=5,
Title=6,StartHours=7,StartMinutes=8,StartSeconds=9,
@@ -76,11 +75,10 @@ class RDSvc : public QObject
void setLabelCart(ImportSource src,const QString &str);
QString trackCart(ImportSource src) const;
void setTrackCart(ImportSource src,const QString &str);
QString importPath(ImportSource src,ImportOs os) const;
void setImportPath(ImportSource src,ImportOs os,const QString &path) const;
QString preimportCommand(ImportSource src,ImportOs os) const;
void setPreimportCommand(ImportSource src,ImportOs os,
const QString &path) const;
QString importPath(ImportSource src) const;
void setImportPath(ImportSource src,const QString &path) const;
QString preimportCommand(ImportSource src) const;
void setPreimportCommand(ImportSource src,const QString &path) const;
int importOffset(ImportSource src,ImportField field) const;
void setImportOffset(ImportSource src,ImportField field,int offset) const;
int importLength(ImportSource src,ImportField field) const;
@@ -111,7 +109,6 @@ class RDSvc : public QObject
private:
bool TryLock(RDLogLock *lock,QString *err_msg);
QString SourceString(ImportSource src) const;
QString OsString(ImportOs os) const;
QString FieldString(ImportField field) const;
void SetRow(const QString &param,QString value) const;
void SetRow(const QString &param,int value) const;