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

* Added a 'RDLogLine::refreshCart()' method.
	* Refactored the 'Edit Log' dialog in rdlogedit(1) to use Qt's
	MVC API.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-12-15 12:53:29 -05:00
parent 0bd165a823
commit 0b57b4b8de
40 changed files with 2355 additions and 901 deletions

View File

@@ -311,6 +311,72 @@ bool RDRenderer::renderToFile(const QString &outfile,RDLogEvent *log,
}
bool RDRenderer::renderToFile(const QString &outfile,RDLogModel *model,
RDSettings *s,const QTime &start_time,
bool ignore_stops,QString *err_msg,
int first_line,int last_line,
const QTime &first_time,const QTime &last_time)
{
QString temp_output_filename;
char tempdir[PATH_MAX];
bool ok=false;
FILE *f=NULL;
bool ret;
//
// Verify Destination
//
if((f=fopen(outfile,"w"))==NULL) {
*err_msg=tr("unable to open output file")+" ["+QString(strerror(errno))+"]";
return false;
}
fclose(f);
if(((s->format()!=RDSettings::Pcm16)&&(s->format()!=RDSettings::Pcm24))||
(s->normalizationLevel()!=0)) {
ProgressMessage("Pass 1 of 2");
render_total_passes=2;
//
// Get Temporary File
//
strncpy(tempdir,RDTempDirectory::basePath()+"/rdrenderXXXXXX",PATH_MAX);
temp_output_filename=QString(mkdtemp(tempdir))+"/log.wav";
ProgressMessage(tr("Using temporary file")+" \""+temp_output_filename+"\".");
//
// Render It
//
if(!Render(temp_output_filename,model,s,start_time,ignore_stops,err_msg,
first_line,last_line,first_time,last_time)) {
return false;
}
//
// Convert It
//
ProgressMessage(tr("Pass 2 of 2"));
ProgressMessage(tr("Writing output file"));
ok=ConvertAudio(temp_output_filename,outfile,s,err_msg);
DeleteTempFile(temp_output_filename);
emit lineStarted(model->lineCount()+1,model->lineCount()+1);
if(!ok) {
return false;
}
}
else {
ProgressMessage(tr("Pass 1 of 1"));
render_total_passes=1;
ret=Render(outfile,model,s,start_time,ignore_stops,err_msg,
first_line,last_line,first_time,last_time);
emit lineStarted(model->lineCount(),model->lineCount());
return ret;
}
return true;
}
bool RDRenderer::renderToCart(unsigned cartnum,int cutnum,RDLogEvent *log,
RDSettings *s,const QTime &start_time,
bool ignore_stops,QString *err_msg,
@@ -384,6 +450,79 @@ bool RDRenderer::renderToCart(unsigned cartnum,int cutnum,RDLogEvent *log,
}
bool RDRenderer::renderToCart(unsigned cartnum,int cutnum,RDLogModel *model,
RDSettings *s,const QTime &start_time,
bool ignore_stops,QString *err_msg,
int first_line,int last_line,
const QTime &first_time,const QTime &last_time)
{
QString temp_output_filename;
char tempdir[PATH_MAX];
bool ok=false;
if(first_line<0) {
first_line=0;
}
if(last_line<0) {
last_line=model->lineCount();
}
//
// Check that we won't overflow the 32 bit BWF structures
// when we go to import the rendered log back into the audio store
//
if((double)model->length(first_line,last_line-1)/1000.0>=
(1073741824.0/((double)s->channels()*(double)s->sampleRate()))) {
*err_msg=tr("Rendered log is too long!");
return false;
}
ProgressMessage(tr("Pass 1 of 2"));
render_total_passes=2;
//
// Verify Destination
//
if(!RDCart::exists(cartnum)) {
*err_msg=tr("no such cart");
return false;
}
if(!RDCut::exists(cartnum,cutnum)) {
*err_msg=tr("no such cut");
return false;
}
//
// Get Temporary File
//
strncpy(tempdir,RDTempDirectory::basePath()+"/rdrenderXXXXXX",PATH_MAX);
temp_output_filename=QString(mkdtemp(tempdir))+"/log.wav";
ProgressMessage(tr("Using temporary file")+" \""+temp_output_filename+"\".");
//
// Render It
//
if(!Render(temp_output_filename,model,s,start_time,ignore_stops,err_msg,
first_line,last_line,first_time,last_time)) {
return false;
}
//
// Convert It
//
ProgressMessage(tr("Pass 2 of 2"));
ProgressMessage(tr("Importing cart"));
ok=ImportCart(temp_output_filename,cartnum,cutnum,s->channels(),err_msg);
DeleteTempFile(temp_output_filename);
emit lineStarted(model->lineCount()+1,model->lineCount()+1);
if(!ok) {
return false;
}
return true;
}
QStringList RDRenderer::warnings() const
{
return render_warnings;
@@ -567,6 +706,177 @@ bool RDRenderer::Render(const QString &outfile,RDLogEvent *log,RDSettings *s,
}
bool RDRenderer::Render(const QString &outfile,RDLogModel *model,RDSettings *s,
const QTime &start_time,bool ignore_stops,
QString *err_msg,int first_line,int last_line,
const QTime &first_time,const QTime &last_time)
{
float *pcm=NULL;
QString temp_output_filename;
QTime current_time;
render_warnings.clear();
render_abort=false;
if(start_time.isNull()) {
current_time=QTime::currentTime();
}
else {
current_time=start_time;
}
//
// Open Output File
//
SF_INFO sf_info;
SNDFILE *sf_out;
memset(&sf_info,0,sizeof(sf_info));
sf_info.samplerate=rda->system()->sampleRate();
sf_info.channels=s->channels();
if(s->format()==RDSettings::Pcm16) {
sf_info.format=SF_FORMAT_WAV|SF_FORMAT_PCM_16;
}
else {
sf_info.format=SF_FORMAT_WAV|SF_FORMAT_PCM_24;
}
sf_out=sf_open(outfile,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<__RDRenderLogLine *> lls;
for(int i=0;i<model->lineCount();i++) {
lls.push_back(new __RDRenderLogLine(model->logLine(i),s->channels()));
if(ignore_stops&&(lls.back()->transType()==RDLogLine::Stop)) {
lls.back()->setTransType(RDLogLine::Play);
}
if((!first_time.isNull())&&
(lls.back()->timeType()==RDLogLine::Hard)&&
(first_line==-1)&&
(lls.back()->startTime(RDLogLine::Imported)==first_time)) {
first_line=i;
}
if((!last_time.isNull())&&
(lls.back()->timeType()==RDLogLine::Hard)&&
(last_line==-1)&&
(lls.back()->startTime(RDLogLine::Imported)==last_time)) {
last_line=i;
}
}
if((!first_time.isNull())&&(first_line==-1)) {
*err_msg+=tr("first-time event not found");
}
if((!last_time.isNull())&&(last_line==-1)) {
if(!err_msg->isEmpty()) {
*err_msg+=", ";
}
*err_msg+=tr("last-time event not found");
}
if(!err_msg->isEmpty()) {
return false;
}
lls.push_back(new __RDRenderLogLine(new RDLogLine(),s->channels()));
lls.back()->setTransType(RDLogLine::Play);
if((!first_time.isNull())&&(first_line==-1)) {
first_line=model->lineCount();
}
//
// Iterate through it
//
for(unsigned i=0;i<lls.size();i++) {
if(render_abort) {
emit lineStarted(model->lineCount()+render_total_passes-1,
model->lineCount()+render_total_passes-1);
*err_msg+="Render aborted.\n";
sf_close(sf_out);
return false;
}
emit lineStarted(i,model->lineCount()+render_total_passes-1);
if(((first_line==-1)||(first_line<=(int)i))&&
((last_line==-1)||(last_line>=(int)i))) {
if(lls.at(i)->transType()==RDLogLine::Stop) {
ProgressMessage(current_time,i,tr("STOP")+" ",lls.at(i)->summary());
render_warnings.
push_back(tr("log render halted at line")+QString().sprintf(" %d ",i)+
tr("due to STOP"));
break;
}
if(lls.at(i)->open(current_time)) {
ProgressMessage(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)->segueStartPoint()>=0)) {
if(lls.at(i)->segueStartPoint()>lls.at(i)->startPoint()) {
frames=FramesFromMsec(lls.at(i)->segueStartPoint()-
lls.at(i)->startPoint());
current_time=
current_time.addMSecs(lls.at(i)->segueStartPoint()-
lls.at(i)->startPoint());
}
else {
frames=0;
}
}
else {
if(lls.at(i)->endPoint()>lls.at(i)->startPoint()) {
frames=FramesFromMsec(lls.at(i)->endPoint()-
lls.at(i)->startPoint());
current_time=current_time.addMSecs(lls.at(i)->endPoint()-
lls.at(i)->startPoint());
}
else {
frames=0;
}
}
pcm=new float[frames*s->channels()];
memset(pcm,0,frames*s->channels()*sizeof(float));
for(unsigned j=0;j<i;j++) {
Sum(pcm,lls.at(j),frames,s->channels());
}
Sum(pcm,lls.at(i),frames,s->channels());
sf_writef_float(sf_out,pcm,frames);
delete pcm;
pcm=NULL;
lls.at(i)->setRamp(lls.at(i+1)->transType(),lls.at(i)->segueGain());
}
else {
if(i<(lls.size()-1)) {
if(lls.at(i)->type()==RDLogLine::Cart) {
ProgressMessage(current_time,i,tr("FAIL"),lls.at(i)->summary()+
" ("+tr("NO AUDIO AVAILABLE")+")");
render_warnings.
push_back(lls.at(i)->summary()+tr("at line")+
QString().sprintf(" %d ",i)+
tr("failed to play (NO AUDIO AVAILABLE)"));
}
else {
ProgressMessage(current_time,i,tr("SKIP"),lls.at(i)->summary());
}
}
else {
ProgressMessage(current_time,lls.size()-1,
tr("STOP"),tr("--- end of log ---"));
}
}
}
}
sf_close(sf_out);
return true;
}
void RDRenderer::Sum(float *pcm_out,__RDRenderLogLine *ll,sf_count_t frames,
unsigned chans)
{