2021-08-31 Fred Gleason <fredg@paravelsystems.com>

* Removed the 'Enable Now & Next' checkbox from the 'Edit Group'
	dialog in rdadmin(1).
	* Removed the 'RDGroup::enableNowNext()' and
	'RDGroup::setEnableNowNext()' methods.
	* Removed the 'RDLogLine::nowNextEnabled()' and
	'RDLogLine::setNowNextEnabled()' methods.

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

ChangeLog

@@ -22357,3 +22357,10 @@
 2021-08-31 Fred Gleason <fredg@paravelsystems.com>
 	* Added support for [NowGroups] and [NextGroups] sections in
 	PyPAD script configurations.
+2021-08-31 Fred Gleason <fredg@paravelsystems.com>
+	* Removed the 'Enable Now & Next' checkbox from the 'Edit Group'
+	dialog in rdadmin(1).
+	* Removed the 'RDGroup::enableNowNext()' and
+	'RDGroup::setEnableNowNext()' methods.
+	* Removed the 'RDLogLine::nowNextEnabled()' and
+	'RDLogLine::setNowNextEnabled()' methods.

docs/opsguide/rdadmin.xml

@@ -221,11 +221,6 @@
 	then the cart containing the deleted cut will also be deleted if it
 	contains no other cuts.
       </para>
-      <para>
-	If the <computeroutput>Transmit Now &apos; Next</computeroutput> box
-	is ticked, then carts in this group will generate an RLM event when
-	played in a log.
-      </para>
       <para>
 	Carts in this group will be allowed to play only on those services
 	that are shown in the <computeroutput>Active Services</computeroutput>

docs/tables/DEAD.txt

@@ -1,5 +1,6 @@
 This note lists DB fields that are currently unused and may be removed
 in future.
 
+GROUPS.ENABLE_NOW_NEXT
 LOGS.INCLUDE_IMPORT_MARKERS
 SERVICES.INCLUDE_IMPORT_MARKERS

lib/rdevent_line.cpp

@@ -922,7 +922,7 @@ bool RDEventLine::linkLog(RDLogModel *e,RDLog *log,const QString &svcname,
   QString sql;
   RDSqlQuery *q;
   RDLogLine *logline=NULL;
-  RDLog::Source log_src;
+  RDLog::Source log_src=RDLog::SourceMusic;
 
   //
   // Initial Import Parameters

lib/rdgroup.cpp

@@ -213,19 +213,6 @@ void RDGroup::setExportReport(ExportType type,bool state) const
 }
 
 
