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

2020-04-16 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'EVENTS.POST_POINT' field from the database.
	* Removed the 'LOG_LINES.POST_POINT' field from the database.
	* Incremented the database version tp 315.
	* Removed 'RDEventLine::postPoint()' and
	'RDEventLine::setPostPoint()' methods.
	* Removed the 'Post Point' checkbox from the 'Editing Event' dialog
	in rdlogmanager(1).
This commit is contained in:
Fred Gleason 2020-04-16 17:26:18 -04:00
parent 5126a59e05
commit 2e6a13eba1
22 changed files with 187 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -19798,3 +19798,11 @@
'RDFontEngine'.
* Refactored the control layout in the 'Editing Event' dialog
in rdlogmanager.
2020-04-16 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'EVENTS.POST_POINT' field from the database.
* Removed the 'LOG_LINES.POST_POINT' field from the database.
* Incremented the database version tp 315.
* Removed 'RDEventLine::postPoint()' and
'RDEventLine::setPostPoint()' methods.
* Removed the 'Post Point' checkbox from the 'Editing Event' dialog
in rdlogmanager(1).

1
docs/tables/events.txt
View File

@ -11,7 +11,6 @@ NOTE_TEXT varchar(191)
PREPOSITION int(11)
TIME_TYPE int(11)
GRACE_TIME int(11)
POST_POINT enum('N','Y')
USE_AUTOFILL enum('N','Y')
AUTOFILL_SLOP int(11)
USE_TIMESCALE enum('N','Y')

1
docs/tables/log_lines.txt
View File

@ -15,7 +15,6 @@ START_TIME int(11) Milliseconds after 00:00:00
GRACE_TIME int(11) signed
CART_NUMBER int(10) unsigned From CART.NUMBER
TIME_TYPE int(11) signed
POST_POINT enum('N','Y')
TRANS_TYPE int(11) signed 0 = Play, 1 = Stop, 2 = Segue
START_POINT int(11) signed Overloads CUTS.START_POINT
END_POINT int(11) signed Overloads CUTS.END_POINT

2
lib/dbversion.h
View File

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

