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

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

Browse Source 
* Dropped the 'CART.ISRC' field from the database.
	* Dropped the 'DECKS.DEFAULT_SAMPRATE' field from the database.
	* Dropped the 'RDLIBRARY.INPUT_STREAM' field from the database.
	* Dropped the 'RDLIBRARY.OUTPUT_STREAM' field from the database.
	* Dropped the 'RDLIBRARY.RECORD_GPI' field from the database.
	* Dropped the 'RDLIBRARY.PLAY_GPI' field from the database.
	* Dropped the 'RDLIBRARY.STOP_GPI' field from the database.
	* Dropped the 'RDLIBRARY.DEFAULT_SAMPRATE' field from the database.
	* Dropped the 'RECORDINGS.DEFAULT_SAMPRATE' field from the database.
	* Dropped the 'RDLOGEDIT.SAMPRATE' field from the database.
	* Dropped the 'SERVICES.TFC_START_OFFSET' field from the database.
	* Dropped the 'SERVICES.TFC_START_LENGTH' field from the database.
	* Dropped the 'SERVICES.MUS_START_OFFSET' field from the database.
	* Dropped the 'SERVICES.MUS_START_LENGTH' field from the database.
	* Incremented the database version to 285.
This commit is contained in:
Fred Gleason 2018-05-29 23:16:35 +00:00
parent f831241638
commit 2cbc9e6e3c
11 changed files with 157 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -16944,3 +16944,19 @@
names in SQL calls.
* Fixed a bug in 'RDLog::create()' that failed to initialize
the modified datetime correctly.
2018-05-29 Fred Gleason <fredg@paravelsystems.com>
* Dropped the 'CART.ISRC' field from the database.
* Dropped the 'DECKS.DEFAULT_SAMPRATE' field from the database.
* Dropped the 'RDLIBRARY.INPUT_STREAM' field from the database.
* Dropped the 'RDLIBRARY.OUTPUT_STREAM' field from the database.
* Dropped the 'RDLIBRARY.RECORD_GPI' field from the database.
* Dropped the 'RDLIBRARY.PLAY_GPI' field from the database.
* Dropped the 'RDLIBRARY.STOP_GPI' field from the database.
* Dropped the 'RDLIBRARY.DEFAULT_SAMPRATE' field from the database.
* Dropped the 'RECORDINGS.DEFAULT_SAMPRATE' field from the database.
* Dropped the 'RDLOGEDIT.SAMPRATE' field from the database.
* Dropped the 'SERVICES.TFC_START_OFFSET' field from the database.
* Dropped the 'SERVICES.TFC_START_LENGTH' field from the database.
* Dropped the 'SERVICES.MUS_START_OFFSET' field from the database.
* Dropped the 'SERVICES.MUS_START_LENGTH' field from the database.
* Incremented the database version to 285.

1
docs/tables/cart.txt
View File

@ -13,7 +13,6 @@ TITLE char(255) Index
ARTIST char(255) Index
ALBUM char(255) Name of release album
YEAR date Year of release
ISRC char(12) RETIRED as of DB v100
CONDUCTOR char(64)
LABEL char(64) Release Record Label
CLIENT char(64) Index

4
docs/tables/decks.txt
View File

@ -1,8 +1,7 @@
DECKS Table Layout for Rivendell
The DECKS table holds data concerning each configured netcatcher
recording interface on the system. Following is the layout of a
record in the DECKS table:
recording interface on the system.
FIELD NAME TYPE REMARKS
------------------------------------------------------------------
@ -17,7 +16,6 @@ MON_PORT_NUMBER int(11) signed
DEFAULT_MONITOR_ON enum('N','Y')
DEFAULT_FORMAT int(10) signed
DEFAULT_CHANNELS int(10) signed
DEFAULT_SAMPRATE int(10) signed RETIRED
DEFAULT_BITRATE int(10) signed
DEFAULT_THRESHOLD int(10) signed
SWITCH_STATION char(64) From OUTPUTS.STATION_NAME

6
docs/tables/rd_library.txt
View File

@ -8,19 +8,13 @@ ID int(10) unsigned * Primary key, Auto Increment
STATION char(40) Workstation, Indexed
INSTANCE int(10) unsigned
INPUT_CARD int(11) None=-1
INPUT_STREAM int(11) RETIRED
INPUT_TYPE enum('A','D')
OUTPUT_CARD int(11) None=-1
OUTPUT_STREAM int(11) RETIRED
OUTPUT_PORT int(11) None=-1
VOX_THRESHOLD int(11) dBFS * 100
TRIM_THRESHOLD int(11) dBFS * 100
RECORD_GPI int(11) RETIRED
PLAY_GPI int(11) RETIRED
STOP_GPI int(11) RETIRED
DEFAULT_FORMAT int(10) unsigned 0 = PCM16, 1 = Layer-2, 2 = Layer-3
DEFAULT_CHANNELS int(10) unsigned
DEFAULT_SAMPRATE int(10) unsigned RETIRED
DEFAULT_LAYER int(10) unsigned
DEFAULT_BITRATE int(10) unsigned
DEFAULT_RECORD_MODE int(10) unsigned 0 = Manual, 1 = VOX

