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

2016-05-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* 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'.
This commit is contained in:
Fred Gleason
2016-05-26 08:25:49 -04:00
parent f2d831f86c
commit da0ad47ffb
4 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -15181,3 +15181,8 @@
2016-05-26 Fred Gleason <fredg@paravelsystems.com> 2016-05-26 Fred Gleason <fredg@paravelsystems.com>
* Documented the '--escape-string' switch in * Documented the '--escape-string' switch in
'docs/docbook/rdexport.xml'. 'docs/docbook/rdexport.xml'.
2016-05-26 Fred Gleason <fredg@paravelsystems.com>
* 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'.

24
lib/rdaudioexport.cpp
View File

@@ -67,24 +67,48 @@ RDAudioExport::RDAudioExport(RDStation *station,RDConfig *config,
} }
unsigned RDAudioExport::cartNumber() const
{
return conv_cart_number;
}
void RDAudioExport::setCartNumber(unsigned cartnum) void RDAudioExport::setCartNumber(unsigned cartnum)
{ {
conv_cart_number=cartnum; conv_cart_number=cartnum;
} }
unsigned RDAudioExport::cutNumber() const
{
return conv_cut_number;
}
void RDAudioExport::setCutNumber(unsigned cutnum) void RDAudioExport::setCutNumber(unsigned cutnum)
{ {
conv_cut_number=cutnum; conv_cut_number=cutnum;
} }
QString RDAudioExport::destinationFile() const
{
return conv_dst_filename;
}
void RDAudioExport::setDestinationFile(const QString &filename) void RDAudioExport::setDestinationFile(const QString &filename)
{ {
conv_dst_filename=filename; conv_dst_filename=filename;
} }
RDSettings *RDAudioExport::destinationSettings() const
{
return conv_settings;
}
void RDAudioExport::setDestinationSettings(RDSettings *settings) void RDAudioExport::setDestinationSettings(RDSettings *settings)
{ {
conv_settings=settings; conv_settings=settings;

4
lib/rdaudioexport.h
View File

@@ -37,9 +37,13 @@ class RDAudioExport : public QObject
ErrorService=8,ErrorInvalidUser=9,ErrorAborted=10, ErrorService=8,ErrorInvalidUser=9,ErrorAborted=10,
ErrorConverter=11}; ErrorConverter=11};
RDAudioExport(RDStation *station,RDConfig *config,QObject *parent=0); RDAudioExport(RDStation *station,RDConfig *config,QObject *parent=0);
unsigned cartNumber() const;
void setCartNumber(unsigned cartnum); void setCartNumber(unsigned cartnum);
unsigned cutNumber() const;
void setCutNumber(unsigned cutnum); void setCutNumber(unsigned cutnum);
QString destinationFile() const;
void setDestinationFile(const QString &filename); void setDestinationFile(const QString &filename);
RDSettings *destinationSettings() const;
void setDestinationSettings(RDSettings *settings); void setDestinationSettings(RDSettings *settings);
void setRange(int start_pt,int end_pt); void setRange(int start_pt,int end_pt);
void setEnableMetadata(bool state); void setEnableMetadata(bool state);

3
utils/rdexport/rdexport.cpp
View File

@@ -321,7 +321,8 @@ void MainObject::ExportCut(RDCart *cart,RDCut *cut)
if((export_err=conv->runExport(export_user->name(),export_user->password(), if((export_err=conv->runExport(export_user->name(),export_user->password(),
&conv_err))!=RDAudioExport::ErrorOk) { &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)); (const char *)RDAudioExport::errorText(export_err,conv_err));
if(!export_continue_after_error) { if(!export_continue_after_error) {
exit(256); exit(256);