-bool RDGroup::enableNowNext() const
-{
-  return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,"ENABLE_NOW_NEXT").
-		toString());
-}
-
-
-void RDGroup::setEnableNowNext(bool state) const
-{
-  SetRow("ENABLE_NOW_NEXT",RDYesNo(state));
-}
-
-
 QColor RDGroup::color() const
 {
   return QColor(RDGetSqlValue("GROUPS","NAME",group_name,"COLOR").
@@ -370,8 +357,7 @@ QString RDGroup::xml() const
     "`ENFORCE_CART_RANGE`,"+  // 06
     "`REPORT_TFC`,"+          // 07
     "`REPORT_MUS`,"+          // 08
-    "`ENABLE_NOW_NEXT`,"+     // 09
+    "`COLOR` "+               // 09
-    "`COLOR` "+               // 10
     "from `GROUPS` where "+
     "`NAME`='"+RDEscapeString(group_name)+"'";
   q=new RDSqlQuery(sql);
@@ -398,8 +384,7 @@ QString RDGroup::xml() const
     ret+="  "+RDXmlField("enforceCartRange",RDBool(q->value(6).toString()));
     ret+="  "+RDXmlField("reportTfc",RDBool(q->value(7).toString()));
     ret+="  "+RDXmlField("reportMus",RDBool(q->value(8).toString()));
-    ret+="  "+RDXmlField("enableNowNext",RDBool(q->value(9).toString()));
+    ret+="  "+RDXmlField("color",q->value(9).toString());
-    ret+="  "+RDXmlField("color",q->value(10).toString());
     ret+="</group>\n";
   }
   delete q;

lib/rdgroup.h

@@ -52,8 +52,6 @@ class RDGroup
   void setEnforceCartRange(bool state) const;
   bool exportReport(ExportType type) const;
   void setExportReport(ExportType type,bool state) const;
-  bool enableNowNext() const;
-  void setEnableNowNext(bool state) const;
   QColor color() const;
   void setColor(const QColor &color);
   QString notifyEmailAddress() const;

lib/rdgrouplistmodel.cpp

@@ -61,9 +61,6 @@ RDGroupListModel::RDGroupListModel(bool show_all,bool user_is_admin,
   d_headers.push_back(tr("Music Report"));
   d_alignments.push_back(center);
 
-  d_headers.push_back(tr("Now & Next"));
-  d_alignments.push_back(center);
-
   if(user_is_admin) {
     changeUser();
   }
@@ -404,9 +401,6 @@ void RDGroupListModel::updateRow(int row,RDSqlQuery *q)
   // Music Report
   texts.push_back(q->value(8));
 
-  // Now & Next
-  texts.push_back(q->value(9));
-
   d_texts[row]=texts;
 }
 
@@ -423,8 +417,7 @@ QString RDGroupListModel::sqlFields() const
     "`NOTIFY_EMAIL_ADDRESS`," // 06
     "`REPORT_TFC`,"+          // 07
     "`REPORT_MUS`,"+          // 08
-    "`ENABLE_NOW_NEXT`,"+     // 09
+    "`COLOR` "+               // 09
-    "`COLOR` "+               // 10
     "from `GROUPS` ";
 
     return sql;

lib/rdlog_line.cpp

@@ -198,7 +198,6 @@ void RDLogLine::clear()
   log_ext_annc_type="";
   log_pause_card=-1;
   log_pause_port=-1;
-  log_now_next_enabled=false;
   log_zombified=false;
   log_timescaling_active=false;
   log_play_deck=NULL;
@@ -1591,18 +1590,6 @@ void RDLogLine::setPlayPositionChanged(bool state)
 }
 
 
-bool RDLogLine::nowNextEnabled() const
-{
-  return log_now_next_enabled;
-}
-
-
-void RDLogLine::setNowNextEnabled(bool state)
-{
-  log_now_next_enabled=state;
-}
-
-
 bool RDLogLine::useEventLength() const
 {
   return log_use_event_length;
@@ -2079,14 +2066,13 @@ void RDLogLine::loadCart(int cartnum,int cutnum)
     "`CART`.`END_DATETIME`,"+          // 17
     "`CART`.`ENFORCE_LENGTH`,"+        // 18
     "`CART`.`PRESERVE_PITCH`,"+        // 19
-    "`GROUPS`.`ENABLE_NOW_NEXT`,"+     // 20
+    "`CART`.`ASYNCRONOUS`,"+           // 20
-    "`CART`.`ASYNCRONOUS`,"+           // 21
+    "`CART`.`PUBLISHER`,"+             // 21
-    "`CART`.`PUBLISHER`,"+             // 22
+    "`CART`.`COMPOSER`,"+              // 22
-    "`CART`.`COMPOSER`,"+              // 23
+    "`CART`.`USAGE_CODE`,"+            // 23
-    "`CART`.`USAGE_CODE`,"+            // 24
+    "`CART`.`AVERAGE_SEGUE_LENGTH`,"+  // 24
-    "`CART`.`AVERAGE_SEGUE_LENGTH`,"+  // 25
+    "`CART`.`NOTES`,"+                 // 25
-    "`CART`.`NOTES`,"+                 // 26
+    "`GROUPS`.`COLOR` "+               // 26
-    "`GROUPS`.`COLOR` "+               // 27
     "from `CART` left join `GROUPS` "+
     "on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` where "+
     QString().sprintf("(`CART`.`NUMBER`=%d)",cartnum);
@@ -2129,14 +2115,13 @@ void RDLogLine::loadCart(int cartnum,int cutnum)
   log_forced_length=q->value(12).toUInt();
   log_enforce_length=RDBool(q->value(18).toString());
   log_preserve_pitch=RDBool(q->value(19).toString());
-  log_now_next_enabled=RDBool(q->value(20).toString());
+  log_asyncronous=RDBool(q->value(20).toString());
-  log_asyncronous=RDBool(q->value(21).toString());
+  log_publisher=q->value(21).toString();
-  log_publisher=q->value(22).toString();
+  log_composer=q->value(22).toString();
-  log_composer=q->value(23).toString();
+  log_usage_code=(RDCart::UsageCode)q->value(23).toInt();
-  log_usage_code=(RDCart::UsageCode)q->value(24).toInt();
+  log_average_segue_length=q->value(24).toInt();
-  log_average_segue_length=q->value(25).toInt();
+  log_cart_notes=q->value(25).toString();
-  log_cart_notes=q->value(26).toString();
+  log_group_color=QColor(q->value(26).toString());
-  log_group_color=QColor(q->value(27).toString());
   log_play_source=RDLogLine::UnknownSource;
   delete q;
 

lib/rdlog_line.h

@@ -234,8 +234,6 @@ class RDLogLine
   void setPlayPosition(unsigned pos);
   bool playPositionChanged() const;
   void setPlayPositionChanged(bool state);
-  bool nowNextEnabled() const;
-  void setNowNextEnabled(bool state);
   bool useEventLength() const;
   void setUseEventLength(bool state);
   int eventLength() const;
@@ -366,7 +364,6 @@ class RDLogLine
   QString log_ext_annc_type;
   int log_pause_card;
   int log_pause_port;
-  bool log_now_next_enabled;
   PlaySource log_play_source;
   StartSource log_start_source;
   bool log_zombified;

lib/rdlogmodel.cpp

@@ -1353,8 +1353,6 @@ int RDLogModel::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
   }
   delete q;
 
