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

2022-11-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored rdcatch(1) and rdcatchd(8) to use the notification
	mechanism instead for distributing meter updates instead of the
	'Enable Metering' catch command.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-11-02 13:10:11 -04:00
parent 54d8bd4a10
commit ae3542f9a4
10 changed files with 247 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rdcatchd/rdcatchd.cpp
View File

@@ -526,6 +526,7 @@ void MainObject::catchEventReceivedData(RDCatchEvent *evt)
break;
case RDCatchEvent::DeckEventProcessedOp:
case RDCatchEvent::SendMeterLevelsOp:
case RDCatchEvent::DeckStatusResponseOp:
case RDCatchEvent::SetInputMonitorResponseOp:
case RDCatchEvent::NullOp:
@@ -1152,7 +1153,29 @@ void MainObject::runCartData(int chan,int number,unsigned cartnum)
void MainObject::meterData()
{
short levels[2];
QList<RDCatchMeterLevel> meter_levels;
for(int i=0;i<MAX_DECKS;i++) {
if(catch_record_deck_status[i]==RDDeck::Recording) {
rda->cae()->
inputMeterUpdate(catch_record_card[i],catch_record_stream[i],levels);
meter_levels.push_back(RDCatchMeterLevel(i,levels));
}
if(catch_playout_deck_status[i]==RDDeck::Recording) {
rda->cae()->
outputMeterUpdate(catch_playout_card[i],catch_playout_port[i],levels);
meter_levels.push_back(RDCatchMeterLevel(i+129,levels));
}
}
if(meter_levels.size()>0) {
RDCatchEvent *evt=new RDCatchEvent();
evt->setOperation(RDCatchEvent::SendMeterLevelsOp);
evt->setMeterLevels(meter_levels);
rda->ripc()->sendCatchEvent(evt);
delete evt;
}
/*
for(int i=0;i<MAX_DECKS;i++) {
if(catch_record_deck_status[i]==RDDeck::Recording) {
rda->cae()->inputMeterUpdate(catch_record_card[i],catch_record_stream[i],
@@ -1166,6 +1189,7 @@ void MainObject::meterData()
SendMeterLevel(i+129,levels);
}
}
*/
}