Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-13 14:13:32 +02:00
Code Issues Releases Wiki Activity

Bug2569: Alias block files should import correctly into .aup3

Browse Source
This commit is contained in:
Paul Licameli
2020-11-17 23:19:06 -05:00
parent a8bc89e4c4
commit 0277e00402
1 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/import/ImportAUP.cpp
View File

@@ -140,13 +140,15 @@ private:
// Called in first pass to collect information about blocks // Called in first pass to collect information about blocks
void AddFile(sampleCount len, void AddFile(sampleCount len,
sampleFormat format, sampleFormat format,
const FilePath &filename = wxEmptyString, const FilePath &blockFilename = wxEmptyString,
const FilePath &audioFilename = wxEmptyString,
sampleCount origin = 0, sampleCount origin = 0,
int channel = 0); int channel = 0);
// These two use the collected file information in a second pass // These two use the collected file information in a second pass
bool AddSilence(sampleCount len); bool AddSilence(sampleCount len);
bool AddSamples(const FilePath &filename, bool AddSamples(const FilePath &blockFilename,
const FilePath &audioFilename,
sampleCount len, sampleCount len,
sampleFormat format, sampleFormat format,
sampleCount origin = 0, sampleCount origin = 0,
@@ -186,7 +188,8 @@ private:
{ {
WaveTrack *track; WaveTrack *track;
WaveClip *clip; WaveClip *clip;
FilePath path; FilePath blockFile;
FilePath audioFile;
sampleCount len; sampleCount len;
sampleFormat format; sampleFormat format;
sampleCount origin; sampleCount origin;
@@ -351,13 +354,14 @@ ProgressResult AUPImportFileHandle::Import(WaveTrackFactory *WXUNUSED(trackFacto
mClip = fi.clip; mClip = fi.clip;
mWaveTrack = fi.track; mWaveTrack = fi.track;
if (fi.path.empty()) if (fi.blockFile.empty())
{ {
AddSilence(fi.len); AddSilence(fi.len);
} }
else else
{ {
AddSamples(fi.path, fi.len, fi.format, fi.origin, fi.channel); AddSamples(fi.blockFile, fi.audioFile,
fi.len, fi.format, fi.origin, fi.channel);
} }
processed += fi.len; processed += fi.len;
@@ -1223,7 +1227,7 @@ bool AUPImportFileHandle::HandleSimpleBlockFile(XMLTagHandler *&handler)
// Do not set the handler - already handled // Do not set the handler - already handled
AddFile(len, mFormat, filename); AddFile(len, mFormat, filename, filename);
return true; return true;
} }
@@ -1266,6 +1270,7 @@ bool AUPImportFileHandle::HandleSilentBlockFile(XMLTagHandler *&handler)
bool AUPImportFileHandle::HandlePCMAliasBlockFile(XMLTagHandler *&handler) bool AUPImportFileHandle::HandlePCMAliasBlockFile(XMLTagHandler *&handler)
{ {
wxString summaryFilename;
wxFileName filename; wxFileName filename;
sampleCount start = 0; sampleCount start = 0;
sampleCount len = 0; sampleCount len = 0;
@@ -1304,6 +1309,10 @@ bool AUPImportFileHandle::HandlePCMAliasBlockFile(XMLTagHandler *&handler)
.Format(strValue)); .Format(strValue));
} }
} }
else if (!wxStricmp(attr, wxT("summaryfile")))
{
summaryFilename = strValue;
}
else if (!wxStricmp(attr, wxT("aliasstart"))) else if (!wxStricmp(attr, wxT("aliasstart")))
{ {
if (!XMLValueChecker::IsGoodInt64(strValue) || !strValue.ToLongLong(&nValue) || (nValue < 0)) if (!XMLValueChecker::IsGoodInt64(strValue) || !strValue.ToLongLong(&nValue) || (nValue < 0))
@@ -1337,7 +1346,9 @@ bool AUPImportFileHandle::HandlePCMAliasBlockFile(XMLTagHandler *&handler)
// Do not set the handler - already handled // Do not set the handler - already handled
if (filename.IsOk()) if (filename.IsOk())
AddFile(len, mFormat, filename.GetFullPath(), start, channel); AddFile(len, mFormat,
summaryFilename, filename.GetFullPath(),
start, channel);
else else
AddFile(len, mFormat); // will add silence instead AddFile(len, mFormat); // will add silence instead
@@ -1421,14 +1432,16 @@ bool AUPImportFileHandle::HandleImport(XMLTagHandler *&handler)
void AUPImportFileHandle::AddFile(sampleCount len, void AUPImportFileHandle::AddFile(sampleCount len,
sampleFormat format, sampleFormat format,
const FilePath &filename /* = wxEmptyString */, const FilePath &blockFilename /* = wxEmptyString */,
const FilePath &audioFilename /* = wxEmptyString */,
sampleCount origin /* = 0 */, sampleCount origin /* = 0 */,
int channel /* = 0 */) int channel /* = 0 */)
{ {
fileinfo fi = {}; fileinfo fi = {};
fi.track = mWaveTrack; fi.track = mWaveTrack;
fi.clip = mClip; fi.clip = mClip;
fi.path = filename; fi.blockFile = blockFilename;
fi.audioFile = audioFilename;
fi.len = len; fi.len = len;
fi.format = format, fi.format = format,
fi.origin = origin, fi.origin = origin,
@@ -1457,14 +1470,15 @@ bool AUPImportFileHandle::AddSilence(sampleCount len)
// All errors that occur here will simply insert silence and allow the // All errors that occur here will simply insert silence and allow the
// import to continue. // import to continue.
bool AUPImportFileHandle::AddSamples(const FilePath &filename, bool AUPImportFileHandle::AddSamples(const FilePath &blockFilename,
const FilePath &audioFilename,
sampleCount len, sampleCount len,
sampleFormat format, sampleFormat format,
sampleCount origin /* = 0 */, sampleCount origin /* = 0 */,
int channel /* = 0 */) int channel /* = 0 */)
{ {
auto pClip = mClip ? mClip : mWaveTrack->RightmostOrNewClip(); auto pClip = mClip ? mClip : mWaveTrack->RightmostOrNewClip();
auto &pBlock = mFileMap[wxFileNameFromPath(filename)].second; auto &pBlock = mFileMap[wxFileNameFromPath(blockFilename)].second;
if (pBlock) { if (pBlock) {
// Replicate the sharing of blocks // Replicate the sharing of blocks
pClip->AppendSharedBlock( pBlock ); pClip->AppendSharedBlock( pBlock );
@@ -1487,7 +1501,7 @@ bool AUPImportFileHandle::AddSamples(const FilePath &filename,
{ {
if (!success) if (!success)
{ {
SetWarning(XO("Error while processing %s\n\nInserting silence.").Format(filename)); SetWarning(XO("Error while processing %s\n\nInserting silence.").Format(audioFilename));
// If we are unwinding for an exception, don't do another // If we are unwinding for an exception, don't do another
// potentially throwing operation // potentially throwing operation
@@ -1502,9 +1516,9 @@ bool AUPImportFileHandle::AddSamples(const FilePath &filename,
} }
}); });
if (!f.Open(filename)) if (!f.Open(audioFilename))
{ {
SetWarning(XO("Failed to open %s").Format(filename)); SetWarning(XO("Failed to open %s").Format(audioFilename));
return true; return true;
} }
@@ -1515,7 +1529,7 @@ bool AUPImportFileHandle::AddSamples(const FilePath &filename,
sf = SFCall<SNDFILE*>(sf_open_fd, f.fd(), SFM_READ, &info, FALSE); sf = SFCall<SNDFILE*>(sf_open_fd, f.fd(), SFM_READ, &info, FALSE);
if (!sf) if (!sf)
{ {
SetWarning(XO("Failed to open %s").Format(filename)); SetWarning(XO("Failed to open %s").Format(audioFilename));
return true; return true;
} }
@@ -1525,7 +1539,7 @@ bool AUPImportFileHandle::AddSamples(const FilePath &filename,
if (SFCall<sf_count_t>(sf_seek, sf, origin.as_long_long(), SEEK_SET) < 0) if (SFCall<sf_count_t>(sf_seek, sf, origin.as_long_long(), SEEK_SET) < 0)
{ {
SetWarning(XO("Failed to seek to position %lld in %s") SetWarning(XO("Failed to seek to position %lld in %s")
.Format(origin.as_long_long(), filename)); .Format(origin.as_long_long(), audioFilename));
return true; return true;
} }
@@ -1554,7 +1568,7 @@ bool AUPImportFileHandle::AddSamples(const FilePath &filename,
if (framesRead != cnt) if (framesRead != cnt)
{ {
SetWarning(XO("Unable to read %lld samples from %s") SetWarning(XO("Unable to read %lld samples from %s")
.Format(cnt, filename)); .Format(cnt, audioFilename));
return true; return true;
} }
@@ -1581,7 +1595,7 @@ bool AUPImportFileHandle::AddSamples(const FilePath &filename,
if (framesRead != cnt) if (framesRead != cnt)
{ {
SetWarning(XO("Unable to read %lld samples from %s") SetWarning(XO("Unable to read %lld samples from %s")
.Format(cnt, filename)); .Format(cnt, audioFilename));
return true; return true;
} }
@@ -1603,7 +1617,7 @@ bool AUPImportFileHandle::AddSamples(const FilePath &filename,
if (framesRead != cnt) if (framesRead != cnt)
{ {
SetWarning(XO("Unable to read %lld samples from %s") SetWarning(XO("Unable to read %lld samples from %s")
.Format(cnt, filename)); .Format(cnt, audioFilename));
return true; return true;
} }