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

2023-11-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'RDCae::setOutputPort()' method.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-11-13 17:04:54 -05:00
parent fb8228914f
commit 402e03bb45
11 changed files with 86 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -24473,3 +24473,5 @@
* Fixed a bug in caed(8) that could cause play-outs from different
hosts to cross-talk into each other's outputs when using a shared
caed(8) instance.
2023-11-13 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'RDCae::setOutputPort()' method.

2
lib/librd.pro
View File

@ -147,7 +147,7 @@ SOURCES += rdmacro_event.cpp
SOURCES += rdmacrocartmodel.cpp
SOURCES += rdmainwindow.cpp
SOURCES += rdmarkerdialog.cpp
SOURCES += rdmarkerplayer.cpp
SOURCES += rdmarkerplayer.c[[
SOURCES += rdmarkerreadout.cpp
SOURCES += rdmarkerview.cpp
SOURCES += rdmatrix.cpp

6
lib/rdcae.cpp
View File

@ -315,12 +315,6 @@ void RDCae::setOutputVolume(int card,int stream,int port,int level)
}
void RDCae::setOutputPort(int card,int stream,int port)
{
SendCommand(QString::asprintf("OP %d %d %d 0!",card,stream,port));
}
void RDCae::fadeOutputVolume(int card,int stream,int port,int level,int length)
{
SendCommand(QString().sprintf("FV %d %d %d %d %d!",

1
lib/rdcae.h
View File

@ -57,7 +57,6 @@ class RDCae : public QObject
void setClockSource(int card,RDCae::ClockSource src);
void setInputVolume(int card,int stream,int level);
void setOutputVolume(int card,int stream,int port,int level);
void setOutputPort(int card,int stream,int port);
void fadeOutputVolume(int card,int stream,int port,int level,int length);
void setInputLevel(int card,int port,int level);
void setOutputLevel(int card,int port,int level);

4
lib/rdlogplay.cpp
View File

@ -2058,8 +2058,8 @@ bool RDLogPlay::StartEvent(int line,RDLogLine::TransType trans_type,
if(play_timescaling_available&&logline->enforceLength()) {
logline->setTimescalingActive(true);
}
play_cae->
setOutputPort(playdeck->card(),playdeck->stream(),playdeck->port());
play_cae->setOutputVolume(playdeck->card(),playdeck->stream(),
playdeck->port(),playdeck->cut()->playGain());
if((int)logline->playPosition()>logline->effectiveLength()) {
rda->syslog(LOG_DEBUG,"log engine: *** position out of bounds: Line: %d Cart: %d Pos: %d ***",line,logline->cartNumber(),logline->playPosition());
logline->setPlayPosition(0);

13
lib/rdmarkerplayer.cpp
View File

@ -236,7 +236,6 @@ bool RDMarkerPlayer::setCut(unsigned cartnum,int cutnum)
return false;
}
rda->cae()->positionPlay(d_cae_handle,0);
rda->cae()->setOutputPort(d_cards.first(),d_cae_stream,d_port);
QString sql=QString("select ")+
"`START_POINT`,"+ // 00
@ -377,10 +376,10 @@ void RDMarkerPlayer::buttonPlayData()
}
d_loop_start_msec=d_cursor_position;
d_loop_start_length=0;
rda->cae()->setOutputVolume(d_cards.first(),d_cae_stream,
d_port,0+100*d_play_gain_spin->value());
rda->cae()->play(d_cae_handle,d_loop_start_length,100000,false);
rda->cae()->setPlayPortActive(d_cards.first(),d_port,d_cae_stream);
rda->cae()->setOutputVolume(d_cards.first(),d_cae_stream,
d_port,0+100*d_play_gain_spin->value());
d_meter_timer->start(RD_METER_UPDATE_INTERVAL);
}
@ -397,10 +396,10 @@ void RDMarkerPlayer::buttonPlayFromData()
d_loop_start_msec=d_pointers[d_selected_markers[0]];
rda->cae()->positionPlay(d_cae_handle,d_loop_start_msec);
d_loop_start_length=0;
rda->cae()->setOutputVolume(d_cards.first(),d_cae_stream,d_port,
0+100*d_play_gain_spin->value());
rda->cae()->play(d_cae_handle,d_loop_start_length,100000,false);
rda->cae()->setPlayPortActive(d_cards.first(),d_port,d_cae_stream);
rda->cae()->setOutputVolume(d_cards.first(),d_cae_stream,d_port,
0+100*d_play_gain_spin->value());
d_meter_timer->start(RD_METER_UPDATE_INTERVAL);
}
}
@ -422,10 +421,10 @@ void RDMarkerPlayer::buttonPlayToData()
d_loop_start_length=d_pointers[d_selected_markers[1]];
}
rda->cae()->positionPlay(d_cae_handle,d_loop_start_msec);
rda->cae()->play(d_cae_handle,d_loop_start_length,100000,false);
rda->cae()->setPlayPortActive(d_cards.first(),d_port,d_cae_stream);
rda->cae()->setOutputVolume(d_cards.first(),d_cae_stream,d_port,
0+100*d_play_gain_spin->value());
rda->cae()->play(d_cae_handle,d_loop_start_length,100000,false);
rda->cae()->setPlayPortActive(d_cards.first(),d_port,d_cae_stream);
d_meter_timer->start(RD_METER_UPDATE_INTERVAL);
}
}

