diff --git a/ChangeLog b/ChangeLog index cdb324db..4878fd1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16039,3 +16039,6 @@ * Fixed a bug in 'lib/rdrenderer.cpp' and 'lib/rdrenerer.h' that caused logs rendered to cart/cut in stereo regardless of the number of channels specified. +2017-09-20 Fred Gleason + * Fixed a bug in rdrender(1) that caused the --channels option + to be ignored. diff --git a/docs/docbook/rdrender.xml b/docs/docbook/rdrender.xml index a8a511cf..d2055544 100644 --- a/docs/docbook/rdrender.xml +++ b/docs/docbook/rdrender.xml @@ -341,8 +341,9 @@ options). - Maximum length of the rendered log is limited to appoximately two hours when - using . + Due to limitations inherent in the 32 bit Broadcast Wave File format used in + Rivendell's audio store, the maximum length of the rendered log is limited + to appoximately three hours when using . diff --git a/utils/rdrender/rdrender.cpp b/utils/rdrender/rdrender.cpp index 34c45922..98357f33 100644 --- a/utils/rdrender/rdrender.cpp +++ b/utils/rdrender/rdrender.cpp @@ -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); } diff --git a/utils/rdrender/rdrender.h b/utils/rdrender/rdrender.h index f12aed46..6c680a9d 100644 --- a/utils/rdrender/rdrender.h +++ b/utils/rdrender/rdrender.h @@ -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;