1
docs/tables/rd_logedit.txt
View File

@ -11,7 +11,6 @@ INPUT_CARD int(11) None=-1
OUTPUT_CARD int(11) None=-1
OUTPUT_PORT int(11)
FORMAT int(10) unsigned 0 = PCM16, 1 = Layer-2, 2 = Layer-3
SAMPRATE int(10) unsigned RETIRED
LAYER int(10) unsigned
BITRATE int(10) unsigned
ENABLE_SECOND_START enum('N','Y')

1
docs/tables/recordings.txt
View File

@ -47,7 +47,6 @@ ENDDATE_OFFSET int(10) unsigned
EVENTDATE_OFFSET int(11)
FORMAT int(11) signed 0 = PCM16, 2 = Layer 2, 3 = Layer 3
CHANNELS int(11) signed
SAMPRATE int(11) signed RETIRED
BITRATE int(11) signed
QUALITY int(11) signed
MACRO_CART int(10) unsigned

4
docs/tables/services.txt
View File

@ -29,8 +29,6 @@ TFC_CART_OFFSET int(11)
TFC_CART_LENGTH int(11)
TFC_TITLE_OFFSET int(11)
TFC_TITLE_LENGTH int(11)
TFC_START_OFFSET int(11) RETIRED as of DB v119
TFC_START_LENGTH int(11) RETIRED as of DB v119
TFC_HOURS_OFFSET int(11)
TFC_HOURS_LENGTH int(11)
TFC_MINUTES_OFFSET int(11)
@ -64,8 +62,6 @@ MUS_CART_OFFSET int(11)
MUS_CART_LENGTH int(11)
MUS_TITLE_OFFSET int(11)
MUS_TITLE_LENGTH int(11)
MUS_START_OFFSET int(11) RETIRED as of DB v119
MUS_START_LENGTH int(11) RETIRED as of DB v119
MUS_HOURS_OFFSET int(11)
MUS_HOURS_LENGTH int(11)
MUS_MINUTES_OFFSET int(11)

2
lib/dbversion.h
View File

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

69
rdadmin/createdb.cpp
View File

@ -425,7 +425,6 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"ARTIST char(255),"+
"ALBUM char(255),"+
"YEAR date,"+
"ISRC char(12),"+
"CONDUCTOR char(64),"+
"LABEL char(64),"+
"CLIENT char(64),"+
@ -612,8 +611,6 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"TFC_CART_LENGTH int,"+
"TFC_TITLE_OFFSET int,"+
"TFC_TITLE_LENGTH int,"+
"TFC_START_OFFSET int,"+
"TFC_START_LENGTH int,"+
"TFC_HOURS_OFFSET int,"+
"TFC_HOURS_LENGTH int,"+
"TFC_MINUTES_OFFSET int,"+
@ -647,8 +644,6 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"MUS_CART_LENGTH int,"+
"MUS_TITLE_OFFSET int,"+
"MUS_TITLE_LENGTH int,"+
"MUS_START_OFFSET int,"+
"MUS_START_LENGTH int,"+
"MUS_HOURS_OFFSET int,"+
"MUS_HOURS_LENGTH int,"+
"MUS_MINUTES_OFFSET int,"+
@ -721,20 +716,14 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"STATION char(40) not null,"+
"INSTANCE int unsigned not null,"+
"INPUT_CARD int default 0,"+
"INPUT_STREAM int default 0,"+
"INPUT_PORT int default 0,"+
"INPUT_TYPE enum('A','D') default 'A',"+
"OUTPUT_CARD int default 0,"+
"OUTPUT_STREAM int default 0,"+
"OUTPUT_PORT int default 0,"+
"VOX_THRESHOLD int default -5000,"+
"TRIM_THRESHOLD int default 0,"+
"RECORD_GPI int default -1,"+
"PLAY_GPI int default -1,"+
"STOP_GPI int default -1,"+
"DEFAULT_FORMAT int unsigned default 0,"+
"DEFAULT_CHANNELS int unsigned default 2,"+
"DEFAULT_SAMPRATE int unsigned default 44100,"+
"DEFAULT_LAYER int unsigned default 0,"+
"DEFAULT_BITRATE int unsigned default 0,"+
"DEFAULT_RECORD_MODE int unsigned default 0,"+
@ -807,7 +796,6 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"PORT_TYPE enum('A','D') default 'A',"+
"DEFAULT_FORMAT int default 0,"+
"DEFAULT_CHANNELS int default 2,"+
"DEFAULT_SAMPRATE int default 44100,"+
"DEFAULT_BITRATE int default 0,"+
"DEFAULT_THRESHOLD int default 0,"+
"SWITCH_STATION char(64),"+
@ -862,7 +850,6 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"EVENTDATE_OFFSET int default 0,"+
"FORMAT int default 0,"+
"CHANNELS int default 2,"+
"SAMPRATE int default 44100,"+
"BITRATE int default 0,"+
"QUALITY int default 0,"+
"MACRO_CART int default -1,"+
@ -1383,7 +1370,6 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"OUTPUT_CARD int default -1,"+
"OUTPUT_PORT int default 0,"+
"FORMAT int unsigned default 0,"+
"SAMPRATE int unsigned default 44100,"+
"LAYER int unsigned default 0,"+
"BITRATE int unsigned default 0,"+
"ENABLE_SECOND_START enum('N','Y') default 'Y',"+
@ -8443,8 +8429,63 @@ int UpdateDb(int ver,RDConfig *config)
delete q;
}
if(ver<285) {
sql=QString("alter table CART drop column ISRC");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table DECKS drop column DEFAULT_SAMPRATE");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY drop column INPUT_STREAM");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY drop column OUTPUT_STREAM");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY drop column RECORD_GPI");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY drop column PLAY_GPI");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY drop column STOP_GPI");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY drop column DEFAULT_SAMPRATE");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLOGEDIT drop column SAMPRATE");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RECORDINGS drop column SAMPRATE");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table SERVICES drop column TFC_START_OFFSET");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table SERVICES drop column TFC_START_LENGTH");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table SERVICES drop column MUS_START_OFFSET");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table SERVICES drop column MUS_START_LENGTH");
q=new RDSqlQuery(sql,false);
delete q;
}