4
rdcatch/rdcatch.cpp
View File

@ -713,8 +713,6 @@ void MainWidget::headButtonData()
if(catch_audition_stream<0) {
return;
}
rda->cae()->setOutputPort(catch_audition_card,catch_audition_stream,
catch_audition_port);
rda->cae()->positionPlay(catch_play_handle,cut->startPoint());
rda->cae()->setPlayPortActive(catch_audition_card,catch_audition_port,
catch_audition_stream);
@ -744,8 +742,6 @@ void MainWidget::tailButtonData()
if(catch_audition_stream<0) {
return;
}
rda->cae()->setOutputPort(catch_audition_card,catch_audition_stream,
catch_audition_port);
if((cut->endPoint()-cut->startPoint()-RDCATCH_AUDITION_LENGTH)>0) {
rda->cae()->positionPlay(catch_play_handle,
cut->endPoint()-RDCATCH_AUDITION_LENGTH);

13
rdcatchd/catch_event.cpp
View File

@ -90,6 +90,18 @@ void CatchEvent::setCutName(const QString &str)
}
int CatchEvent::playGain() const
{
return catch_play_gain;
}
void CatchEvent::setPlayGain(int lvl)
{
catch_play_gain=lvl;
}
QString CatchEvent::tempName() const
{
return catch_temp_name;
@ -686,6 +698,7 @@ void CatchEvent::clear()
catch_type=RDRecording::Recording;
catch_channel=0;
catch_cut_name="";
catch_play_gain=0;
catch_temp_name="";
catch_delete_temp_file=false;
for(int i=0;i<7;i++) {

3
rdcatchd/catch_event.h
View File

@ -43,6 +43,8 @@ class CatchEvent
void setChannel(unsigned chan);
QString cutName() const;
void setCutName(const QString &str);
int playGain() const;
void setPlayGain(int lvl);
QString tempName() const;
void setTempName(const QString &str);
bool deleteTempFile() const;
@ -148,6 +150,7 @@ class CatchEvent
RDRecording::Type catch_type;
unsigned catch_channel;
QString catch_cut_name;
int catch_play_gain;
QString catch_temp_name;
bool catch_delete_temp_file;
bool catch_day_of_week[7];

110
rdcatchd/rdcatchd.cpp
View File

@ -1338,9 +1338,10 @@ void MainObject::StartPlayout(int event)
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()->setOutputVolume(catch_playout_card[deck-129],
catch_playout_stream[deck-129],
catch_playout_port[deck-129],
catch_events[event].playGain());
rda->cae()->positionPlay(catch_playout_handle[deck-129],start);
catch_playout_event_player[deck-129]->start(start);
rda->cae()->
@ -1585,56 +1586,58 @@ void MainObject::LoadEngine(bool adv_day)
QString MainObject::LoadEventSql()
{
return QString("select ")+
"`ID`,"+ // 00
"`IS_ACTIVE`,"+ // 01
"`TYPE`,"+ // 02
"`CHANNEL`,"+ // 03
"`CUT_NAME`,"+ // 04
"`SUN`,"+ // 05
"`MON`,"+ // 06
"`TUE`,"+ // 07
"`WED`,"+ // 08
"`THU`,"+ // 09
"`FRI`,"+ // 10
"`SAT`,"+ // 11
"`START_TIME`,"+ // 12
"`LENGTH`,"+ // 13
"`START_GPI`,"+ // 14
"`END_GPI`,"+ // 15
"`TRIM_THRESHOLD`,"+ // 16
"`STARTDATE_OFFSET`,"+ // 17
"`ENDDATE_OFFSET`,"+ // 18
"`FORMAT`," // 19
"`CHANNELS`,"+ // 20
"`SAMPRATE`,"+ // 21
"`BITRATE`,"+ // 22
"`MACRO_CART`,"+ // 23
"`SWITCH_INPUT`,"+ // 24
"`SWITCH_OUTPUT`,"+ // 25
"`ONE_SHOT`,"+ // 26
"`START_TYPE`,"+ // 27
"`START_LENGTH`,"+ // 28
"`START_MATRIX`,"+ // 29
"`START_LINE`,"+ // 30
"`START_OFFSET`,"+ // 31
"`END_TYPE`,"+ // 32
"`END_TIME`,"+ // 33
"`END_LENGTH`,"+ // 34
"`END_MATRIX`,"+ // 35
"`END_LINE`,"+ // 36
"`URL`,"+ // 37
"`URL_USERNAME`,"+ // 38
"`URL_PASSWORD`,"+ // 39
"`URL_USE_ID_FILE`,"+ // 40
"`QUALITY`,"+ // 40
"`NORMALIZE_LEVEL`,"+ // 41
"`ALLOW_MULT_RECS`,"+ // 42
"`MAX_GPI_REC_LENGTH`,"+ // 43
"`DESCRIPTION`,"+ // 44
"`FEED_ID`,"+ // 45
"`EVENTDATE_OFFSET`,"+ // 46
"`ENABLE_METADATA` "+ // 47
"from `RECORDINGS`";
"`RECORDINGS`.`ID`,"+ // 00
"`RECORDINGS`.`IS_ACTIVE`,"+ // 01
"`RECORDINGS`.`TYPE`,"+ // 02
"`RECORDINGS`.`CHANNEL`,"+ // 03
"`RECORDINGS`.`CUT_NAME`,"+ // 04
"`RECORDINGS`.`SUN`,"+ // 05
"`RECORDINGS`.`MON`,"+ // 06
"`RECORDINGS`.`TUE`,"+ // 07
"`RECORDINGS`.`WED`,"+ // 08
"`RECORDINGS`.`THU`,"+ // 09
"`RECORDINGS`.`FRI`,"+ // 10
"`RECORDINGS`.`SAT`,"+ // 11
"`RECORDINGS`.`START_TIME`,"+ // 12
"`RECORDINGS`.`LENGTH`,"+ // 13
"`RECORDINGS`.`START_GPI`,"+ // 14
"`RECORDINGS`.`END_GPI`,"+ // 15
"`RECORDINGS`.`TRIM_THRESHOLD`,"+ // 16
"`RECORDINGS`.`STARTDATE_OFFSET`,"+ // 17
"`RECORDINGS`.`ENDDATE_OFFSET`,"+ // 18
"`RECORDINGS`.`FORMAT`," // 19
"`RECORDINGS`.`CHANNELS`,"+ // 20
"`RECORDINGS`.`SAMPRATE`,"+ // 21
"`RECORDINGS`.`BITRATE`,"+ // 22
"`RECORDINGS`.`MACRO_CART`,"+ // 23
"`RECORDINGS`.`SWITCH_INPUT`,"+ // 24
"`RECORDINGS`.`SWITCH_OUTPUT`,"+ // 25
"`RECORDINGS`.`ONE_SHOT`,"+ // 26
"`RECORDINGS`.`START_TYPE`,"+ // 27
"`RECORDINGS`.`START_LENGTH`,"+ // 28
"`RECORDINGS`.`START_MATRIX`,"+ // 29
"`RECORDINGS`.`START_LINE`,"+ // 30
"`RECORDINGS`.`START_OFFSET`,"+ // 31
"`RECORDINGS`.`END_TYPE`,"+ // 32
"`RECORDINGS`.`END_TIME`,"+ // 33
"`RECORDINGS`.`END_LENGTH`,"+ // 34
"`RECORDINGS`.`END_MATRIX`,"+ // 35
"`RECORDINGS`.`END_LINE`,"+ // 36
"`RECORDINGS`.`URL`,"+ // 37
"`RECORDINGS`.`URL_USERNAME`,"+ // 38
"`RECORDINGS`.`URL_PASSWORD`,"+ // 39
"`RECORDINGS`.`URL_USE_ID_FILE`,"+ // 40
"`RECORDINGS`.`QUALITY`,"+ // 41
"`RECORDINGS`.`NORMALIZE_LEVEL`,"+ // 42
"`RECORDINGS`.`ALLOW_MULT_RECS`,"+ // 43
"`RECORDINGS`.`MAX_GPI_REC_LENGTH`,"+ // 44
"`RECORDINGS`.`DESCRIPTION`,"+ // 45
"`RECORDINGS`.`FEED_ID`,"+ // 46
"`RECORDINGS`.`EVENTDATE_OFFSET`,"+ // 47
"`RECORDINGS`.`ENABLE_METADATA`,"+ // 48
"`CUTS`.`PLAY_GAIN` "+ // 49
"from `RECORDINGS` left join `CUTS` "+
"on `RECORDINGS`.`CUT_NAME`=`CUTS`.`CUT_NAME` ";
}
@ -1690,6 +1693,7 @@ void MainObject::LoadEvent(RDSqlQuery *q,CatchEvent *e,bool add)
e->setDescription(q->value(45).toString());
e->setEventdateOffset(q->value(47).toInt());
e->setEnableMetadata(RDBool(q->value(48).toString()));
e->setPlayGain(q->value(49).toInt());
if(add) {
if(e->startType()==RDRecording::GpiStart) {

4
rdlibrary/record_cut.cpp
View File

@ -655,9 +655,9 @@ void RecordCut::playData()
if((!is_recording)&&(!is_playing)&&(!is_ready)) { // Start Play
rda->cae()->loadPlay(rec_card_no[1],rec_cut->cutName(),
&rec_stream_no[1],&rec_play_handle);
rda->cae()->setOutputPort(rec_card_no[1],rec_stream_no[1],rec_port_no[1]);
rda->cae()->positionPlay(rec_play_handle,start);
rda->cae()->setPlayPortActive(rec_card_no[1],rec_port_no[1],rec_stream_no[1]);
rda->cae()->
setPlayPortActive(rec_card_no[1],rec_port_no[1],rec_stream_no[1]);
rda->cae()->setOutputVolume(rec_card_no[1],rec_stream_no[1],rec_port_no[1],
0+rec_cut->playGain());
rda->cae()->play(rec_play_handle,end-start,RD_TIMESCALE_DIVISOR,false);