2018-07-17 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in rdadmin(1) that caused the Audio Resources list
	to be mal-formatted.
	* Fixed a bug in rdcatch(1) that caused Record and Playout events
	to be saved to the incorrect Location.

ChangeLog

@@ -17139,3 +17139,8 @@
 2018-07-17 Fred Gleason <fredg@paravelsystems.com>
 	* Refactored rdcatch(1) to use a single SQL field list for building
 	the event UI.
+2018-07-17 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in rdadmin(1) that caused the Audio Resources list
+	to be mal-formatted.
+	* Fixed a bug in rdcatch(1) that caused Record and Playout events
+	to be saved to the incorrect Location.

rdadmin/view_adapters.cpp

@@ -124,11 +124,11 @@ ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent)
     for(int i=0;i<RD_MAX_CARDS;i++) {
       if(rdstation->cardName(i).isEmpty()) {
 	text+=QString("  ")+tr("Card")+QString().sprintf(" %d: ",i)+
-	  tr("Not present");
+	  tr("Not present")+"\n";
       }
       else {
 	text+=QString("  ")+tr("Card")+QString().sprintf(" %d: ",i)+
-	  rdstation->cardName(i);
+	  rdstation->cardName(i)+"\n";
 	switch(rdstation->cardDriver(i)) {
 	case RDStation::Hpi:
 	  text+=tr("      Driver: AudioScience HPI\n");
@@ -151,6 +151,7 @@ ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent)
 	text+=QString("      ")+tr("Outputs")+
 	  QString().sprintf(" %d\n",rdstation->cardOutputs(i));
       }
+      text+="\n";
     }
   }
   else {

rdcatch/edit_playout.cpp

@@ -410,11 +410,12 @@ void EditPlayout::PopulateDecks(QComboBox *box)
 
 void EditPlayout::Save()
 {
-  QStringList f0=f0.split(":",edit_station_box->currentText());
+  int chan=-1;
+  QString station=GetLocation(&chan);
   edit_recording->setIsActive(edit_active_button->isChecked());
-  edit_recording->setStation(f0[0]);
+  edit_recording->setStation(station);
   edit_recording->setType(RDRecording::Playout);
-  edit_recording->setChannel(f0[2].toInt()+128);
+  edit_recording->setChannel(chan+128);
   if(edit_starttime_edit->time().isNull()) {
     edit_recording->setStartTime(edit_starttime_edit->time().addMSecs(1));
   }
@@ -432,3 +433,12 @@ void EditPlayout::Save()
   edit_recording->setSun(edit_sun_button->isChecked());
   edit_recording->setOneShot(edit_oneshot_box->isChecked());
 }
+
+
+QString EditPlayout::GetLocation(int *chan) const
+{
+  QStringList f0=f0.split(":",edit_station_box->currentText());
+  *chan=
+    f0[1].stripWhiteSpace().left(f0[1].stripWhiteSpace().length()-1).toInt();
+  return f0[0].stripWhiteSpace();
+}

rdcatch/edit_playout.h

@@ -59,6 +59,7 @@ class EditPlayout : public QDialog
  private:
   void PopulateDecks(QComboBox *box);
   void Save();
+  QString GetLocation(int *chan) const;
   RDDeck *edit_deck;
   RDRecording *edit_recording;
   QCheckBox *edit_active_button;

rdcatch/edit_recording.cpp

@@ -834,11 +834,12 @@ void EditRecording::PopulateDecks(QComboBox *box)
 
 void EditRecording::Save()
 {
-  QStringList f0=f0.split(":",edit_station_box->currentText());
+  int chan=-1;
+  QString station=GetLocation(&chan);
   edit_recording->setIsActive(edit_active_button->isChecked());
-  edit_recording->setStation(f0[0]);
+  edit_recording->setStation(station);
   edit_recording->setType(RDRecording::Recording);
-  edit_recording->setChannel(f0[2].toInt());
+  edit_recording->setChannel(chan);
   edit_recording->setDescription(edit_description_edit->text());
   edit_recording->setCutName(edit_cutname);
   edit_recording->setMon(edit_mon_button->isChecked());
@@ -1174,3 +1175,12 @@ int EditRecording::GetSource()
   delete q;
   return source;
 }
+
+
+QString EditRecording::GetLocation(int *chan) const
+{
+  QStringList f0=f0.split(":",edit_station_box->currentText());
+  *chan=
+    f0[1].stripWhiteSpace().left(f0[1].stripWhiteSpace().length()-1).toInt();
+  return f0[0].stripWhiteSpace();
+}

rdcatch/edit_recording.h

@@ -68,6 +68,7 @@ class EditRecording : public QDialog
   bool CheckEvent(bool include_myself);
   QString GetSourceName(int input);
   int GetSource();
+  QString GetLocation(int *chan) const;
   RDDeck *edit_deck;
   RDRecording *edit_recording;
   QCheckBox *edit_active_button;