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

2022-10-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 'Trans' column to the 'Imported Events' list in the
	'Test Music Import' list in rdadmin(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-10-15 12:03:48 -04:00
parent 7c8fbeacb8
commit ad31135bde
4 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23508,3 +23508,6 @@
dialog in rdadmin(1). dialog in rdadmin(1).
* Added 'Transition Type' and 'Time Type' parameters to the music * Added 'Transition Type' and 'Time Type' parameters to the music
import parameters in the 'Edit Service' dialog in rdadmin(1). import parameters in the 'Edit Service' dialog in rdadmin(1).
2022-10-14 Fred Gleason <fredg@paravelsystems.com>
* Added a 'Trans' column to the 'Imported Events' list in the
'Test Music Import' list in rdadmin(1).

2
docs/examples/0320090805.tfc
View File

@ -2,7 +2,7 @@
00:02:53 10002 E Song 00:03:27 GUID4567890123456789012345678902 PLAY HARD 00:02:53 10002 E Song 00:03:27 GUID4567890123456789012345678902 PLAY HARD
00:06:20 10003 Likeness 00:02:54 GUID4567890123456789012345678903 STOP 00:06:20 10003 Likeness 00:02:54 GUID4567890123456789012345678903 STOP
00:09:14 10004 Atchafalaya 00:28:02 GUID4567890123456789012345678904 00:09:14 10004 Atchafalaya 00:28:02 GUID4567890123456789012345678904
00:30:00 BREAK Spot Break 00:02:00 00:30:00 BREAK Spot Break 00:02:00 SOFT
00:32:00 10005 Mr. Banks 00:03:54 GUID4567890123456789012345678905 00:32:00 10005 Mr. Banks 00:03:54 GUID4567890123456789012345678905
00:35:54 TRACK Voicetrack 00:01:30 00:35:54 TRACK Voicetrack 00:01:30
00:38:24 10006 The Grey and the Green 00:03:23 GUID4567890123456789012345678906 00:38:24 10006 The Grey and the Green 00:03:23 GUID4567890123456789012345678906

48
lib/rdlogimportmodel.cpp
View File

@ -39,11 +39,14 @@ RDLogImportModel::RDLogImportModel(const QString &hostname,pid_t proc_id,
unsigned right=Qt::AlignRight|Qt::AlignVCenter; unsigned right=Qt::AlignRight|Qt::AlignVCenter;
d_headers.push_back(tr("Start Time")); d_headers.push_back(tr("Start Time"));
d_alignments.push_back(left); d_alignments.push_back(right);
d_headers.push_back(tr("Cart")); d_headers.push_back(tr("Cart"));
d_alignments.push_back(center); d_alignments.push_back(center);
d_headers.push_back(tr("Trans"));
d_alignments.push_back(center);
d_headers.push_back(tr("Len")); d_headers.push_back(tr("Len"));
d_alignments.push_back(right); d_alignments.push_back(right);
@ -59,7 +62,7 @@ RDLogImportModel::RDLogImportModel(const QString &hostname,pid_t proc_id,
d_headers.push_back(tr("Annc Type")); d_headers.push_back(tr("Annc Type"));
d_alignments.push_back(left); d_alignments.push_back(left);
d_headers.push_back(tr("Line")); d_headers.push_back(tr("Line Number"));
d_alignments.push_back(right); d_alignments.push_back(right);
updateModel(); updateModel();
@ -197,52 +200,58 @@ void RDLogImportModel::updateRow(int row,RDSqlQuery *q)
} }
// Start Time // Start Time
texts[0]=RDSvc::timeString(q->value(1).toInt(),q->value(2).toInt()); QString prefix;
if((RDLogLine::TimeType)q->value(12).toUInt()==RDLogLine::Hard) {
if(q->value(13).toInt()<0) {
prefix="S:";
}
else {
prefix="H:";
}
}
texts[0]=prefix+RDSvc::timeString(q->value(1).toInt(),q->value(2).toInt());
// Cart // Transition Type
// texts.push_back(q->value(2)); texts[2]=RDLogLine::transText((RDLogLine::TransType)q->value(11).toUInt());
// Length // Length
if(!q->value(4).isNull()) { if(!q->value(4).isNull()) {
texts[2]=RDGetTimeLength(q->value(4).toInt(),false,false); texts[3]=RDGetTimeLength(q->value(4).toInt(),false,false);
} }
// Title
// texts.push_back(q->value(2));
// GUID // GUID
texts[4]=q->value(5).toString().trimmed(); texts[5]=q->value(5).toString().trimmed();
// Event ID // Event ID
texts[5]=q->value(6).toString().trimmed(); texts[6]=q->value(6).toString().trimmed();
// Annc Type // Annc Type
texts[6]=q->value(7).toString().trimmed(); texts[7]=q->value(7).toString().trimmed();
// Line // Line
texts[7]=QString::asprintf("%u",1+q->value(10).toUInt()); texts[8]=QString::asprintf("%u",1+q->value(10).toUInt());
switch((RDLogLine::Type)q->value(9).toUInt()) { switch((RDLogLine::Type)q->value(9).toUInt()) {
case RDLogLine::Cart: case RDLogLine::Cart:
d_icons[row]=rda->iconEngine()->typeIcon(RDLogLine::Cart); d_icons[row]=rda->iconEngine()->typeIcon(RDLogLine::Cart);
texts[1]=q->value(3); // Cart Number texts[1]=q->value(3); // Cart Number
texts[3]=q->value(8).toString().trimmed(); // Title texts[4]=q->value(8).toString().trimmed(); // Title
break; break;
case RDLogLine::Marker: case RDLogLine::Marker:
d_icons[row]=rda->iconEngine()->typeIcon(RDLogLine::Marker); d_icons[row]=rda->iconEngine()->typeIcon(RDLogLine::Marker);
texts[1]=tr("NOTE"); // Cart Number texts[1]=tr("NOTE"); // Cart Number
texts[3]=q->value(8).toString().trimmed(); // Title texts[4]=q->value(8).toString().trimmed(); // Title
break; break;
case RDLogLine::TrafficLink: case RDLogLine::TrafficLink:
d_icons[row]=rda->iconEngine()->typeIcon(RDLogLine::TrafficLink); d_icons[row]=rda->iconEngine()->typeIcon(RDLogLine::TrafficLink);
texts[3]=tr("[spot break]"); // Title texts[4]=tr("[spot break]"); // Title
break; break;
case RDLogLine::Track: case RDLogLine::Track:
d_icons[row]=rda->iconEngine()->typeIcon(RDLogLine::Track); d_icons[row]=rda->iconEngine()->typeIcon(RDLogLine::Track);
texts[3]=tr("[voice track]"); // Title texts[4]=tr("[voice track]"); // Title
break; break;
case RDLogLine::Macro: case RDLogLine::Macro:
@ -272,7 +281,10 @@ QString RDLogImportModel::sqlFields() const
"`EXT_ANNC_TYPE`,"+ // 07 "`EXT_ANNC_TYPE`,"+ // 07
"`TITLE`,"+ // 08 "`TITLE`,"+ // 08
"`TYPE`,"+ // 09 "`TYPE`,"+ // 09
"`FILE_LINE` "+ // 10 "`FILE_LINE`,"+ // 10
"`TRANS_TYPE`,"+ // 11
"`TIME_TYPE`,"+ // 12
"`GRACE_TIME` "+ // 13
"from `IMPORTER_LINES` "; "from `IMPORTER_LINES` ";
return sql; return sql;

10
rdadmin/edit_svc.h
View File

@ -21,11 +21,11 @@
#ifndef EDIT_SVC_H #ifndef EDIT_SVC_H
#define EDIT_SVC_H #define EDIT_SVC_H
#include <qcheckbox.h> #include <QCheckBox>
#include <qcombobox.h> #include <QComboBox>
#include <qlabel.h> #include <QLabel>
#include <qlineedit.h> #include <QLineEdit>
#include <qspinbox.h> #include <QSpinBox>
#include <rddialog.h> #include <rddialog.h>
#include <rdsvc.h> #include <rdsvc.h>