2024-01-12 Fred Gleason <fredg@paravelsystems.com>

* Documented the meaning of the 'RDLogLine::StartTimeType' enum
	in 'lib/rdlog_line.h'.
	* Changed the default value of the 'RDLogLine::Imported' start time
	from '00:00:00' to NULL.
	* Fixed a regression in rdairplay(1) that caused the 'Sch. Time'
	column to be removed from the Full Log lists.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

ChangeLog

@@ -24596,3 +24596,10 @@
 2023-12-27 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a regression in rdcatchd(8) that caused recordings to MPEG
 	Layer II to fail.
+2024-01-12 Fred Gleason <fredg@paravelsystems.com>
+	* Documented the meaning of the 'RDLogLine::StartTimeType' enum
+	in 'lib/rdlog_line.h'.
+	* Changed the default value of the 'RDLogLine::Imported' start time
+	from '00:00:00' to NULL.
+	* Fixed a regression in rdairplay(1) that caused the 'Sch. Time'
+	column to be removed from the Full Log lists.

lib/rdlog_line.cpp

@@ -118,7 +118,7 @@ void RDLogLine::clear()
   log_pass=0;
   log_source=RDLogLine::Manual;
   log_cart_number=0;
-  log_start_time[RDLogLine::Imported]=QTime(0,0,0);
+  log_start_time[RDLogLine::Imported]=QTime();
   log_start_time[RDLogLine::Logged]=QTime(0,0,0);
   log_start_time[RDLogLine::Predicted]=QTime();
   log_start_time[RDLogLine::Actual]=QTime(0,0,0);

lib/rdlog_line.h

@@ -31,6 +31,23 @@
 class RDLogLine
 {
  public:
+  //
+  // StartTimeType values:
+  //
+  // Imported - Value from an external scheduler --i.e. imported traffic
+  //            or music log).
+  //
+  // Logged - Used by rdlogmanager(1) when processing log imports.
+  //
+  // Predicted - Generated by RDLogPlay on the basis of current log machine
+  //             state.
+  //
+  // Actual - Time event was last started by RDLogPlay or RDCartSlot.
+  //          (Includes restarts from a paused state).
+  //
+  // Initial - Time event was originally started by RDLogPlay (not reset when
+  //           resuming from a paused state).
+  //
   enum StartTimeType {Imported=0,Logged=1,Predicted=2,Actual=3,Initial=4};
   enum TimeType {Relative=0,Hard=1,NoTime=255};
   enum TransType {Play=0,Segue=1,Stop=2,NoTrans=255};

lib/rdlogmodel.cpp

@@ -1546,20 +1546,21 @@ QStringList RDLogModel::headerTexts() const
 {
   QStringList ret;
 
-  ret.push_back(tr("Start Time"));
-  ret.push_back(tr("Trans"));
-  ret.push_back(tr("Cart"));
-  ret.push_back(tr("Group"));
-  ret.push_back(tr("Length"));
-  ret.push_back(tr("Title"));
-  ret.push_back(tr("Artist"));
-  ret.push_back(tr("Client"));
-  ret.push_back(tr("Agency"));
-  ret.push_back(tr("Label"));
-  ret.push_back(tr("Source"));
-  ret.push_back(tr("Ext Data"));
-  ret.push_back(tr("Line ID"));
-  ret.push_back(tr("Count"));
+  ret.push_back(tr("Est. Time"));  // 00
+  ret.push_back(tr("Trans"));      // 01
+  ret.push_back(tr("Cart"));       // 02
+  ret.push_back(tr("Group"));      // 03
+  ret.push_back(tr("Length"));     // 04
+  ret.push_back(tr("Title"));      // 05
+  ret.push_back(tr("Artist"));     // 06
+  ret.push_back(tr("Sch. Time"));  // 07
+  ret.push_back(tr("Client"));     // 08
+  ret.push_back(tr("Agency"));     // 09
+  ret.push_back(tr("Label"));      // 10
+  ret.push_back(tr("Source"));     // 11
+  ret.push_back(tr("Ext Data"));   // 12
+  ret.push_back(tr("Line ID"));    // 13
+  ret.push_back(tr("Count"));      // 14
 
   return ret;
 }
@@ -1572,13 +1573,14 @@ QList<int> RDLogModel::columnAlignments() const
   int center=Qt::AlignCenter;
   int right=Qt::AlignRight|Qt::AlignVCenter;
 
-  ret.push_back(right);   // Start Time
+  ret.push_back(right);   // Estimated Time
   ret.push_back(center);  // Trans
   ret.push_back(center);  // Cart
   ret.push_back(center);  // Group
   ret.push_back(right);   // Length
   ret.push_back(left);    // Title
   ret.push_back(left);    // Artist
+  ret.push_back(right);   // Scheduled Time
   ret.push_back(left);    // Client
   ret.push_back(left);    // Agency
   ret.push_back(left);    // Label
@@ -1624,19 +1626,22 @@ QString RDLogModel::cellText(int col,int line,RDLogLine *ll) const
   case 6:  // Artist
     return ll->artist();
 
-  case 7:  // Client
+  case 7:  // Scheduled Time
+    return rda->timeString(ll->startTime(RDLogLine::Imported));
+
+  case 8:  // Client
     return ll->client();
 
-  case 8:  // Agency
+  case 9:  // Agency
     return ll->agency();
 
-  case 9:  // Label
+  case 10:  // Label
     return ll->markerLabel();
 
-  case 10:  // Source
+  case 11:  // Source
     return RDLogLine::sourceText(ll->source());
 
-  case 11:  // Ext Data
+  case 12:  // Ext Data
     switch(ll->type()) {
     case RDLogLine::MusicLink:
     case RDLogLine::TrafficLink:
@@ -1654,10 +1659,10 @@ QString RDLogModel::cellText(int col,int line,RDLogLine *ll) const
     }
     break;
 
-  case 12:  // Line ID
+  case 13:  // Line ID
     return QString::asprintf("%d",ll->id());
 
-  case 13:  // Count
+  case 14:  // Count
     return QString::asprintf("%d",line);
   }
   return QString();

rdlogedit/edit_log.cpp

@@ -239,6 +239,7 @@ EditLog::EditLog(QString *filter,QString *group,QString *schedcode,
   edit_log_model->setFont(defaultFont());
   edit_log_model->setPalette(palette());
   edit_log_view->setModel(edit_log_model);
+  edit_log_view->hideColumn(7);  // Scheduled Time is redundant
   connect(edit_log_model,
 	  SIGNAL(dataChanged(const QModelIndex &,const QModelIndex &)),
 	  this,SLOT(dataChangedData(const QModelIndex &,const QModelIndex &)));