86
utils/rdrevert/rdrevert.cpp
View File

@ -295,6 +295,10 @@ void MainObject::Revert(int schema) const
case 284:
Revert284();
break;
case 285:
Revert285();
break;
}
}
@ -1274,8 +1278,6 @@ void MainObject::Revert284() const
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDPANEL add column INSTANCE int unsigned ")+
"not null default 0 after STATION";
q=new RDSqlQuery(sql,false);
@ -1356,6 +1358,84 @@ void MainObject::Revert284() const
}
void MainObject::Revert285() const
{
QString sql;
RDSqlQuery *q;
sql=QString("alter table CART add column ISRC char(12) after YEAR");
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table DECKS add ")+
"column DEFAULT_SAMPRATE int default 44100 after DEFAULT_CHANNELS";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY add ")+
"column INPUT_STREAM int default 0 after INPUT_CARD";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY add ")+
"column OUTPUT_STREAM int default 0 after OUTPUT_CARD";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY add ")+
"column RECORD_GPI int default -1 after TRIM_THRESHOLD";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY add ")+
"column PLAY_GPI int default -1 after RECORD_GPI";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY add ")+
"column STOP_GPI int default -1 after PLAY_GPI";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLIBRARY add ")+
"column DEFAULT_SAMPRATE int default 44100 after DEFAULT_CHANNELS";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RDLOGEDIT add ")+
"column SAMPRATE int unsigned default 44100 after FORMAT";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table RECORDINGS add ")+
"column SAMPRATE int unsigned default 44100 after CHANNELS";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table SERVICES add ")+
"column TFC_START_OFFSET int after TFC_TITLE_LENGTH";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table SERVICES add ")+
"column TFC_START_LENGTH int after TFC_START_OFFSET";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table SERVICES add ")+
"column MUS_START_OFFSET int after MUS_TITLE_LENGTH";
q=new RDSqlQuery(sql,false);
delete q;
sql=QString("alter table SERVICES add ")+
"column MUS_START_LENGTH int after MUS_START_OFFSET";
q=new RDSqlQuery(sql,false);
delete q;
SetVersion(284);
}
int MainObject::GetVersion() const
{
QString sql;
@ -1402,7 +1482,7 @@ int MainObject::MapSchema(const QString &ver)
version_map["2.17"]=268;
version_map["2.18"]=272;
version_map["2.19"]=275;
version_map["2.20"]=284;
version_map["2.20"]=285;
//
// Normalize String

1
utils/rdrevert/rdrevert.h
View File

@ -80,6 +80,7 @@ class MainObject : public QObject
void Revert282() const;
void Revert283() const;
void Revert284() const;
void Revert285() const;
int GetVersion() const;
void SetVersion(int schema) const;
int MapSchema(const QString &ver);