Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-23 09:18:34 +02:00
Code Issues Projects Releases Wiki Activity

2020-06-09 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in RDRenderer that caused segue transitions to
	be rendered without regard to the 'No Fade on Segue Out' checkbox
	in the 'Edit Audio' dialog.
This commit is contained in:
Fred Gleason 2020-06-09 15:18:51 -04:00
parent 96b3dd34bd
commit 4840b75f56
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -19880,3 +19880,7 @@
* Fixed a bug in rdadmin(1) that made it impossible to enter * Fixed a bug in rdadmin(1) that made it impossible to enter
useful strings in the 'WaveForm Caption' control on the useful strings in the 'WaveForm Caption' control on the
'Edit RDLogEdit' dialog. 'Edit RDLogEdit' dialog.
2020-06-09 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in RDRenderer that caused segue transitions to
be rendered without regard to the 'No Fade on Segue Out' checkbox
in the 'Edit Audio' dialog.

11
lib/rdrenderer.cpp
View File

@ -2,7 +2,7 @@
// //
// Render a Rivendell log to a single audio object. // Render a Rivendell log to a single audio object.
// //
// (C) Copyright 2017-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2017-2020 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
@ -86,11 +86,13 @@ void __RDRenderLogLine::setRampRate(double lvl)
} }
void __RDRenderLogLine::setRamp(RDLogLine::TransType next_trans) void __RDRenderLogLine::setRamp(RDLogLine::TransType next_trans,int segue_gain)
{ {
if((next_trans==RDLogLine::Segue)&&(segueStartPoint()>=0)) { if((next_trans==RDLogLine::Segue)&&(segueStartPoint()>=0)) {
ll_ramp_rate=((double)RD_FADE_DEPTH)/ ll_ramp_rate=((double)segue_gain)/
((double)FramesFromMsec(segueEndPoint()-segueStartPoint())); ((double)FramesFromMsec(segueEndPoint()-segueStartPoint()));
//ll_ramp_rate=((double)RD_FADE_DEPTH)/
// ((double)FramesFromMsec(segueEndPoint()-segueStartPoint()));
} }
} }
@ -109,6 +111,7 @@ bool __RDRenderLogLine::open(const QTime &time)
setEndPoint(ll_cut->endPoint(),RDLogLine::CartPointer); setEndPoint(ll_cut->endPoint(),RDLogLine::CartPointer);
setSegueStartPoint(ll_cut->segueStartPoint(),RDLogLine::CartPointer); setSegueStartPoint(ll_cut->segueStartPoint(),RDLogLine::CartPointer);
setSegueEndPoint(ll_cut->segueEndPoint(),RDLogLine::CartPointer); setSegueEndPoint(ll_cut->segueEndPoint(),RDLogLine::CartPointer);
setSegueGain(ll_cut->segueGain());
QString filename; QString filename;
if(GetCutFile(cutname,ll_cut->startPoint(),ll_cut->endPoint(), if(GetCutFile(cutname,ll_cut->startPoint(),ll_cut->endPoint(),
&filename)) { &filename)) {
@ -528,7 +531,7 @@ bool RDRenderer::Render(const QString &outfile,RDLogEvent *log,RDSettings *s,
sf_writef_float(sf_out,pcm,frames); sf_writef_float(sf_out,pcm,frames);
delete pcm; delete pcm;
pcm=NULL; pcm=NULL;
lls.at(i)->setRamp(lls.at(i+1)->transType()); lls.at(i)->setRamp(lls.at(i+1)->transType(),lls.at(i)->segueGain());
} }
else { else {
if(i<(lls.size()-1)) { if(i<(lls.size()-1)) {

2
lib/rdrenderer.h
View File

@ -42,7 +42,7 @@ class __RDRenderLogLine : public RDLogLine
void setRampLevel(double lvl); void setRampLevel(double lvl);
double rampRate() const; double rampRate() const;
void setRampRate(double lvl); void setRampRate(double lvl);
void setRamp(RDLogLine::TransType next_trans); void setRamp(RDLogLine::TransType next_trans,int segue_gain);
bool open(const QTime &time); bool open(const QTime &time);
void close(); void close();
QString summary() const; QString summary() const;