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

Merged rendering

Browse Source
This commit is contained in:
Fred Gleason
2017-09-21 07:40:22 -04:00
parent 0ba0267de3 371c6c875b
commit ac84b6879d
25 changed files with 748 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/rdrender/rdrender.cpp
View File

@@ -46,7 +46,6 @@ MainObject::MainObject(QObject *parent)
:QObject(parent)
{
render_verbose=false;
render_channels=RDRENDER_DEFAULT_CHANNELS;
render_first_line=-1;
render_last_line=-1;
render_ignore_stops=false;
@@ -89,8 +88,9 @@ MainObject::MainObject(QObject *parent)
cmd->setProcessed(i,true);
}
if(cmd->key(i)=="--channels") {
render_channels=cmd->value(i).toUInt(&ok);
if((!ok)||(render_channels>2)) {
render_settings.setChannels(cmd->value(i).toUInt(&ok));
if((!ok)||
(render_settings.channels()>2)||(render_settings.channels()==0)) {
fprintf(stderr,"rdrender: invalid --channels argument\n");
exit(1);
}
@@ -330,7 +330,7 @@ void MainObject::userData()
this,SLOT(printProgressMessage(const QString &)));
if(render_to_file.isEmpty()) {
if(!r->renderToCart(render_cart_number,render_cut_number,log_event,
render_channels,&render_settings,render_start_time,
&render_settings,render_start_time,
render_ignore_stops,&err_msg,render_first_line,
render_last_line,render_first_time,render_last_time)) {
fprintf(stderr,"rdrender: %s\n",(const char *)err_msg);
@@ -338,8 +338,8 @@ void MainObject::userData()
}
}
else {
if(!r->renderToFile(render_to_file,log_event,render_channels,
&render_settings,render_start_time,render_ignore_stops,
if(!r->renderToFile(render_to_file,log_event,&render_settings,
render_start_time,render_ignore_stops,
&err_msg,render_first_line,render_last_line,
render_first_time,render_last_time)) {
fprintf(stderr,"rdrender: %s\n",(const char *)err_msg);

1
utils/rdrender/rdrender.h
View File

@@ -60,7 +60,6 @@ class MainObject : public QObject
unsigned render_cart_number;
int render_cut_number;
QString render_temp_output_filename;
unsigned render_channels;
QTime render_start_time;
int render_first_line;
int render_last_line;