Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2019-01-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in log rendering that caused custom transitions
	to be rendered as a PLAY transition.
This commit is contained in:
Fred Gleason
2019-01-17 18:07:51 -05:00
parent 021d9ff5df
commit 08ffd57eca
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -18398,3 +18398,6 @@
* Changed the alpha warning in 'README' to a beta warning. * Changed the alpha warning in 'README' to a beta warning.
* Updated 'UPGRADING'. * Updated 'UPGRADING'.
* Incremented the package version to 3.0.0beta00. * Incremented the package version to 3.0.0beta00.
2019-01-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in log rendering that caused custom transitions
to be rendered as a PLAY transition.

31
lib/rdrenderer.cpp
View File

@@ -38,10 +38,6 @@ __RDRenderLogLine::__RDRenderLogLine(RDLogLine *ll,unsigned chans)
ll_cart=NULL; ll_cart=NULL;
ll_cut=NULL; ll_cut=NULL;
ll_handle=NULL; ll_handle=NULL;
// ll_user=user;
// ll_station=station;
// ll_system=sys;
// ll_config=config;
ll_channels=chans; ll_channels=chans;
ll_ramp_level=0.0; ll_ramp_level=0.0;
ll_ramp_rate=0.0; ll_ramp_rate=0.0;
@@ -92,10 +88,9 @@ void __RDRenderLogLine::setRampRate(double lvl)
void __RDRenderLogLine::setRamp(RDLogLine::TransType next_trans) void __RDRenderLogLine::setRamp(RDLogLine::TransType next_trans)
{ {
if((next_trans==RDLogLine::Segue)&& if((next_trans==RDLogLine::Segue)&&(segueStartPoint()>=0)) {
(ll_cut->segueStartPoint()>=0)&&(ll_cut->segueEndPoint()>=0)) {
ll_ramp_rate=((double)RD_FADE_DEPTH)/ ll_ramp_rate=((double)RD_FADE_DEPTH)/
((double)FramesFromMsec(ll_cut->segueEndPoint()-ll_cut->segueStartPoint())); ((double)FramesFromMsec(segueEndPoint()-segueStartPoint()));
} }
} }
@@ -110,6 +105,10 @@ bool __RDRenderLogLine::open(const QTime &time)
if(ll_cart->exists()&&(ll_cart->type()==RDCart::Audio)) { if(ll_cart->exists()&&(ll_cart->type()==RDCart::Audio)) {
if(ll_cart->selectCut(&cutname,time)) { if(ll_cart->selectCut(&cutname,time)) {
ll_cut=new RDCut(cutname); ll_cut=new RDCut(cutname);
setStartPoint(ll_cut->startPoint(),RDLogLine::CartPointer);
setEndPoint(ll_cut->endPoint(),RDLogLine::CartPointer);
setSegueStartPoint(ll_cut->segueStartPoint(),RDLogLine::CartPointer);
setSegueEndPoint(ll_cut->segueEndPoint(),RDLogLine::CartPointer);
QString filename; QString filename;
if(GetCutFile(cutname,ll_cut->startPoint(),ll_cut->endPoint(), if(GetCutFile(cutname,ll_cut->startPoint(),ll_cut->endPoint(),
&filename)) { &filename)) {
@@ -496,18 +495,18 @@ bool RDRenderer::Render(const QString &outfile,RDLogEvent *log,RDSettings *s,
lls.at(i)->title()+"]"); lls.at(i)->title()+"]");
sf_count_t frames=0; sf_count_t frames=0;
if((lls.at(i+1)->transType()==RDLogLine::Segue)&& if((lls.at(i+1)->transType()==RDLogLine::Segue)&&
(lls.at(i)->cut()->segueStartPoint()>=0)) { (lls.at(i)->segueStartPoint()>=0)) {
frames=FramesFromMsec(lls.at(i)->cut()->segueStartPoint()- frames=FramesFromMsec(lls.at(i)->segueStartPoint()-
lls.at(i)->cut()->startPoint()); lls.at(i)->startPoint());
current_time= current_time=
current_time.addMSecs(lls.at(i)->cut()->segueStartPoint()- current_time.addMSecs(lls.at(i)->segueStartPoint()-
lls.at(i)->cut()->startPoint()); lls.at(i)->startPoint());
} }
else { else {
frames=FramesFromMsec(lls.at(i)->cut()->endPoint()- frames=FramesFromMsec(lls.at(i)->endPoint()-
lls.at(i)->cut()->startPoint()); lls.at(i)->startPoint());
current_time=current_time.addMSecs(lls.at(i)->cut()->endPoint()- current_time=current_time.addMSecs(lls.at(i)->endPoint()-
lls.at(i)->cut()->startPoint()); lls.at(i)->startPoint());
} }
pcm=new float[frames*s->channels()]; pcm=new float[frames*s->channels()];
memset(pcm,0,frames*s->channels()*sizeof(float)); memset(pcm,0,frames*s->channels()*sizeof(float));