Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 06:32:34 +02:00
Code Issues Projects Releases Wiki Activity

2023-10-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified rdcatch(8) to use the new-style CAE commands for play-out
	events.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-10-16 14:17:22 -04:00
parent e9f4b91a5d
commit 857aac5da5
4 changed files with 45 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24453,3 +24453,6 @@
2023-10-14 Fred Gleason <fredg@paravelsystems.com> 2023-10-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcatch(1) that broke audio audition * Fixed a regression in rdcatch(1) that broke audio audition
play-out. play-out.
2023-10-14 Fred Gleason <fredg@paravelsystems.com>
* Modified rdcatch(8) to use the new-style CAE commands for play-out
events.

76
rdcatchd/rdcatchd.cpp
View File

@ -142,7 +142,7 @@ MainObject::MainObject(QObject *parent)
catch_playout_status[i]=false; catch_playout_status[i]=false;
catch_playout_event_id[i]=-1; catch_playout_event_id[i]=-1;
catch_playout_id[i]=0; catch_playout_id[i]=0;
catch_playout_handle[i]=-1; catch_playout_serials[i]=-1;
catch_monitor_port[i]=-1; catch_monitor_port[i]=-1;
catch_monitor_state[i]=false; catch_monitor_state[i]=false;
catch_record_pending_cartnum[i]=0; catch_record_pending_cartnum[i]=0;
@ -207,8 +207,6 @@ MainObject::MainObject(QObject *parent)
// //
// CAE Connection // CAE Connection
// //
connect(rda->cae(),SIGNAL(isConnected(bool)),
this,SLOT(caeConnectedData(bool)));
connect(rda->cae(),SIGNAL(recordLoaded(int,int)), connect(rda->cae(),SIGNAL(recordLoaded(int,int)),
this,SLOT(recordLoadedData(int,int))); this,SLOT(recordLoadedData(int,int)));
connect(rda->cae(),SIGNAL(recording(int,int)), connect(rda->cae(),SIGNAL(recording(int,int)),
@ -217,14 +215,8 @@ MainObject::MainObject(QObject *parent)
this,SLOT(recordStoppedData(int,int))); this,SLOT(recordStoppedData(int,int)));
connect(rda->cae(),SIGNAL(recordUnloaded(int,int,unsigned)), connect(rda->cae(),SIGNAL(recordUnloaded(int,int,unsigned)),
this,SLOT(recordUnloadedData(int,int,unsigned))); this,SLOT(recordUnloadedData(int,int,unsigned)));
connect(rda->cae(),SIGNAL(playLoaded(int)), connect(rda->cae(),SIGNAL(playbackStopped(int)),
this,SLOT(playLoadedData(int))); this,SLOT(playbackStoppedData(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)));
rda->syslog(LOG_DEBUG,"starting CAE connection"); rda->syslog(LOG_DEBUG,"starting CAE connection");
rda->cae()->connectToHost(); rda->cae()->connectToHost();
@ -395,7 +387,8 @@ void MainObject::catchEventReceivedData(RDCatchEvent *evt)
if((evt->deckChannel()>128)&&(evt->deckChannel()<(MAX_DECKS+129))) { if((evt->deckChannel()>128)&&(evt->deckChannel()<(MAX_DECKS+129))) {
switch(catch_playout_deck_status[evt->deckChannel()-129]) { switch(catch_playout_deck_status[evt->deckChannel()-129]) {
case RDDeck::Recording: case RDDeck::Recording:
// rda->cae()->stopPlay(catch_playout_handle[evt->deckChannel()-129]); rda->cae()->stopPlayback(catch_playout_serials[evt->deckChannel()-129]);
playbackStoppedData(catch_playout_serials[evt->deckChannel()-129]);
break; break;
default: default:
@ -942,9 +935,11 @@ void MainObject::recordUnloadedData(int card,int stream,unsigned msecs)
} }
void MainObject::playLoadedData(int handle) void MainObject::playStartedData(int serial)
{ {
int deck=GetPlayoutDeck(handle); int deck=GetPlayoutDeck(serial);
int event=GetEvent(catch_playout_id[deck-129]);
catch_playout_deck_status[deck-129]=RDDeck::Ready; catch_playout_deck_status[deck-129]=RDDeck::Ready;
SendEventResponse(deck,catch_playout_deck_status[deck-129], SendEventResponse(deck,catch_playout_deck_status[deck-129],
catch_playout_id[deck-129],""); catch_playout_id[deck-129],"");
@ -953,18 +948,12 @@ void MainObject::playLoadedData(int handle)
catch_playout_card[deck-129], catch_playout_card[deck-129],
catch_playout_stream[deck-129]); catch_playout_stream[deck-129]);
} }
}
void MainObject::playingData(int handle)
{
int deck=GetPlayoutDeck(handle);
int event=GetEvent(catch_playout_id[deck-129]);
catch_playout_deck_status[deck-129]=RDDeck::Recording; catch_playout_deck_status[deck-129]=RDDeck::Recording;
WriteExitCode(event,RDRecording::PlayActive); WriteExitCode(event,RDRecording::PlayActive);
SendEventResponse(deck,catch_playout_deck_status[deck-129], SendEventResponse(deck,catch_playout_deck_status[deck-129],
catch_playout_id[deck-129],""); catch_playout_id[deck-129],"");
catch_playout_status[GetPlayoutDeck(handle)]=true; catch_playout_status[deck]=true;
if(debug) { if(debug) {
printf("Playing - Card: %d Stream: %d\n", printf("Playing - Card: %d Stream: %d\n",
catch_playout_card[deck-129], catch_playout_card[deck-129],
@ -973,9 +962,10 @@ void MainObject::playingData(int handle)
} }
void MainObject::playStoppedData(int handle) void MainObject::playbackStoppedData(int serial)
{ {
int deck=GetPlayoutDeck(handle); int deck=GetPlayoutDeck(serial);
int event=GetEvent(catch_playout_id[deck-129]);
catch_playout_status[deck-129]=false; catch_playout_status[deck-129]=false;
catch_playout_event_player[deck-129]->stop(); catch_playout_event_player[deck-129]->stop();
@ -986,15 +976,6 @@ void MainObject::playStoppedData(int handle)
catch_playout_card[deck-129], catch_playout_card[deck-129],
catch_playout_stream[deck-129]); catch_playout_stream[deck-129]);
} }
// rda->cae()->unloadPlay(handle);
}
void MainObject::playUnloadedData(int handle)
{
int deck=GetPlayoutDeck(handle);
int event=GetEvent(catch_playout_id[deck-129]);
rda->syslog(LOG_INFO,"play complete: cut %s", rda->syslog(LOG_INFO,"play complete: cut %s",
(const char *)catch_playout_name[deck-129].toUtf8()); (const char *)catch_playout_name[deck-129].toUtf8());
catch_playout_deck_status[deck-129]=RDDeck::Idle; catch_playout_deck_status[deck-129]=RDDeck::Idle;
@ -1065,7 +1046,6 @@ void MainObject::eventFinishedData(int id)
return; return;
} }
catch_events[event].setStatus(RDDeck::Idle); catch_events[event].setStatus(RDDeck::Idle);
rda->syslog(LOG_NOTICE,"HERE1");
SendEventResponse(0,RDDeck::Idle,catch_macro_event_id[id],""); SendEventResponse(0,RDDeck::Idle,catch_macro_event_id[id],"");
if(catch_events[event].oneShot()) { if(catch_events[event].oneShot()) {
PurgeEvent(event); PurgeEvent(event);
@ -1305,7 +1285,6 @@ bool MainObject::StartRecording(int event)
void MainObject::StartPlayout(int event) void MainObject::StartPlayout(int event)
{ {
/*
unsigned deck=catch_events[event].channel(); unsigned deck=catch_events[event].channel();
if((catch_playout_card[deck-129]<0)) { if((catch_playout_card[deck-129]<0)) {
rda->syslog(LOG_WARNING, "invalid audio device for deck: %d, event: %d", rda->syslog(LOG_WARNING, "invalid audio device for deck: %d, event: %d",
@ -1333,22 +1312,21 @@ void MainObject::StartPlayout(int event)
// Start the playout // Start the playout
// //
catch_playout_event_player[deck-129]->load(catch_events[event].cutName()); catch_playout_event_player[deck-129]->load(catch_events[event].cutName());
rda->cae()->loadPlay(catch_playout_card[deck-129], /*
catch_events[event].cutName(),
&catch_playout_stream[deck-129],
&catch_playout_handle[deck-129]);
rda->cae()->setOutputPort(catch_playout_card[deck-129],
catch_playout_stream[deck-129],
catch_playout_port[deck-129]);
rda->cae()->positionPlay(catch_playout_handle[deck-129],start);
catch_playout_event_player[deck-129]->start(start); catch_playout_event_player[deck-129]->start(start);
rda->cae()-> */
play(catch_playout_handle[deck-129],end-start,RD_TIMESCALE_DIVISOR,0); catch_playout_serials[deck-129]=
rda->cae()->startPlayback(catch_events[event].cutName(),
catch_playout_card[deck-129],
catch_playout_port[deck-129],
start,
end, // FIXME: this parameter does nothing!
RD_TIMESCALE_DIVISOR);
rda->cae()->setPlayPortActive(catch_playout_card[deck-129], rda->cae()->setPlayPortActive(catch_playout_card[deck-129],
catch_playout_port[deck-129], catch_playout_port[deck-129],
catch_playout_stream[deck-129]); catch_playout_stream[deck-129]);
catch_events[event].setStatus(RDDeck::Recording); catch_events[event].setStatus(RDDeck::Recording);
playStartedData(catch_playout_serials[deck-129]);
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"playout started: deck: %d, event %d card %d, stream %d , cut=%s", "playout started: deck: %d, event %d card %d, stream %d , cut=%s",
deck,catch_events[event].id(), deck,catch_events[event].id(),
@ -1361,7 +1339,6 @@ void MainObject::StartPlayout(int event)
// //
catch_playout_name[deck-129]=catch_events[event].cutName(); catch_playout_name[deck-129]=catch_events[event].cutName();
catch_playout_event_id[deck-129]=event; catch_playout_event_id[deck-129]=event;
*/
} }
@ -1462,6 +1439,9 @@ bool MainObject::ExecuteMacroCart(RDCart *cart,int id,int event)
void MainObject::SendEventResponse(int chan,RDDeck::Status status,int id, void MainObject::SendEventResponse(int chan,RDDeck::Status status,int id,
const QString &cutname) const QString &cutname)
{ {
rda->syslog(LOG_NOTICE,"SendEventResponse(%d,%u,%d,\"%s\")",
chan,status,id,cutname.toUtf8().constData());
RDCatchEvent *evt=new RDCatchEvent(); RDCatchEvent *evt=new RDCatchEvent();
evt->setOperation(RDCatchEvent::DeckStatusResponseOp); evt->setOperation(RDCatchEvent::DeckStatusResponseOp);
@ -1800,10 +1780,10 @@ int MainObject::GetRecordDeck(int card,int stream)
} }
int MainObject::GetPlayoutDeck(int handle) int MainObject::GetPlayoutDeck(int serial) const
{ {
for(int i=0;i<MAX_DECKS;i++) { for(int i=0;i<MAX_DECKS;i++) {
if(catch_playout_handle[i]==handle) { if(catch_playout_serials[i]==serial) {
return i+129; return i+129;
} }
} }

18
rdcatchd/rdcatchd.h
View File

@ -2,7 +2,7 @@
// //
// The Rivendell Netcatcher. // The Rivendell Netcatcher.
// //
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -70,10 +70,12 @@ class MainObject : public QObject
void recordingData(int card,int stream); void recordingData(int card,int stream);
void recordStoppedData(int card,int stream); void recordStoppedData(int card,int stream);
void recordUnloadedData(int card,int stream,unsigned msecs); void recordUnloadedData(int card,int stream,unsigned msecs);
void playLoadedData(int handle); // void playLoadedData(int handle);
void playingData(int handle); // void playingData(int handle);
void playStoppedData(int handle); void playStartedData(int serial);
void playUnloadedData(int handle); // void playStoppedData(int handle);
void playbackStoppedData(int serial);
// void playUnloadedData(int handle);
void runCartData(int chan,int number,unsigned cartnum); void runCartData(int chan,int number,unsigned cartnum);
void meterData(); void meterData();
void eventFinishedData(int id); void eventFinishedData(int id);
@ -86,7 +88,6 @@ class MainObject : public QObject
// //
// batch.cpp // batch.cpp
// //
// void catchConnectedData(int serial,bool state);
void userChangedData(); void userChangedData();
void exitData(); void exitData();
@ -123,7 +124,7 @@ class MainObject : public QObject
void LoadEvent(RDSqlQuery *q,CatchEvent *e,bool add); void LoadEvent(RDSqlQuery *q,CatchEvent *e,bool add);
void LoadDeckList(); void LoadDeckList();
int GetRecordDeck(int card,int stream); int GetRecordDeck(int card,int stream);
int GetPlayoutDeck(int handle); int GetPlayoutDeck(int serial) const;
int GetFreeEvent(); int GetFreeEvent();
bool AddEvent(int id); bool AddEvent(int id);
void RemoveEvent(int id); void RemoveEvent(int id);
@ -177,7 +178,8 @@ class MainObject : public QObject
int catch_playout_card[MAX_DECKS]; int catch_playout_card[MAX_DECKS];
int catch_playout_stream[MAX_DECKS]; int catch_playout_stream[MAX_DECKS];
int catch_playout_port[MAX_DECKS]; int catch_playout_port[MAX_DECKS];
int catch_playout_handle[MAX_DECKS]; // int catch_playout_handle[MAX_DECKS];
int catch_playout_serials[MAX_DECKS];
RDDeck::Status catch_playout_deck_status[MAX_DECKS]; RDDeck::Status catch_playout_deck_status[MAX_DECKS];
int catch_playout_event_id[MAX_DECKS]; int catch_playout_event_id[MAX_DECKS];
int catch_playout_id[MAX_DECKS]; int catch_playout_id[MAX_DECKS];

6
ripcd/ripcd.cpp
View File

@ -633,7 +633,8 @@ bool MainObject::DispatchCommand(RipcdConnection *conn)
if(f0.at(0)=="NOTIFY") { if(f0.at(0)=="NOTIFY") {
RDNotification *notify=new RDNotification(); RDNotification *notify=new RDNotification();
if(!notify->read(msg)) { if(!notify->read(msg)) {
rda->syslog(LOG_INFO,"invalid notification processed"); rda->syslog(LOG_INFO,"invalid notification received: \"%s\"",
msg.toUtf8().constData());
delete notify; delete notify;
return true; return true;
} }
@ -651,7 +652,8 @@ bool MainObject::DispatchCommand(RipcdConnection *conn)
if(f0.at(0)=="CATCH") { if(f0.at(0)=="CATCH") {
RDCatchEvent *evt=new RDCatchEvent(); RDCatchEvent *evt=new RDCatchEvent();
if(!evt->read(msg)) { if(!evt->read(msg)) {
rda->syslog(LOG_INFO,"invalid catch event processed"); rda->syslog(LOG_INFO,"invalid catch event received: \"%s\"",
msg.toUtf8().constData());
delete evt; delete evt;
return true; return true;
} }