Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-17 08:01:13 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a regression in rdcatch(1) that caused status indication
	to break for record events.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-10-30 16:36:25 -04:00
parent de49ba6cd9
commit 6bc518b515
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -23574,3 +23574,6 @@
'RDCatchEvent'.
2022-10-30 Fred Gleason <fredg@paravelsystems.com>
* Reimplemented the 'PurgeEvent' command using 'RDCatchEvent'.
2022-10-30 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcatch(1) that caused status indication
to break for record events.

17
rdcatch/rdcatch.cpp
View File

@@ -205,9 +205,11 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
connect(catch_connect.back()->connector(),
SIGNAL(meterLevel(int,int,int,int)),
this,SLOT(meterLevelData(int,int,int,int)));
/*
connect(catch_connect.back()->connector(),
SIGNAL(eventUpdated(int)),
this,SLOT(eventUpdatedData(int)));
*/
/*
connect(catch_connect.back()->connector(),
SIGNAL(eventPurged(int)),
@@ -799,18 +801,25 @@ void MainWidget::deckEventSentData(int serial,int chan,int number)
void MainWidget::catchEventReceivedData(RDCatchEvent *evt)
{
printf("catchEventReceivedData()\n");
printf("%s\n",evt->dump().toUtf8().constData());
// printf("catchEventReceivedData()\n");
// printf("%s\n",evt->dump().toUtf8().constData());
switch(evt->operation()) {
case RDCatchEvent::PurgeEventOp:
catch_recordings_model->removeRecord(evt->eventId());
printf("removed event %u\n",evt->eventId());
break;
case RDCatchEvent::DeckStatusResponseOp:
if(evt->eventId()>0) {
if(!catch_recordings_model->refresh(evt->eventId())) {
catch_recordings_model->addRecord(evt->eventId());
}
catch_recordings_model->setRecordStatus(evt->eventId(),evt->deckStatus());
}
break;
case RDCatchEvent::DeckEventProcessedOp:
case RDCatchEvent::DeckStatusQueryOp:
case RDCatchEvent::DeckStatusResponseOp:
case RDCatchEvent::NullOp:
case RDCatchEvent::LastOp:
break;

11
rdcatchd/rdcatchd.cpp
View File

@@ -470,8 +470,17 @@ void MainObject::catchEventReceivedData(RDCatchEvent *evt)
rda->syslog(LOG_NOTICE,"catchEventReceivedData(): %s",
evt->dump().toUtf8().constData());
if(evt->operation()==RDCatchEvent::DeckStatusQueryOp) {
switch(evt->operation()) {
case RDCatchEvent::DeckStatusQueryOp:
SendFullEventResponse(rda->station()->address());
break;
case RDCatchEvent::DeckEventProcessedOp:
case RDCatchEvent::DeckStatusResponseOp:
case RDCatchEvent::PurgeEventOp:
case RDCatchEvent::NullOp:
case RDCatchEvent::LastOp:
break;
}
/*
chan=cmds.at(1).toInt(&ok);