From f06f3d145377f66e85f3294c8964e28388e33014 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 15 Dec 2023 17:33:55 -0500 Subject: [PATCH] 2023-12-15 Fred Gleason * Fixed a regression in rdcatchd(8) that broke play-out events. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ cae/cae.cpp | 6 ------ rdcatchd/rdcatchd.cpp | 36 ++++++++++++++++++------------------ rdcatchd/rdcatchd.h | 8 ++++---- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2a848a6..97b78075 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24565,3 +24565,5 @@ 2023-12-15 Fred Gleason * Fixed a regression in rdcatch(1) that broke play-out of the head and tail audition buttons. +2023-12-15 Fred Gleason + * Fixed a regression in rdcatchd(8) that broke play-out events. diff --git a/cae/cae.cpp b/cae/cae.cpp index 273cac1e..cd79a308 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -196,12 +196,6 @@ MainObject::MainObject(QObject *parent) SLOT(setAudioPassthroughLevelData(int,unsigned,unsigned,unsigned,int))); connect(cae_server,SIGNAL(setClockSourceReq(int,unsigned,int)), this,SLOT(setClockSourceData(int,unsigned,int))); - connect(cae_server, - SIGNAL(openRtpCaptureChannelReq(int,unsigned,unsigned,uint16_t, - unsigned,unsigned)), - this, - SLOT(openRtpCaptureChannelData(int,unsigned,unsigned,uint16_t, - unsigned,unsigned))); connect(cae_server, SIGNAL(meterEnableReq(int,uint16_t,const QList &)), this, diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 06ddd03a..3708ca0b 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -217,14 +217,14 @@ MainObject::MainObject(QObject *parent) this,SLOT(recordStoppedData(int,int))); connect(rda->cae(),SIGNAL(recordUnloaded(int,int,unsigned)), this,SLOT(recordUnloadedData(int,int,unsigned))); - connect(rda->cae(),SIGNAL(playLoaded(int)), - this,SLOT(playLoadedData(int))); - connect(rda->cae(),SIGNAL(playing(int)), - this,SLOT(playingData(int))); - connect(rda->cae(),SIGNAL(playStopped(int)), - this,SLOT(playStoppedData(int))); - connect(rda->cae(),SIGNAL(playUnloaded(int)), - this,SLOT(playUnloadedData(int))); + connect(rda->cae(),SIGNAL(playLoaded(unsigned)), + this,SLOT(playLoadedData(unsigned))); + connect(rda->cae(),SIGNAL(playing(unsigned)), + this,SLOT(playingData(unsigned))); + connect(rda->cae(),SIGNAL(playStopped(unsigned)), + this,SLOT(playStoppedData(unsigned))); + connect(rda->cae(),SIGNAL(playUnloaded(unsigned)), + this,SLOT(playUnloadedData(unsigned))); if(!rda->cae()->connectHost(&err_msg)) { rda->syslog(LOG_ERR,"failed to start [%s]",err_msg.toUtf8().constData()); exit(RDCoreApplication::ExitInternalError); @@ -941,9 +941,9 @@ void MainObject::recordUnloadedData(int card,int stream,unsigned msecs) } -void MainObject::playLoadedData(int handle) +void MainObject::playLoadedData(unsigned serial) { - int deck=GetPlayoutDeck(handle); + int deck=GetPlayoutDeck(serial); catch_playout_deck_status[deck-129]=RDDeck::Ready; SendEventResponse(deck,catch_playout_deck_status[deck-129], catch_playout_id[deck-129],""); @@ -955,15 +955,15 @@ void MainObject::playLoadedData(int handle) } -void MainObject::playingData(int handle) +void MainObject::playingData(unsigned serial) { - int deck=GetPlayoutDeck(handle); + int deck=GetPlayoutDeck(serial); int event=GetEvent(catch_playout_id[deck-129]); catch_playout_deck_status[deck-129]=RDDeck::Recording; WriteExitCode(event,RDRecording::PlayActive); SendEventResponse(deck,catch_playout_deck_status[deck-129], catch_playout_id[deck-129],""); - catch_playout_status[GetPlayoutDeck(handle)]=true; + catch_playout_status[deck]=true; if(debug) { printf("Playing - Serial: %u Card: %d\n", catch_playout_serial[deck-129], @@ -972,9 +972,9 @@ void MainObject::playingData(int handle) } -void MainObject::playStoppedData(int handle) +void MainObject::playStoppedData(unsigned serial) { - int deck=GetPlayoutDeck(handle); + int deck=GetPlayoutDeck(serial); catch_playout_status[deck-129]=false; catch_playout_event_player[deck-129]->stop(); @@ -985,13 +985,13 @@ void MainObject::playStoppedData(int handle) catch_playout_serial[deck-129], catch_playout_card[deck-129]); } - rda->cae()->unloadPlay(handle); + rda->cae()->unloadPlay(serial); } -void MainObject::playUnloadedData(int handle) +void MainObject::playUnloadedData(unsigned serial) { - int deck=GetPlayoutDeck(handle); + int deck=GetPlayoutDeck(serial); int event=GetEvent(catch_playout_id[deck-129]); rda->syslog(LOG_INFO,"play complete: cut %s", diff --git a/rdcatchd/rdcatchd.h b/rdcatchd/rdcatchd.h index e4be6d56..a17f3987 100644 --- a/rdcatchd/rdcatchd.h +++ b/rdcatchd/rdcatchd.h @@ -70,10 +70,10 @@ class MainObject : public QObject void recordingData(int card,int stream); void recordStoppedData(int card,int stream); void recordUnloadedData(int card,int stream,unsigned msecs); - void playLoadedData(int handle); - void playingData(int handle); - void playStoppedData(int handle); - void playUnloadedData(int handle); + void playLoadedData(unsigned serial); + void playingData(unsigned serial); + void playStoppedData(unsigned serial); + void playUnloadedData(unsigned serial); void runCartData(int chan,int number,unsigned cartnum); void meterData(); void eventFinishedData(int id);