Merged 'stable'

This commit is contained in:
Fred Gleason
2018-08-23 16:02:45 +00:00
24 changed files with 1100 additions and 84 deletions

View File

@@ -146,7 +146,7 @@ void Xport::Export()
XmlExit("unable to create temporary directory ["+err_msg+"]",500);
}
QString tmpfile=tempdir->path()+"/exported_audio";
RDAudioConvert *conv=new RDAudioConvert(this);
RDAudioConvert *conv=new RDAudioConvert();
conv->setSourceFile(RDCut::pathName(cartnum,cutnum));
conv->setDestinationFile(tmpfile);
conv->setDestinationSettings(settings);

View File

@@ -203,7 +203,7 @@ void Xport::Import()
XmlExit("Duplicate Cart Title Not Allowed",404,"import.cpp",LINE_NUMBER);
}
}
RDAudioConvert *conv=new RDAudioConvert(this);
RDAudioConvert *conv=new RDAudioConvert();
conv->setSourceFile(filename);
conv->setDestinationFile(RDCut::pathName(cartnum,cutnum));
conv->setDestinationSettings(settings);