diff --git a/ChangeLog b/ChangeLog index a252a2c7..e5450e4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15181,3 +15181,8 @@ 2016-05-26 Fred Gleason * Documented the '--escape-string' switch in 'docs/docbook/rdexport.xml'. +2016-05-26 Fred Gleason + * Added 'RDAudioExport::cartNumber()', 'RDAudioExport::cutNumber()' + and 'RDAudioExport::settings()' meethods in 'lib/rdaudioexport.cpp' + and 'lib/rdaudioexport.h'. + * Added expanded error logging in 'utils/rdexport/rdexport.cpp'. diff --git a/lib/rdaudioexport.cpp b/lib/rdaudioexport.cpp index 8096a437..29d2b3dc 100644 --- a/lib/rdaudioexport.cpp +++ b/lib/rdaudioexport.cpp @@ -67,24 +67,48 @@ RDAudioExport::RDAudioExport(RDStation *station,RDConfig *config, } +unsigned RDAudioExport::cartNumber() const +{ + return conv_cart_number; +} + + void RDAudioExport::setCartNumber(unsigned cartnum) { conv_cart_number=cartnum; } +unsigned RDAudioExport::cutNumber() const +{ + return conv_cut_number; +} + + void RDAudioExport::setCutNumber(unsigned cutnum) { conv_cut_number=cutnum; } +QString RDAudioExport::destinationFile() const +{ + return conv_dst_filename; +} + + void RDAudioExport::setDestinationFile(const QString &filename) { conv_dst_filename=filename; } +RDSettings *RDAudioExport::destinationSettings() const +{ + return conv_settings; +} + + void RDAudioExport::setDestinationSettings(RDSettings *settings) { conv_settings=settings; diff --git a/lib/rdaudioexport.h b/lib/rdaudioexport.h index 8354df51..4948a0b0 100644 --- a/lib/rdaudioexport.h +++ b/lib/rdaudioexport.h @@ -37,9 +37,13 @@ class RDAudioExport : public QObject ErrorService=8,ErrorInvalidUser=9,ErrorAborted=10, ErrorConverter=11}; RDAudioExport(RDStation *station,RDConfig *config,QObject *parent=0); + unsigned cartNumber() const; void setCartNumber(unsigned cartnum); + unsigned cutNumber() const; void setCutNumber(unsigned cutnum); + QString destinationFile() const; void setDestinationFile(const QString &filename); + RDSettings *destinationSettings() const; void setDestinationSettings(RDSettings *settings); void setRange(int start_pt,int end_pt); void setEnableMetadata(bool state); diff --git a/utils/rdexport/rdexport.cpp b/utils/rdexport/rdexport.cpp index e57728c2..d0ad97f5 100644 --- a/utils/rdexport/rdexport.cpp +++ b/utils/rdexport/rdexport.cpp @@ -321,7 +321,8 @@ void MainObject::ExportCut(RDCart *cart,RDCut *cut) if((export_err=conv->runExport(export_user->name(),export_user->password(), &conv_err))!=RDAudioExport::ErrorOk) { - fprintf(stderr,"rdexport: exporter error [%s]\n", + fprintf(stderr,"rdexport: exporter error for output file \"%s\" [%s]\n", + (const char *)conv->destinationFile(), (const char *)RDAudioExport::errorText(export_err,conv_err)); if(!export_continue_after_error) { exit(256);