15
lib/rdevent.cpp
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Log Manager Event.
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 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
@ -131,19 +131,6 @@ void RDEvent::setGraceTime(int offset) const
}
bool RDEvent::postPoint() const
{
bool ok;
return RDBool(GetStringValue("POST_POINT",&ok));
}
void RDEvent::setPostPoint(bool state) const
{
SetRow("POST_POINT",RDYesNo(state),true);
}
bool RDEvent::useAutofill() const
{
bool ok;

4
lib/rdevent.h
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Log Manager Event
//
// (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 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
@ -43,8 +43,6 @@ class RDEvent
void setTimeType(RDLogLine::TimeType type) const;
int graceTime() const;
void setGraceTime(int offset) const;
bool postPoint() const;
void setPostPoint(bool state) const;
bool useAutofill() const;
void setUseAutofill(bool state) const;
int autofillSlop() const;

87
lib/rdevent_line.cpp
View File

@ -102,18 +102,6 @@ void RDEventLine::setGraceTime(int offset)
}
bool RDEventLine::postPoint() const
{
return event_post_point;
}
void RDEventLine::setPostPoint(bool state)
{
event_post_point=state;
}
bool RDEventLine::useAutofill() const
{
return event_use_autofill;
@ -299,7 +287,6 @@ void RDEventLine::clear()
event_preposition=0;
event_time_type=RDLogLine::Relative;
event_grace_time=0;
event_post_point=false;
event_use_autofill=false;
event_use_timescale=false;
event_import_source=RDEventLine::None;
@ -329,22 +316,21 @@ bool RDEventLine::load()
"PREPOSITION,"+ // 01
"TIME_TYPE,"+ // 02
"GRACE_TIME,"+ // 03
"POST_POINT,"+ // 04
"USE_AUTOFILL,"+ // 05
"USE_TIMESCALE,"+ // 06
"IMPORT_SOURCE,"+ // 07
"START_SLOP,"+ // 08
"END_SLOP,"+ // 09
"FIRST_TRANS_TYPE,"+ // 10
"DEFAULT_TRANS_TYPE,"+ // 11
"COLOR,"+ // 12
"AUTOFILL_SLOP,"+ // 13
"NESTED_EVENT,"+ // 14
"SCHED_GROUP,"+ // 15
"ARTIST_SEP,"+ // 16
"TITLE_SEP,"+ // 17
"HAVE_CODE,"+ // 18
"HAVE_CODE2 "+ // 19
"USE_AUTOFILL,"+ // 04
"USE_TIMESCALE,"+ // 05
"IMPORT_SOURCE,"+ // 06
"START_SLOP,"+ // 07
"END_SLOP,"+ // 08
"FIRST_TRANS_TYPE,"+ // 09
"DEFAULT_TRANS_TYPE,"+ // 10
"COLOR,"+ // 11
"AUTOFILL_SLOP,"+ // 12
"NESTED_EVENT,"+ // 13
"SCHED_GROUP,"+ // 14
"ARTIST_SEP,"+ // 15
"TITLE_SEP,"+ // 16
"HAVE_CODE,"+ // 17
"HAVE_CODE2 "+ // 18
"from EVENTS where "+
"NAME=\""+RDEscapeString(event_name)+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
@ -358,27 +344,26 @@ bool RDEventLine::load()
event_preposition=q->value(1).toInt();
event_time_type=(RDLogLine::TimeType)q->value(2).toInt();
event_grace_time=q->value(3).toInt();
event_post_point=RDBool(q->value(4).toString());
event_use_autofill=RDBool(q->value(5).toString());
event_use_timescale=RDBool(q->value(6).toString());
event_import_source=(RDEventLine::ImportSource)q->value(7).toInt();
event_start_slop=q->value(8).toInt();
event_end_slop=q->value(9).toInt();
event_first_transtype=(RDLogLine::TransType)q->value(10).toInt();
event_default_transtype=(RDLogLine::TransType)q->value(11).toInt();
if(q->value(12).isNull()) {
event_use_autofill=RDBool(q->value(4).toString());
event_use_timescale=RDBool(q->value(5).toString());
event_import_source=(RDEventLine::ImportSource)q->value(6).toInt();
event_start_slop=q->value(7).toInt();
event_end_slop=q->value(8).toInt();
event_first_transtype=(RDLogLine::TransType)q->value(9).toInt();
event_default_transtype=(RDLogLine::TransType)q->value(10).toInt();
if(q->value(11).isNull()) {
event_color=QColor();
}
else {
event_color=QColor(q->value(12).toString());
event_color=QColor(q->value(11).toString());
}
event_autofill_slop=q->value(13).toInt();
event_nested_event=q->value(14).toString();
event_sched_group=q->value(15).toString();
event_artist_sep=q->value(16).toInt();
event_title_sep=q->value(17).toInt();
event_have_code=q->value(18).toString();
event_have_code2=q->value(19).toString();
event_autofill_slop=q->value(12).toInt();
event_nested_event=q->value(13).toString();
event_sched_group=q->value(14).toString();
event_artist_sep=q->value(15).toInt();
event_title_sep=q->value(16).toInt();
event_have_code=q->value(17).toString();
event_have_code2=q->value(18).toString();
delete q;
event_preimport_list->load();
@ -398,7 +383,6 @@ bool RDEventLine::save(RDConfig *config)
QString().sprintf("PREPOSITION=%d,",event_preposition)+
QString().sprintf("TIME_TYPE=%d,",event_time_type)+
QString().sprintf("GRACE_TIME=%d,",event_grace_time)+
"POST_POINT=\""+RDYesNo(event_post_point)+"\","+
"USE_AUTOFILL=\""+RDYesNo(event_use_autofill)+"\","+
"USE_TIMESCALE=\""+RDYesNo(event_use_timescale)+"\","+
QString().sprintf("IMPORT_SOURCE=%d,",event_import_source)+
@ -423,7 +407,6 @@ bool RDEventLine::save(RDConfig *config)
QString().sprintf("PREPOSITION=%d,",event_preposition)+
QString().sprintf("TIME_TYPE=%d,",event_time_type)+
QString().sprintf("GRACE_TIME=%d,",event_grace_time)+
"POST_POINT=\""+RDYesNo(event_post_point)+"\","+
"USE_AUTOFILL=\""+RDYesNo(event_use_autofill)+"\","+
"USE_TIMESCALE=\""+RDYesNo(event_use_timescale)+"\","+
QString().sprintf("IMPORT_SOURCE=%d,",event_import_source)+
@ -463,7 +446,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
RDLogLine::TransType trans_type=event_first_transtype;
RDLogLine::TimeType time_type=event_time_type;
RDLogLine::Type link_type=RDLogLine::MusicLink;
bool post_point=event_post_point;
int grace_time=event_grace_time;
int link_id=0;
@ -519,7 +501,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
QString().sprintf("GRACE_TIME=%d,",grace_time)+
QString().sprintf("CART_NUMBER=%u,",i_item->cartNumber())+
QString().sprintf("TIME_TYPE=%d,",time_type)+
"POST_POINT=\""+RDYesNo(post_point)+"\","+
QString().sprintf("TRANS_TYPE=%d,",i_item->transType())+
"COMMENT=\""+RDEscapeString(i_item->markerComment())+"\","+
QString().sprintf("EVENT_LENGTH=%d",event_length);
@ -527,7 +508,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
count++;
trans_type=event_default_transtype;
time_type=RDLogLine::Relative;
post_point=false;
grace_time=-1;
postimport_length+=GetLength(i_item->cartNumber());
@ -560,7 +540,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
QString().sprintf("START_TIME=%d,",QTime().msecsTo(time))+
QString().sprintf("GRACE_TIME=%d,",grace_time)+
QString().sprintf("TIME_TYPE=%d,",time_type)+
"POST_POINT=\""+RDYesNo(post_point)+"\","+
QString().sprintf("TRANS_TYPE=%d,",trans_type)+
"LINK_EVENT_NAME=\""+RDEscapeString(event_name)+"\","+
QString().sprintf("LINK_START_TIME=%d,",
@ -577,7 +556,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
time=time.addMSecs(event_length);
trans_type=event_default_transtype;
time_type=RDLogLine::Relative;
post_point=false;
grace_time=-1;
}
@ -884,7 +862,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
QString().sprintf("GRACE_TIME=%d,",grace_time)+
QString().sprintf("CART_NUMBER=%u,",schedCL->getItemCartNumber(schedpos))+
QString().sprintf("TIME_TYPE=%d,",time_type)+
"POST_POINT=\""+RDYesNo(post_point)+"\","+
QString().sprintf("TRANS_TYPE=%d,",trans_type)+
"EXT_START_TIME="+RDCheckDateTime(time,"hh:mm:ss")+","+
QString().sprintf("EVENT_LENGTH=%d",event_length);
@ -937,7 +914,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
QString().sprintf("GRACE_TIME=%d,",grace_time)+
QString().sprintf("CART_NUMBER=%u,",i_item->cartNumber())+
QString().sprintf("TIME_TYPE=%d,",time_type)+
"POST_POINT=\""+RDYesNo(post_point)+"\","+
QString().sprintf("TRANS_TYPE=%d,",i_item->transType())+
"COMMENT=\""+RDEscapeString(i_item->markerComment())+"\","+
QString().sprintf("EVENT_LENGTH=%d",event_length);
@ -946,7 +922,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
time=time.addMSecs(GetLength(i_item->cartNumber()));
time_type=RDLogLine::Relative;
trans_type=event_default_transtype;
post_point=false;
grace_time=-1;
}

5
lib/rdevent_line.h
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Log Manager Event
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 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
@ -45,8 +45,6 @@ class RDEventLine
void setTimeType(RDLogLine::TimeType type);
int graceTime() const;
void setGraceTime(int offset);
bool postPoint() const;
void setPostPoint(bool state);
bool useAutofill() const;
void setUseAutofill(bool state);
int autofillSlop() const;
@ -94,7 +92,6 @@ class RDEventLine
int event_preposition;
RDLogLine::TimeType event_time_type;
int event_grace_time;
bool event_post_point;
bool event_use_autofill;
bool event_use_timescale;
RDEventLine::ImportSource event_import_source;

216
lib/rdlog_event.cpp
View File

@ -850,41 +850,40 @@ int RDLogEvent::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
"LOG_LINES.COMMENT,"+ // 28
"LOG_LINES.LABEL,"+ // 29
"LOG_LINES.GRACE_TIME,"+ // 30
"LOG_LINES.POST_POINT,"+ // 31
"LOG_LINES.SOURCE,"+ // 32
"LOG_LINES.EXT_START_TIME,"+ // 33
"LOG_LINES.EXT_LENGTH,"+ // 34
"LOG_LINES.EXT_DATA,"+ // 35
"LOG_LINES.EXT_EVENT_ID,"+ // 36
"LOG_LINES.EXT_ANNC_TYPE,"+ // 37
"LOG_LINES.EXT_CART_NAME,"+ // 38
"CART.ASYNCRONOUS,"+ // 39
"LOG_LINES.FADEUP_POINT,"+ // 40
"LOG_LINES.FADEUP_GAIN,"+ // 41
"LOG_LINES.FADEDOWN_POINT,"+ // 42
"LOG_LINES.FADEDOWN_GAIN,"+ // 43
"LOG_LINES.SEGUE_GAIN,"+ // 44
"CART.PUBLISHER,"+ // 45
"CART.COMPOSER,"+ // 46
"CART.USAGE_CODE,"+ // 47
"CART.AVERAGE_SEGUE_LENGTH,"+ // 48
"LOG_LINES.LINK_EVENT_NAME,"+ // 49
"LOG_LINES.LINK_START_TIME,"+ // 50
"LOG_LINES.LINK_LENGTH,"+ // 51
"LOG_LINES.LINK_ID,"+ // 52
"LOG_LINES.LINK_EMBEDDED,"+ // 53
"LOG_LINES.ORIGIN_USER,"+ // 54
"LOG_LINES.ORIGIN_DATETIME,"+ // 55
"CART.VALIDITY,"+ // 56
"LOG_LINES.LINK_START_SLOP,"+ // 57
"LOG_LINES.LINK_END_SLOP,"+ // 58
"LOG_LINES.DUCK_UP_GAIN,"+ // 59
"LOG_LINES.DUCK_DOWN_GAIN,"+ // 60
"CART.START_DATETIME,"+ // 61
"CART.END_DATETIME,"+ // 62
"LOG_LINES.EVENT_LENGTH,"+ // 63
"CART.USE_EVENT_LENGTH,"+ // 64
"CART.NOTES "+ // 65
"LOG_LINES.SOURCE,"+ // 31
"LOG_LINES.EXT_START_TIME,"+ // 32
"LOG_LINES.EXT_LENGTH,"+ // 33
"LOG_LINES.EXT_DATA,"+ // 34
"LOG_LINES.EXT_EVENT_ID,"+ // 35
"LOG_LINES.EXT_ANNC_TYPE,"+ // 36
"LOG_LINES.EXT_CART_NAME,"+ // 37
"CART.ASYNCRONOUS,"+ // 38
"LOG_LINES.FADEUP_POINT,"+ // 39
"LOG_LINES.FADEUP_GAIN,"+ // 40
"LOG_LINES.FADEDOWN_POINT,"+ // 41
"LOG_LINES.FADEDOWN_GAIN,"+ // 42
"LOG_LINES.SEGUE_GAIN,"+ // 43
"CART.PUBLISHER,"+ // 44
"CART.COMPOSER,"+ // 45
"CART.USAGE_CODE,"+ // 46
"CART.AVERAGE_SEGUE_LENGTH,"+ // 47
"LOG_LINES.LINK_EVENT_NAME,"+ // 48
"LOG_LINES.LINK_START_TIME,"+ // 49
"LOG_LINES.LINK_LENGTH,"+ // 50
"LOG_LINES.LINK_ID,"+ // 51
"LOG_LINES.LINK_EMBEDDED,"+ // 52
"LOG_LINES.ORIGIN_USER,"+ // 53
"LOG_LINES.ORIGIN_DATETIME,"+ // 54
"CART.VALIDITY,"+ // 55
"LOG_LINES.LINK_START_SLOP,"+ // 56
"LOG_LINES.LINK_END_SLOP,"+ // 57
"LOG_LINES.DUCK_UP_GAIN,"+ // 58
"LOG_LINES.DUCK_DOWN_GAIN,"+ // 59
"CART.START_DATETIME,"+ // 60
"CART.END_DATETIME,"+ // 61
"LOG_LINES.EVENT_LENGTH,"+ // 62
"CART.USE_EVENT_LENGTH,"+ // 63
"CART.NOTES "+ // 64
"from LOG_LINES left join CART "+
"on LOG_LINES.CART_NUMBER=CART.NUMBER where "+
"LOG_LINES.LOG_NAME=\""+RDEscapeString(logname)+"\" "+
@ -909,26 +908,23 @@ int RDLogEvent::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
QTime().addMSecs(q->value(2).toInt()));
line.
setTimeType((RDLogLine::TimeType)q->value(3).toInt()); // Time Type
if((line.timeType()==RDLogLine::Hard)&&
(q->value(31).toString()==QString("Y"))) { // Post Point
}
line.
setTransType((RDLogLine::TransType)q->value(4).toInt()); // Trans Type
line.setMarkerComment(q->value(28).toString()); // Comment
line.setMarkerLabel(q->value(29).toString()); // Label
line.setGraceTime(q->value(30).toInt()); // Grace Time
line.setUseEventLength(RDBool(q->value(64).toString())); // Use Event Length
line.setEventLength(q->value(63).toInt()); // Event Length
line.setSource((RDLogLine::Source)q->value(32).toUInt());
line.setLinkEventName(q->value(49).toString()); // Link Event Name
line.setLinkStartTime(QTime().addMSecs(q->value(50).toInt())); // Link Start Time
line.setLinkLength(q->value(51).toInt()); // Link Length
line.setLinkStartSlop(q->value(57).toInt()); // Link Start Slop
line.setLinkEndSlop(q->value(58).toInt()); // Link End Slop
line.setLinkId(q->value(52).toInt()); // Link ID
line.setLinkEmbedded(RDBool(q->value(53).toString())); // Link Embedded
line.setOriginUser(q->value(54).toString()); // Origin User
line.setOriginDateTime(q->value(55).toDateTime()); // Origin DateTime
line.setUseEventLength(RDBool(q->value(63).toString())); // Use Event Length
line.setEventLength(q->value(62).toInt()); // Event Length
line.setSource((RDLogLine::Source)q->value(31).toUInt());
line.setLinkEventName(q->value(48).toString()); // Link Event Name
line.setLinkStartTime(QTime().addMSecs(q->value(49).toInt())); // Link Start Time
line.setLinkLength(q->value(50).toInt()); // Link Length
line.setLinkStartSlop(q->value(56).toInt()); // Link Start Slop
line.setLinkEndSlop(q->value(57).toInt()); // Link End Slop
line.setLinkId(q->value(51).toInt()); // Link ID
line.setLinkEmbedded(RDBool(q->value(52).toString())); // Link Embedded
line.setOriginUser(q->value(53).toString()); // Origin User
line.setOriginDateTime(q->value(54).toDateTime()); // Origin DateTime
switch(line.type()) {
case RDLogLine::Cart:
line.setCartNumber(q->value(1).toUInt()); // Cart Number
@ -941,21 +937,21 @@ int RDLogEvent::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
line.setGroupColor(group_colors[q->value(10).toString()]);
line.setTitle(q->value(11).toString()); // Title
line.setArtist(q->value(12).toString()); // Artist
line.setPublisher(q->value(45).toString()); // Publisher
line.setComposer(q->value(46).toString()); // Composer
line.setPublisher(q->value(44).toString()); // Publisher
line.setComposer(q->value(45).toString()); // Composer
line.setAlbum(q->value(13).toString()); // Album
line.setYear(q->value(14).toDate()); // Year
line.setLabel(q->value(15).toString()); // Label
line.setClient(q->value(16).toString()); // Client
line.setAgency(q->value(17).toString()); // Agency
line.setUserDefined(q->value(18).toString()); // User Defined
line.setCartNotes(q->value(65).toString()); // Cart Notes
line.setCartNotes(q->value(64).toString()); // Cart Notes
line.setConductor(q->value(19).toString()); // Conductor
line.setSongId(q->value(20).toString()); // Song ID
line.setUsageCode((RDCart::UsageCode)q->value(47).toInt());
line.setUsageCode((RDCart::UsageCode)q->value(46).toInt());
line.setForcedLength(q->value(21).toUInt()); // Forced Length
if(q->value(7).toInt()<0) {
line.setAverageSegueLength(q->value(48).toInt());
line.setAverageSegueLength(q->value(47).toInt());
}
else {
line.
@ -969,52 +965,52 @@ int RDLogEvent::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
setEnforceLength(RDBool(q->value(25).toString())); // Enforce Length
line.
setPreservePitch(RDBool(q->value(26).toString())); // Preserve Pitch
if(!q->value(33).isNull()) { // Ext Start Time
line.setExtStartTime(q->value(33).toTime());
if(!q->value(32).isNull()) { // Ext Start Time
line.setExtStartTime(q->value(32).toTime());
}
if(!q->value(34).isNull()) { // Ext Length
line.setExtLength(q->value(34).toInt());
if(!q->value(33).isNull()) { // Ext Length
line.setExtLength(q->value(33).toInt());
}
if(!q->value(35).isNull()) { // Ext Data
line.setExtData(q->value(35).toString());
if(!q->value(34).isNull()) { // Ext Data
line.setExtData(q->value(34).toString());
}
if(!q->value(36).isNull()) { // Ext Event ID
line.setExtEventId(q->value(36).toString());
if(!q->value(35).isNull()) { // Ext Event ID
line.setExtEventId(q->value(35).toString());
}
if(!q->value(37).isNull()) { // Ext Annc. Type
line.setExtAnncType(q->value(37).toString());
if(!q->value(36).isNull()) { // Ext Annc. Type
line.setExtAnncType(q->value(36).toString());
}
if(!q->value(38).isNull()) { // Ext Cart Name
line.setExtCartName(q->value(38).toString());
if(!q->value(37).isNull()) { // Ext Cart Name
line.setExtCartName(q->value(37).toString());
}
if(!q->value(40).isNull()) { // FadeUp Point
line.setFadeupPoint(q->value(40).toInt(),RDLogLine::LogPointer);
if(!q->value(39).isNull()) { // FadeUp Point
line.setFadeupPoint(q->value(39).toInt(),RDLogLine::LogPointer);
}
if(!q->value(41).isNull()) { // FadeUp Gain
line.setFadeupGain(q->value(41).toInt());
if(!q->value(40).isNull()) { // FadeUp Gain
line.setFadeupGain(q->value(40).toInt());
}
if(!q->value(42).isNull()) { // FadeDown Point
line.setFadedownPoint(q->value(42).toInt(),RDLogLine::LogPointer);
if(!q->value(41).isNull()) { // FadeDown Point
line.setFadedownPoint(q->value(41).toInt(),RDLogLine::LogPointer);
}
if(!q->value(43).isNull()) { // FadeDown Gain
line.setFadedownGain(q->value(43).toInt());
if(!q->value(42).isNull()) { // FadeDown Gain
line.setFadedownGain(q->value(42).toInt());
}
if(!q->value(44).isNull()) { // Segue Gain
line.setSegueGain(q->value(44).toInt());
if(!q->value(43).isNull()) { // Segue Gain
line.setSegueGain(q->value(43).toInt());
}
if(!q->value(59).isNull()) { // Duck Up Gain
line.setDuckUpGain(q->value(59).toInt());
if(!q->value(58).isNull()) { // Duck Up Gain
line.setDuckUpGain(q->value(58).toInt());
}
if(!q->value(60).isNull()) { // Duck Down Gain
line.setDuckDownGain(q->value(60).toInt());
if(!q->value(59).isNull()) { // Duck Down Gain
line.setDuckDownGain(q->value(59).toInt());
}
if(!q->value(61).isNull()) { // Start Datetime
line.setStartDatetime(q->value(61).toDateTime());
if(!q->value(60).isNull()) { // Start Datetime
line.setStartDatetime(q->value(60).toDateTime());
}
if(!q->value(62).isNull()) { // End Datetime
line.setEndDatetime(q->value(62).toDateTime());
if(!q->value(61).isNull()) { // End Datetime
line.setEndDatetime(q->value(61).toDateTime());
}
line.setValidity((RDCart::Validity)q->value(56).toInt()); // Validity
line.setValidity((RDCart::Validity)q->value(55).toInt()); // Validity
break;
case RDLogLine::Macro:
@ -1024,37 +1020,37 @@ int RDLogEvent::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
line.setGroupColor(group_colors[q->value(10).toString()]);
line.setTitle(q->value(11).toString()); // Title
line.setArtist(q->value(12).toString()); // Artist
line.setPublisher(q->value(45).toString()); // Publisher
line.setComposer(q->value(46).toString()); // Composer
line.setPublisher(q->value(44).toString()); // Publisher
line.setComposer(q->value(45).toString()); // Composer
line.setAlbum(q->value(13).toString()); // Album
line.setYear(q->value(14).toDate()); // Year
line.setLabel(q->value(15).toString()); // Label
line.setClient(q->value(16).toString()); // Client
line.setAgency(q->value(17).toString()); // Agency
line.setUserDefined(q->value(18).toString()); // User Defined
line.setCartNotes(q->value(65).toString()); // Cart Notes
line.setCartNotes(q->value(64).toString()); // Cart Notes
line.setForcedLength(q->value(21).toUInt()); // Forced Length
line.setAverageSegueLength(q->value(21).toInt());
if(!q->value(33).isNull()) { // Ext Start Time
line.setExtStartTime(q->value(33).toTime());
if(!q->value(32).isNull()) { // Ext Start Time
line.setExtStartTime(q->value(32).toTime());
}
if(!q->value(34).isNull()) { // Ext Length
line.setExtLength(q->value(34).toInt());
if(!q->value(33).isNull()) { // Ext Length
line.setExtLength(q->value(33).toInt());
}
if(!q->value(35).isNull()) { // Ext Data
line.setExtData(q->value(35).toString());
if(!q->value(34).isNull()) { // Ext Data
line.setExtData(q->value(34).toString());
}
if(!q->value(36).isNull()) { // Ext Event ID
line.setExtEventId(q->value(36).toString());
if(!q->value(35).isNull()) { // Ext Event ID
line.setExtEventId(q->value(35).toString());
}
if(!q->value(37).isNull()) { // Ext Annc. Type
line.setExtAnncType(q->value(37).toString());
if(!q->value(36).isNull()) { // Ext Annc. Type
line.setExtAnncType(q->value(36).toString());
}
if(!q->value(38).isNull()) { // Ext Cart Name
line.setExtCartName(q->value(38).toString());
if(!q->value(37).isNull()) { // Ext Cart Name
line.setExtCartName(q->value(37).toString());
}
if(!q->value(39).isNull()) { // Asyncronous
line.setAsyncronous(RDBool(q->value(39).toString()));
if(!q->value(38).isNull()) { // Asyncronous
line.setAsyncronous(RDBool(q->value(38).toString()));
}
break;
@ -1079,24 +1075,14 @@ int RDLogEvent::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
}
line.setHasCustomTransition(prev_custom||(q->value(5).toInt()>=0)||\
(q->value(40).toInt()>=0));
(q->value(39).toInt()>=0));
if(line.type()==RDLogLine::Cart) {
prev_custom=(q->value(6).toInt()>=0)||(q->value(7).toInt()>=0)||
(q->value(8).toInt()>=0)||(q->value(42).toInt()>=0);
(q->value(8).toInt()>=0)||(q->value(41).toInt()>=0);
}
else {
prev_custom=false;
}
// printf("LINE: %u START: %d END: %d S_START: %d S_END: %d FD_UP: %d FD_DN: %d\n",
// log_line.size(),
// q->value(5).toInt(),
// q->value(6).toInt(),
// q->value(7).toInt(),
// q->value(8).toInt(),
// q->value(38).toInt(),
// q->value(40).toInt());
line.clearModified();
log_line.push_back(new RDLogLine(line));
}

28
rdlogmanager/edit_event.cpp
View File

@ -259,16 +259,6 @@ EditEvent::EditEvent(QString eventname,bool new_event,
event_timetype_label->setFont(labelFont());
event_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Post Point
//
event_post_box=new QCheckBox(this);
event_post_box->setGeometry(CENTER_LINE+35,90,15,15);
event_post_label=new QLabel(event_post_box,tr("Make Post Point"),this);
event_post_label->setGeometry(CENTER_LINE+55,89,105,16);
event_post_label->setFont(labelFont());
event_post_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Grace Time
//
@ -777,7 +767,7 @@ EditEvent::EditEvent(QString eventname,bool new_event,
case RDLogLine::Hard:
event_timetype_check->setChecked(true);
event_post_box->setChecked(event_event->postPoint());
// event_post_box->setChecked(event_event->postPoint());
event_firsttrans_box->setCurrentItem(event_event->firstTransType());
switch((grace=event_event->graceTime())) {
case 0:
@ -974,8 +964,6 @@ void EditEvent::timeToggledData(bool state)
event_next_button->setEnabled(state);
event_wait_button->setEnabled(state);
event_grace_edit->setEnabled(state);
event_post_label->setEnabled(state&&(event_grace_group->checkedId()==0));
event_post_box->setEnabled(state&&(event_grace_group->checkedId()==0));
if(state) {
event_preimport_list->
setForceTrans((RDLogLine::TransType)event_firsttrans_box->currentItem());
@ -999,7 +987,6 @@ void EditEvent::timeToggledData(bool state)
event_position_unit->setDisabled(true);
}
else {
event_post_box->setChecked(false);
event_grace_edit->setDisabled(true);
if(event_position_box->isChecked()) {
event_position_edit->setEnabled(true);
@ -1021,22 +1008,16 @@ void EditEvent::graceClickedData(int id)
{
switch(id) {
case 0:
event_post_label->setEnabled(event_timetype_check->isChecked());
event_post_box->setEnabled(event_timetype_check->isChecked());
timeTransitionData(RDLogLine::Stop);
event_grace_edit->setDisabled(true);
break;
case 1:
event_post_label->setDisabled(true);
event_post_box->setDisabled(true);
timeTransitionData(RDLogLine::Segue);
event_grace_edit->setDisabled(true);
break;
case 2:
event_post_label->setDisabled(true);
event_post_box->setDisabled(true);
timeTransitionData(RDLogLine::Segue);
event_grace_edit->setEnabled(true);
break;
@ -1456,7 +1437,7 @@ void EditEvent::Save()
}
if(event_timetype_check->isChecked()) {
event_event->setTimeType(RDLogLine::Hard);
event_event->setPostPoint(event_post_box->isChecked());
// event_event->setPostPoint(event_post_box->isChecked());
event_event->setFirstTransType((RDLogLine::TransType)
event_firsttrans_box->currentItem());
switch(event_grace_group->checkedId()) {
@ -1476,7 +1457,7 @@ void EditEvent::Save()
else {
event_event->setTimeType(RDLogLine::Relative);
event_event->setGraceTime(0);
event_event->setPostPoint(false);
// event_event->setPostPoint(false);
event_event->setFirstTransType(RDLogLine::Play);
}
@ -1590,9 +1571,6 @@ QString EditEvent::GetProperties()
event_grace_edit->time().toString("mm:ss");
break;
}
if(event_post_box->isChecked()) {
properties+=tr(", Post");
}
}
if(event_autofill_box->isChecked()) {
properties+=tr(", Fill");

4
rdlogmanager/edit_event.h
View File

@ -116,7 +116,6 @@ class EditEvent : public RDDialog
QPixmap *event_playout_map;
QPixmap *event_macro_map;
QGroupBox *event_position_group;
// QLabel *event_position_header;
QLabel *event_position_label;
QLabel *event_position_unit;
QCheckBox *event_position_box;
@ -124,8 +123,6 @@ class EditEvent : public RDDialog
QGroupBox *event_timetype_group;
QCheckBox *event_timetype_check;
QLabel *event_timetype_label;
QCheckBox *event_post_box;
QLabel *event_post_label;
QButtonGroup *event_grace_group;
QGroupBox *event_grace_groupbox;
QRadioButton *event_immediate_button;
@ -160,7 +157,6 @@ class EditEvent : public RDDialog
QLabel *event_defaulttrans_unit;
QLabel *event_nestevent_label;
QComboBox *event_nestevent_box;
// QLabel *event_nestevent_unit;
ImportListView *event_postimport_list;
QLineEdit *event_postimport_length_edit;
RDTransportButton *event_postimport_up_button;

7
rdlogmanager/import_listview.cpp
View File

@ -2,7 +2,7 @@
//
// The Import Carts ListView widget for RDLogManager.
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 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
@ -207,11 +207,6 @@ void ImportListView::refreshList(int line)
break;
}
item->setText(6,QString().sprintf("%d",i));
/*
if(i==line) {
select_item=item;
}
*/
if(cart!=NULL) {
delete cart;
cart=NULL;

4
rdlogmanager/rdlogmanager_cs.ts
View File

@ -301,7 +301,7 @@ Chcete je uložit?</translation>
</message>
<message>
<source>Make Post Point</source>
<translation type="unfinished">Udělat bod vyvěšení</translation>
<translation type="obsolete">Udělat bod vyvěšení</translation>
</message>
<message>
<source>Action If Previous Event Still Playing</source>
@ -505,7 +505,7 @@ Chcete ji přepsat?</translation>
</message>
<message>
<source>, Post</source>
<translation type="unfinished">, Po</translation>
<translation type="obsolete">, Po</translation>
</message>
<message>
<source>, Fill</source>

4
rdlogmanager/rdlogmanager_de.ts
View File

@ -301,7 +301,7 @@ Wollen Sie sie speichern?</translation>
</message>
<message>
<source>Make Post Point</source>
<translation type="unfinished">Post Point machen</translation>
<translation type="obsolete">Post Point machen</translation>
</message>
<message>
<source>Action If Previous Event Still Playing</source>
@ -505,7 +505,7 @@ Wollen Sie es überschreiben?</translation>
</message>
<message>
<source>, Post</source>
<translation type="unfinished">, Nach</translation>
<translation type="obsolete">, Nach</translation>
</message>
<message>
<source>, Fill</source>

4
rdlogmanager/rdlogmanager_es.ts
View File

@ -303,7 +303,7 @@ horario</translation>
</message>
<message>
<source>Make Post Point</source>
<translation type="unfinished">Hacer Post Point</translation>
<translation type="obsolete">Hacer Post Point</translation>
</message>
<message>
<source>Action If Previous Event Still Playing</source>
@ -469,7 +469,7 @@ List</source>
</message>
<message>
<source>, Post</source>
<translation type="unfinished">, Post</translation>
<translation type="obsolete">, Post</translation>
</message>
<message>
<source>, Fill</source>

8
rdlogmanager/rdlogmanager_fr.ts
View File

@ -529,14 +529,6 @@ Do you want to overwrite it?</source>
<source>Import inline traffic event</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Make Post Point</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>, Post</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEventLine</name>

4
rdlogmanager/rdlogmanager_nb.ts
View File

@ -302,7 +302,7 @@ Vil du lagra?</translation>
</message>
<message>
<source>Make Post Point</source>
<translation type="unfinished">Lag Etter-punkt</translation>
<translation type="obsolete">Lag Etter-punkt</translation>
</message>
<message>
<source>Action If Previous Event Still Playing</source>
@ -514,7 +514,7 @@ Vil du byta henne ut?</translation>
</message>
<message>
<source>, Post</source>
<translation type="unfinished">, Etter</translation>
<translation type="obsolete">, Etter</translation>
</message>
<message>
<source>, Fill</source>

4
rdlogmanager/rdlogmanager_nn.ts
View File

@ -302,7 +302,7 @@ Vil du lagra?</translation>
</message>
<message>
<source>Make Post Point</source>
<translation type="unfinished">Lag Etter-punkt</translation>
<translation type="obsolete">Lag Etter-punkt</translation>
</message>
<message>
<source>Action If Previous Event Still Playing</source>
@ -514,7 +514,7 @@ Vil du byta henne ut?</translation>
</message>
<message>
<source>, Post</source>
<translation type="unfinished">, Etter</translation>
<translation type="obsolete">, Etter</translation>
</message>
<message>
<source>, Fill</source>

4
rdlogmanager/rdlogmanager_pt_BR.ts
View File

@ -307,7 +307,7 @@ Você quer salvar?</translation>
</message>
<message>
<source>Make Post Point</source>
<translation type="unfinished">Fazer Marcação </translation>
<translation type="obsolete">Fazer Marcação </translation>
</message>
<message>
<source>Action If Previous Event Still Playing</source>
@ -515,7 +515,7 @@ Você quer sobreescrêve-lo?</translation>
</message>
<message>
<source>, Post</source>
<translation type="unfinished">, Pós</translation>
<translation type="obsolete">, Pós</translation>
</message>
<message>
<source>, Fill</source>

19
utils/rddbmgr/revertschema.cpp
View File

@ -40,6 +40,25 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg)
// NEW SCHEMA REVERSIONS GO HERE...
//
// Revert 315
//
if((cur_schema==315)&&(set_schema<cur_schema)) {
sql=QString("alter table EVENTS add column POST_POINT enum('N','Y') ")+
"default 'N' after GRACE_TIME";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql=QString("alter table LOG_LINES add column POST_POINT enum('N','Y') ")+
"default 'N' after TIME_TYPE";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
WriteSchemaVersion(--cur_schema);
}
//
// Revert 314
//

1
utils/rddbmgr/schemamap.cpp
View File

@ -160,6 +160,7 @@ void MainObject::InitializeSchemaMap() {
global_version_map["3.1"]=310;
global_version_map["3.2"]=311;
global_version_map["3.3"]=314;
global_version_map["3.4"]=315;
}

7
utils/rddbmgr/updateschema.cpp
View File

@ -9903,6 +9903,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
WriteSchemaVersion(++cur_schema);
}
if((cur_schema<315)&&(set_schema>cur_schema)) {
DropColumn("EVENTS","POST_POINT");
DropColumn("LOG_LINES","POST_POINT");
WriteSchemaVersion(++cur_schema);
}
// NEW SCHEMA UPDATES GO HERE...