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

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

Browse Source 
* Modified rdcatchd(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-17 10:35:48 -04:00
parent cbe8f583b6
commit d434fad6f8
5 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24461,3 +24461,6 @@
2023-10-16 Fred Gleason <fredg@paravelsystems.com> 2023-10-16 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'end-pos' parameter from the 'Start Playback' CAE * Removed the 'end-pos' parameter from the 'Start Playback' CAE
command. command.
2023-10-17 Fred Gleason <fredg@paravelsystems.com>
* Modified rdcatchd(8) to use the new-style CAE commands for play-out
events.

2
cae/cae.cpp
View File

@ -1419,7 +1419,7 @@ void MainObject::updateMeters()
} }
if(dvr->getOutputMeters(i,j,levels)) { if(dvr->getOutputMeters(i,j,levels)) {
SendMeterLevelUpdate("O",i,j,levels); SendMeterLevelUpdate("O",i,j,levels);
} }
} }
dvr->getOutputPosition(i,positions); dvr->getOutputPosition(i,positions);
SendMeterPositionUpdate(i,positions); SendMeterPositionUpdate(i,positions);

2
rdcatch/deckmon.cpp
View File

@ -142,8 +142,6 @@ void DeckMon::enableMonitorButton(bool state)
void DeckMon::processCatchEvent(RDCatchEvent *evt) void DeckMon::processCatchEvent(RDCatchEvent *evt)
{ {
// printf("processCatchEvent(): %s\n",evt->dump().toUtf8().constData());
QList<RDCatchMeterLevel> meter_levels; QList<RDCatchMeterLevel> meter_levels;
if(evt->hostName()==mon_station) { if(evt->hostName()==mon_station) {

37
rdcatchd/rdcatchd.cpp
View File

@ -219,6 +219,18 @@ MainObject::MainObject(QObject *parent)
this,SLOT(playbackStoppedData(int))); this,SLOT(playbackStoppedData(int)));
rda->syslog(LOG_DEBUG,"starting CAE connection"); rda->syslog(LOG_DEBUG,"starting CAE connection");
rda->cae()->connectToHost(); rda->cae()->connectToHost();
QList<int> cards;
sql=QString("select `CARD_NUMBER` from `DECKS` where ")+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"' && "+
"`CARD_NUMBER`>=0";
q=new RDSqlQuery(sql);
while(q->next()) {
if(!cards.contains(q->value(0).toInt())) {
cards.push_back(q->value(0).toInt());
}
}
delete q;
rda->cae()->enableMetering(&cards);
// //
// Sound Initialization // Sound Initialization
@ -804,29 +816,6 @@ void MainObject::engineData(int id)
} }
void MainObject::caeConnectedData(bool state)
{
if(state) {
QList<int> cards;
QString sql=QString("select `CARD_NUMBER` from `DECKS` where ")+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"' && "+
"`CARD_NUMBER`>=0";
RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) {
if(!cards.contains(q->value(0).toInt())) {
cards.push_back(q->value(0).toInt());
}
}
delete q;
rda->cae()->enableMetering(&cards);
}
if(!state) {
rda->syslog(LOG_ERR,"aborting - unable to connect to Core AudioEngine");
exit(1);
}
}
void MainObject::recordLoadedData(int card,int stream) void MainObject::recordLoadedData(int card,int stream)
{ {
int deck=GetRecordDeck(card,stream); int deck=GetRecordDeck(card,stream);
@ -1550,7 +1539,6 @@ void MainObject::LoadEngine(bool adv_day)
rda->syslog(LOG_DEBUG,"rdcatchd engine load starts..."); rda->syslog(LOG_DEBUG,"rdcatchd engine load starts...");
sql=LoadEventSql()+QString(" where `STATION_NAME`='")+ sql=LoadEventSql()+QString(" where `STATION_NAME`='")+
RDEscapeString(rda->station()->name())+"'"; RDEscapeString(rda->station()->name())+"'";
rda->syslog(LOG_NOTICE,"%s",sql.toUtf8().constData());
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
catch_events.push_back(CatchEvent(rda->station(),RDConfiguration())); catch_events.push_back(CatchEvent(rda->station(),RDConfiguration()));
@ -1761,7 +1749,6 @@ void MainObject::LoadDeckList()
catch_playout_deck_status[i]=RDDeck::Recording; catch_playout_deck_status[i]=RDDeck::Recording;
} }
else { else {
// rda->cae()->stopPlay(catch_playout_handle[i]);
catch_playout_deck_status[i]=RDDeck::Offline; catch_playout_deck_status[i]=RDDeck::Offline;
} }
} }

6
rdcatchd/rdcatchd.h
View File

@ -65,17 +65,12 @@ class MainObject : public QObject
void startTimerData(int id); void startTimerData(int id);
void offsetTimerData(int id); void offsetTimerData(int id);
void engineData(int); void engineData(int);
void caeConnectedData(bool state);
void recordLoadedData(int card,int stream); void recordLoadedData(int card,int stream);
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 playingData(int handle);
void playStartedData(int serial); void playStartedData(int serial);
// void playStoppedData(int handle);
void playbackStoppedData(int serial); 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);
@ -178,7 +173,6 @@ 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_serials[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];