-  LoadNowNext(start_line);
-
   if(track_ptrs) {
     //
     // Load default cart pointers for "representative" cuts.  This is
@@ -1510,35 +1508,6 @@ void RDLogModel::SaveLine(int line)
 }
 
 
-void RDLogModel::LoadNowNext(unsigned from_line)
-{
-  QStringList groups;
-  QList<bool> now_nexts;
-
-  //
-  // Load the Lookup Table
-  //
-  QString sql=QString("select ")+
-    "`NAME`,"+             // 00
-    "`ENABLE_NOW_NEXT` "+  // 01
-    "from `GROUPS`";
-  RDSqlQuery *q=new RDSqlQuery(sql);
-  while(q->next()) {
-    groups.push_back(QString(q->value(0).toString()));
-    now_nexts.push_back(RDBool(q->value(1).toString()));
-  }
-  delete q;
-
-  for(int i=from_line;i<d_log_lines.size();i++) {
-    for(int j=0;j<groups.size();j++) {
-      if(d_log_lines[i]->groupName()==groups[j]) {
-	d_log_lines[i]->setNowNextEnabled(now_nexts[j]);
-      }
-    }
-  }
-}
-
-
 void RDLogModel::emitDataChanged(int row)
 {
   QModelIndex left=createIndex(row,0);

lib/rdlogmodel.h

@@ -105,7 +105,6 @@ class RDLogModel : public QAbstractTableModel
   void SaveLine(int line);
   void InsertLines(QString values);
   void InsertLineValues(QString *query, int line);
-  void LoadNowNext(unsigned from_line);
   void MakeModel();
   QPalette d_palette;
   QFont d_font;

lib/rdlogplay.cpp

@@ -3041,7 +3041,7 @@ void RDLogPlay::SendNowNext()
   //
   if(running>0) {
     now_line=lines[running-1];  // Most recently started event
-    if((!logLine(now_line)->nowNextEnabled())||(logLine(now_line)->cartType()!=RDCart::Macro)) {
+    if(logLine(now_line)->cartType()!=RDCart::Macro) {
       //
       // If the most recently started event is not a Now&Next-enabled macro
       // cart, then use longest running event instead
@@ -3056,7 +3056,7 @@ void RDLogPlay::SendNowNext()
     }
   }
 
-  if((now_line>=0)&&(logLine(now_line)->nowNextEnabled())) {
+  if(now_line>=0) {
     logline[0]=logLine(now_line);
   }
   else {
@@ -3075,8 +3075,7 @@ void RDLogPlay::SendNowNext()
   logline[1]=NULL;
   for(int i=nextLine();i<lineCount();i++) {
     if((ll=logLine(i))!=NULL) {
-      if((ll->status()==RDLogLine::Scheduled)&&
+      if((ll->status()==RDLogLine::Scheduled)&&(!logLine(i)->asyncronous())) {
-	 logLine(i)->nowNextEnabled()&&(!logLine(i)->asyncronous())) {
 	logline[1]=logLine(i);
 	i=lineCount();
       }

rdadmin/edit_group.cpp

@@ -175,14 +175,6 @@ EditGroup::EditGroup(QString group,QWidget *parent)
   group_delete_carts_label->setFont(labelFont());
   group_delete_carts_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
 
-  //
-  // Now & Next Data Checkbox
-  //
-  group_nownext_check=new QCheckBox(this);
-  group_nownext_label=new QLabel(tr("Transmit Now && Next data"),this);
-  group_nownext_label->setFont(labelFont());
-  group_nownext_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
-
   //
   // Services Selector
   //
@@ -238,7 +230,6 @@ EditGroup::EditGroup(QString group,QWidget *parent)
     group_delete_carts_check->setChecked(group_group->deleteEmptyCarts());
   }
   purgeEnabledData(group_shelflife_check->isChecked());
-  group_nownext_check->setChecked(group_group->enableNowNext());
   sql=QString("select `SERVICE_NAME` from `AUDIO_PERMS` where ")+
     "`GROUP_NAME`='"+RDEscapeString(group_group->name())+"'";
   q=new RDSqlQuery(sql);
@@ -364,7 +355,6 @@ void EditGroup::okData()
     group_group->setCutShelflife(-1);
     group_group->setDeleteEmptyCarts(false);
   }
-  group_group->setEnableNowNext(group_nownext_check->isChecked());
   group_group->setColor(group_color_button->
 			palette().color(QPalette::Active,
 					QPalette::ButtonText));
@@ -454,10 +444,7 @@ void EditGroup::resizeEvent(QResizeEvent *e)
   group_delete_carts_check->setGeometry(40,256,15,15);
   group_delete_carts_label->setGeometry(60,256,160,19);
 
-  group_nownext_check->setGeometry(20,277,15,15);
+  group_svcs_sel->setGeometry(10,282,w-20,h-344);
-  group_nownext_label->setGeometry(40,276,w-50,19);
-
-  group_svcs_sel->setGeometry(10,298,w-20,h-370);
 
   group_color_button->setGeometry(10,h-60,80,50);
 

rdadmin/edit_group.h

@@ -70,8 +70,6 @@ class EditGroup : public RDDialog
   QCheckBox *group_music_check;
   QLabel *group_traffic_label;
   QCheckBox *group_traffic_check;
-  QLabel *group_nownext_label;
-  QCheckBox *group_nownext_check;
   QLabel *group_carttype_label;
   QComboBox *group_carttype_box;
   QPushButton *group_color_button;

rdadmin/list_groups.cpp

@@ -273,7 +273,7 @@ void ListGroups::reportData()
   report+=QString("Generated: ")+
     QDateTime::currentDateTime().toString("MM/dd/yyyy - hh:mm:ss")+"\n";
   report+="\n";
-  report+="-Name----- -Description-------------------------------- -Cart Range---- Enf DefType Mus Tfc N&N\n";
+  report+="-Name----- -Description-------------------------------- -Cart Range---- Enf DefType Mus Tfc\n";
 
   //
   // Generate Body
@@ -286,8 +286,7 @@ void ListGroups::reportData()
     "`ENFORCE_CART_RANGE`,"+  // 04
     "`DEFAULT_CART_TYPE`,"+   // 05
     "`REPORT_MUS`,"+          // 06
-    "`REPORT_TFC`,"+          // 07
+    "`REPORT_TFC` "+          // 07
-    "`ENABLE_NOW_NEXT` "+     // 08
     "from `GROUPS` order by `NAME`";
   q=new RDSqlQuery(sql);
   while(q->next()) {
@@ -344,11 +343,6 @@ void ListGroups::reportData()
     //
     report+=QString(" ")+q->value(7).toString()+"  ";
     
-    //
-    // Now & Next
-    //
-    report+=QString(" ")+q->value(8).toString();
-
     //
     // End of Line
     //