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

2020-12-27 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'RDLogEvent' class.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-12-27 17:20:58 -05:00
parent b72b9f08c2
commit ca7ead3ea3
37 changed files with 357 additions and 2231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
utils/rdclilogedit/operations.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2020 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@@ -27,62 +27,62 @@
void MainObject::Addcart(int line,unsigned cartnum)
{
if(line>edit_log_event->size()) {
line=edit_log_event->size();
if(line>edit_log_model->lineCount()) {
line=edit_log_model->lineCount();
}
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->
edit_log_model->insert(line,1);
edit_log_model->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType());
edit_log_event->logLine(line)->setFadeupGain(-3000);
edit_log_event->logLine(line)->setFadedownGain(-3000);
edit_log_event->logLine(line)->setCartNumber(cartnum);
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setFadeupGain(-3000);
edit_log_model->logLine(line)->setFadedownGain(-3000);
edit_log_model->logLine(line)->setCartNumber(cartnum);
edit_log_model->refresh(line);
edit_modified=true;
}
void MainObject::Addchain(int line,const QString &logname)
{
if(line>edit_log_event->size()) {
line=edit_log_event->size();
if(line>edit_log_model->lineCount()) {
line=edit_log_model->lineCount();
}
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Chain);
edit_log_event->logLine(line)->
edit_log_model->insert(line,1);
edit_log_model->logLine(line)->setType(RDLogLine::Chain);
edit_log_model->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType());
edit_log_event->logLine(line)->setMarkerLabel(logname);
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setMarkerLabel(logname);
edit_log_model->refresh(line);
edit_modified=true;
}
void MainObject::Addmarker(int line)
{
if(line>edit_log_event->size()) {
line=edit_log_event->size();
if(line>edit_log_model->lineCount()) {
line=edit_log_model->lineCount();
}
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Marker);
edit_log_event->logLine(line)->
edit_log_model->insert(line,1);
edit_log_model->logLine(line)->setType(RDLogLine::Marker);
edit_log_model->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType());
edit_log_event->logLine(line)->setMarkerLabel(tr("Label"));
edit_log_event->logLine(line)->setMarkerComment(tr("Marker Comment"));
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setMarkerLabel(tr("Label"));
edit_log_model->logLine(line)->setMarkerComment(tr("Marker Comment"));
edit_log_model->refresh(line);
edit_modified=true;
}
void MainObject::Addtrack(int line)
{
if(line>edit_log_event->size()) {
line=edit_log_event->size();
if(line>edit_log_model->lineCount()) {
line=edit_log_model->lineCount();
}
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Track);
edit_log_event->logLine(line)->
edit_log_model->insert(line,1);
edit_log_model->logLine(line)->setType(RDLogLine::Track);
edit_log_model->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType());
edit_log_event->logLine(line)->setMarkerComment(tr("Voice Track"));
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setMarkerComment(tr("Voice Track"));
edit_log_model->refresh(line);
edit_modified=true;
}
@@ -171,10 +171,10 @@ void MainObject::Header() const
void MainObject::List()
{
for(int i=0;i<edit_log_event->size();i++) {
printf("%4d %s\n",i,(const char *)ListLine(edit_log_event,i));
for(int i=0;i<edit_log_model->lineCount();i++) {
printf("%4d %s\n",i,(const char *)ListLine(edit_log_model,i));
}
printf("%4d --- end of log ---\n",edit_log_event->size());
printf("%4d --- end of log ---\n",edit_log_model->lineCount());
}
@@ -215,9 +215,9 @@ void MainObject::Load(QString logname)
delete edit_log;
edit_log=NULL;
}
if(edit_log_event!=NULL) {
delete edit_log_event;
edit_log_event=NULL;
if(edit_log_model!=NULL) {
delete edit_log_model;
edit_log_model=NULL;
}
if(edit_log_lock!=NULL) {
delete edit_log_lock;
@@ -250,8 +250,8 @@ void MainObject::Load(QString logname)
edit_log=new RDLog(logname);
if(edit_log->exists()) {
edit_log_event=new RDLogEvent(logname);
edit_log_event->load();
edit_log_model=new RDLogModel(logname,false,this);
edit_log_model->load();
edit_description=edit_log->description();
edit_service=edit_log->service();
edit_start_date=edit_log->startDate();
@@ -268,10 +268,10 @@ void MainObject::Load(QString logname)
}
QString MainObject::ListLine(RDLogEvent *evt,int line) const
QString MainObject::ListLine(RDLogModel *model,int line) const
{
QString ret="";
RDLogLine *logline=evt->logLine(line);
RDLogLine *logline=model->logLine(line);
switch(logline->timeType()) {
case RDLogLine::Hard:
@@ -282,7 +282,7 @@ QString MainObject::ListLine(RDLogEvent *evt,int line) const
case RDLogLine::Relative:
ret+=QString().
sprintf(" %s ",(const char *)evt->blockStartTime(line).
sprintf(" %s ",(const char *)model->blockStartTime(line).
toString("hh:mm:ss"));
break;
@@ -354,15 +354,15 @@ void MainObject::New(const QString &logname)
if(edit_log!=NULL) {
delete edit_log;
}
if(edit_log_event!=NULL) {
delete edit_log_event;
if(edit_log_model!=NULL) {
delete edit_log_model;
}
if(edit_log_lock!=NULL) {
delete edit_log_lock;
}
edit_log=new RDLog(logname);
if(!edit_log->exists()) {
edit_log_event=new RDLogEvent(logname);
edit_log_model=new RDLogModel(logname,false,this);
edit_description=logname+" log";
sql=QString("select NAME from SERVICES");
q=new RDSqlQuery(sql);
@@ -391,14 +391,14 @@ void MainObject::New(const QString &logname)
void MainObject::Remove(int line)
{
edit_log_event->remove(line,1);
edit_log_model->remove(line,1);
edit_modified=true;
}
void MainObject::Save()
{
edit_log_event->save(rda->config());
edit_log_model->save(rda->config());
edit_log->setDescription(edit_description);
edit_log->setStartDate(edit_start_date);
edit_log->setEndDate(edit_end_date);
@@ -434,8 +434,8 @@ void MainObject::Saveas(const QString &logname)
"SERVICE=\""+RDEscapeString(edit_service)+"\"";
q=new RDSqlQuery(sql);
delete q;
edit_log_event->setLogName(logname);
edit_log_event->save(rda->config());
edit_log_model->setLogName(logname);
edit_log_model->save(rda->config());
delete edit_log;
edit_log=log;
edit_modified=false;
@@ -457,12 +457,12 @@ void MainObject::Setautorefresh(bool state)
void MainObject::Setcart(int line,unsigned cartnum)
{
RDLogLine *logline=edit_log_event->logLine(line);
RDLogLine *logline=edit_log_model->logLine(line);
if(logline!=NULL) {
if((logline->type()==RDLogLine::Cart)||
(logline->type()==RDLogLine::Macro)) {
logline->setCartNumber(cartnum);
edit_log_event->refresh(line);
edit_log_model->refresh(line);
edit_modified=true;
}
else {
@@ -477,12 +477,12 @@ void MainObject::Setcart(int line,unsigned cartnum)
void MainObject::Setcomment(int line,const QString &str)
{
RDLogLine *logline=edit_log_event->logLine(line);
RDLogLine *logline=edit_log_model->logLine(line);
if(logline!=NULL) {
if((logline->type()==RDLogLine::Marker)||
(logline->type()==RDLogLine::Track)) {
logline->setMarkerComment(str);
edit_log_event->refresh(line);
edit_log_model->refresh(line);
edit_modified=true;
}
else {
@@ -511,12 +511,12 @@ void MainObject::Setenddate(const QDate &date)
void MainObject::Setlabel(int line,const QString &str)
{
RDLogLine *logline=edit_log_event->logLine(line);
RDLogLine *logline=edit_log_model->logLine(line);
if(logline!=NULL) {
if((logline->type()==RDLogLine::Chain)||
(logline->type()==RDLogLine::Marker)) {
logline->setMarkerLabel(str);
edit_log_event->refresh(line);
edit_log_model->refresh(line);
edit_modified=true;
}
else {
@@ -553,16 +553,16 @@ void MainObject::Setservice(const QString &str)
void MainObject::Settime(int line,RDLogLine::TimeType type,const QTime &time)
{
edit_log_event->logLine(line)->setTimeType(type);
edit_log_event->logLine(line)->setStartTime(RDLogLine::Logged,time);
edit_log_model->logLine(line)->setTimeType(type);
edit_log_model->logLine(line)->setStartTime(RDLogLine::Logged,time);
edit_modified=true;
}
void MainObject::Settrans(int line,RDLogLine::TransType type)
{
edit_log_event->logLine(line)->setTransType(type);
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setTransType(type);
edit_log_model->refresh(line);
edit_modified=true;
}
@@ -580,9 +580,9 @@ void MainObject::Unload()
delete edit_log;
edit_log=NULL;
}
if(edit_log_event!=NULL) {
delete edit_log_event;
edit_log_event=NULL;
if(edit_log_model!=NULL) {
delete edit_log_model;
edit_log_model=NULL;
}
if(edit_log_lock!=NULL) {
delete edit_log_lock;

16
utils/rdclilogedit/parser.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2020 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@@ -124,7 +124,7 @@ void MainObject::DispatchCommand(QString cmd)
//
// These need a log loaded
//
if((processed)||(edit_log_event!=NULL)) {
if((processed)||(edit_log_model!=NULL)) {
if(verb=="addcart") {
if(rda->user()->addtoLog()) {
if(cmds.size()==3) {
@@ -229,7 +229,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->removefromLog()) {
if(cmds.size()==2) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
Remove(line);
}
else {
@@ -306,7 +306,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
unsigned cartnum=cmds[2].toUInt(&ok);
if(ok&&(cartnum<=RD_MAX_CART_NUMBER)) {
Setcart(line,cartnum);
@@ -334,7 +334,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()>=3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
cmds.remove(cmds.begin());
cmds.remove(cmds.begin());
Setcomment(line,cmds.join(" "));
@@ -402,7 +402,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
Setlabel(line,cmds[2]);
}
else {
@@ -494,7 +494,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()>=3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
RDLogLine::TimeType ttype=RDLogLine::NoTime;
if(cmds[2].lower()=="hard") {
ttype=RDLogLine::Hard;
@@ -546,7 +546,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
RDLogLine::TransType trans=RDLogLine::NoTrans;
if(cmds[2].lower()=="play") {
trans=RDLogLine::Play;

4
utils/rdclilogedit/rdclilogedit.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2020 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@@ -43,7 +43,7 @@ MainObject::MainObject(QObject *parent)
edit_quiet_option=false;
edit_log=NULL;
edit_log_event=NULL;
edit_log_model=NULL;
edit_modified=false;
edit_log_lock=NULL;

7
utils/rdclilogedit/rdclilogedit.h
View File

@@ -2,7 +2,7 @@
//
// A Command-line log editor for Rivendell
//
// (C) Copyright 2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2020 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@@ -26,7 +26,6 @@
#include <rdcut.h>
#include <rddb.h>
#include <rdlog.h>
#include <rdlog_event.h>
#include <rdloglock.h>
#include <rdnotification.h>
@@ -72,14 +71,14 @@ class MainObject : public QObject
bool TryLock(RDLogLock *lock,const QString &logname);
void OverwriteError(const QString &cmd) const;
void DispatchCommand(QString cmd);
QString ListLine(RDLogEvent *evt,int line) const;
QString ListLine(RDLogModel *model,int line) const;
void PrintPrompt() const;
void SendNotification(RDNotification::Action action,const QString &logname);
bool edit_quiet_option;
QString edit_accum;
bool edit_modified;
RDLog *edit_log;
RDLogEvent *edit_log_event;
RDLogModel *edit_log_model;
QString edit_description;
QString edit_service;
QDate edit_start_date;

266
utils/rdrender/mainloop.cpp
View File

@@ -1,266 +0,0 @@
// mainloop.cpp
//
// Render a Rivendell log.
//
// (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com>
//
// 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
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <errno.h>
#include <math.h>
#include <stdio.h>
#include <vector>
#include <rdcart.h>
#include <rdcut.h>
#include <rdconf.h>
#include <rdlog.h>
#include <rdlog_event.h>
#include <rdlog_line.h>
#include "rdrender.h"
int MainObject::MainLoop()
{
float *pcm=NULL;
QTime current_time=render_start_time;
QString warnings="";
//
// Open Log
//
RDLog *log=new RDLog(render_logname);
if(!log->exists()) {
fprintf(stderr,"rdrender: no such log\n");
return 1;
}
RDLogEvent *log_event=new RDLogEvent(RDLog::tableName(render_logname));
log_event->load();
//
// Open Output File
//
SF_INFO sf_info;
SNDFILE *sf_out;
FILE *f;
char tempdir[PATH_MAX];
memset(&sf_info,0,sizeof(sf_info));
sf_info.samplerate=render_system->sampleRate();
sf_info.channels=render_channels;
if(render_settings.format()==RDSettings::Pcm16) {
sf_info.format=SF_FORMAT_WAV|SF_FORMAT_PCM_16;
}
else {
sf_info.format=SF_FORMAT_WAV|SF_FORMAT_PCM_24;
}
if(render_settings_modified||render_to_file.isEmpty()) {
//
// 2nd pass will be needed, so just create a placeholder for now
// and then output to a temp file
//
Verbose("Pass 1 of 2");
if(!render_to_file.isEmpty()) {
if((f=fopen(render_to_file,"w"))==NULL) {
fprintf(stderr,"rdrender: unable to open output file [%s]\n",
strerror(errno));
return 1;
}
fclose(f);
}
strncpy(tempdir,RDTempDir()+"/rdrenderXXXXXX",PATH_MAX);
render_temp_output_filename=QString(mkdtemp(tempdir))+"/log.wav";
sf_out=sf_open(render_temp_output_filename,SFM_WRITE,&sf_info);
if(sf_out==NULL) {
fprintf(stderr,"rdrender: unable to open temporary file \"%s\" [%s]\n",
(const char *)render_temp_output_filename,
sf_strerror(sf_out));
return 1;
}
Verbose("Using temporary file \""+render_temp_output_filename+"\".");
}
else {
Verbose("Pass 1 of 1");
sf_out=sf_open(render_to_file,SFM_WRITE,&sf_info);
if(sf_out==NULL) {
fprintf(stderr,"rdrender: unable to open output file [%s]\n",
sf_strerror(sf_out));
return 1;
}
}
//
// Initialize the log
//
std::vector<LogLine *> lls;
for(int i=0;i<log_event->size();i++) {
lls.push_back(new LogLine(log_event->logLine(i),render_user,render_station,
render_system,render_config,render_channels));
if(render_ignore_stops&&(lls.back()->transType()==RDLogLine::Stop)) {
lls.back()->setTransType(RDLogLine::Play);
}
if((!render_first_time.isNull())&&
(lls.back()->timeType()==RDLogLine::Hard)&&
(render_first_line==-1)&&
(lls.back()->startTime(RDLogLine::Imported)==render_first_time)) {
render_first_line=i;
}
if((!render_last_time.isNull())&&
(lls.back()->timeType()==RDLogLine::Hard)&&
(render_last_line==-1)&&
(lls.back()->startTime(RDLogLine::Imported)==render_last_time)) {
render_last_line=i;
}
}
QString time_errs="";
if((!render_first_time.isNull())&&(render_first_line==-1)) {
time_errs+="--first-time event not found";
}
if((!render_last_time.isNull())&&(render_last_line==-1)) {
if(!time_errs.isEmpty()) {
time_errs+=", ";
}
time_errs+="--last-time event not found";
}
if(!time_errs.isEmpty()) {
fprintf(stderr,"rdrender: %s\n",(const char *)time_errs);
return 1;
}
lls.push_back(new LogLine(new RDLogLine(),render_user,render_station,
render_system,render_config,render_channels));
lls.back()->setTransType(RDLogLine::Play);
if((!render_first_time.isNull())&&(render_first_line==-1)) {
render_first_line=log_event->size();
}
//
// Iterate through it
//
for(unsigned i=0;i<lls.size();i++) {
if(((render_first_line==-1)||(render_first_line<=(int)i))&&
((render_last_line==-1)||(render_last_line>(int)i))) {
if(lls.at(i)->transType()==RDLogLine::Stop) {
Verbose(current_time,i,"STOP ",lls.at(i)->summary());
warnings+=
QString().sprintf("log render halted at line %d due to STOP\n",i);
break;
}
if(lls.at(i)->open(current_time)) {
Verbose(current_time,i,RDLogLine::transText(lls.at(i)->transType()),
QString().sprintf(" cart %06u [",lls.at(i)->cartNumber())+
lls.at(i)->title()+"]");
sf_count_t frames=0;
if((lls.at(i+1)->transType()==RDLogLine::Segue)&&
(lls.at(i)->cut()->segueStartPoint()>=0)) {
frames=FramesFromMsec(lls.at(i)->cut()->segueStartPoint()-
lls.at(i)->cut()->startPoint());
current_time=current_time.addMSecs(lls.at(i)->cut()->segueStartPoint()-
lls.at(i)->cut()->startPoint());
}
else {
frames=FramesFromMsec(lls.at(i)->cut()->endPoint()-
lls.at(i)->cut()->startPoint());
current_time=current_time.addMSecs(lls.at(i)->cut()->endPoint()-
lls.at(i)->cut()->startPoint());
}
pcm=new float[frames*render_channels];
memset(pcm,0,frames*render_channels);
for(unsigned j=0;j<i;j++) {
Sum(pcm,lls.at(j),frames);
}
Sum(pcm,lls.at(i),frames);
sf_writef_float(sf_out,pcm,frames);
delete pcm;
pcm=NULL;
lls.at(i)->setRamp(lls.at(i+1)->transType());
}
else {
if(i<(lls.size()-1)) {
if(lls.at(i)->type()==RDLogLine::Cart) {
Verbose(current_time,i,"FAIL",lls.at(i)->summary()+
" (NO AUDIO AVAILABLE)");
warnings+=
lls.at(i)->summary()+QString().
sprintf("at line %d failed to play (NO AUDIO AVAILABLE)\n",i);
}
else {
Verbose(current_time,i,"SKIP",lls.at(i)->summary());
}
}
else {
Verbose(current_time,lls.size()-1,"STOP","--- end of log ---");
}
}
}
}
sf_close(sf_out);
//
// Process 2nd Pass
//
if(render_settings_modified||render_to_file.isEmpty()) {
QString err_msg;
bool ok=false;
Verbose("Pass 2 of 2");
if(!render_to_file.isEmpty()) {
Verbose("Writing output file");
ok=ConvertAudio(render_temp_output_filename,render_to_file,
&render_settings,&err_msg);
DeleteCutFile(render_temp_output_filename);
if(!ok) {
fprintf(stderr,"rdrender: unable to convert output [%s]\n",
(const char *)err_msg);
return 1;
}
}
else {
Verbose("Importing cart");
ok=ImportCart(render_temp_output_filename,render_cart_number,
render_cut_number,&err_msg);
DeleteCutFile(render_temp_output_filename);
if(!ok) {
fprintf(stderr,"rdrender: unable to import to cart [%s]\n",
(const char *)err_msg);
return 1;
}
}
}
fprintf(stderr,"%s",(const char *)warnings);
fflush(stderr);
return 0;
}
void MainObject::Sum(float *pcm_out,LogLine *ll,sf_count_t frames)
{
if(ll->handle()!=NULL) {
float *pcm=new float[frames*render_channels];
memset(pcm,0,frames*render_channels);
sf_count_t n=sf_readf_float(ll->handle(),pcm,frames);
for(sf_count_t i=0;i<n;i+=render_channels) {
double ratio=exp10(((double)i*ll->rampRate()+ll->rampLevel())/2000.0);
for(sf_count_t j=0;j<render_channels;j++) {
pcm_out[i*render_channels+j]+=ratio*pcm[i*render_channels+j];
}
}
ll->setRampLevel((double)n*ll->rampRate()+ll->rampLevel());
if(n<frames) {
ll->close();
}
delete pcm;
}
}

10
utils/rdrender/rdrender.cpp
View File

@@ -2,7 +2,7 @@
//
// Render a Rivendell log.
//
// (C) Copyright 2017-2018 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
// it under the terms of the GNU General Public License version 2 as
@@ -289,8 +289,8 @@ void MainObject::userData()
fprintf(stderr,"rdrender: no such log\n");
exit(1);
}
RDLogEvent *log_event=new RDLogEvent(render_logname);
log_event->load();
RDLogModel *log_model=new RDLogModel(render_logname,false,this);
log_model->load();
//
// Render It
@@ -300,7 +300,7 @@ void MainObject::userData()
connect(r,SIGNAL(progressMessageSent(const QString &)),
this,SLOT(printProgressMessage(const QString &)));
if(render_to_file.isEmpty()) {
if(!r->renderToCart(render_cart_number,render_cut_number,log_event,
if(!r->renderToCart(render_cart_number,render_cut_number,log_model,
&render_settings,render_start_time,
render_ignore_stops,&err_msg,render_first_line,
render_last_line,render_first_time,render_last_time)) {
@@ -309,7 +309,7 @@ void MainObject::userData()
}
}
else {
if(!r->renderToFile(render_to_file,log_event,&render_settings,
if(!r->renderToFile(render_to_file,log_model,&render_settings,
render_start_time,render_ignore_stops,
&err_msg,render_first_line,render_last_line,
render_first_time,render_last_time)) {