Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-08 20:52:09 +01:00
Code Issues Releases Wiki Activity

(bug 113)

Browse Source 
More comments about things to fix (FIX-ME items this time).

Made AudacityProject::OnShowLog make the log window taller so more likely to show the bottom. The implementation of wxLogWindow makes it hard/impossible to scroll to the bottom.

Fix error of duplicate reports of missing aliased files.
This commit is contained in:
v.audacity
2010-08-17 03:46:58 +00:00
parent af52a83ec1
commit 2ef7a3fd31
5 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/DirManager.cpp
View File

@@ -1408,8 +1408,8 @@ int DirManager::ProjectFSCK(const bool bForceError, const bool bSilentlyCorrect)
this->FindOrphanBlockFiles(bSilentlyCorrect, fileNameArray, orphanFilePathArray);
BlockHash missingAliasedBlockFileHash; // (.auf) AliasBlockFiles whose aliased files are missing
wxArrayString missingAliasedFilePathArray; // full paths of missing aliased files
this->FindMissingAliasedFiles(bSilentlyCorrect, missingAliasedBlockFileHash, missingAliasedFilePathArray);
BlockHash missingAliasedFilePathHash; // full paths of missing aliased files
this->FindMissingAliasedFiles(bSilentlyCorrect, missingAliasedBlockFileHash, missingAliasedFilePathHash);
BlockHash missingAliasBlockFileHash; // missing (.auf) AliasBlockFiles
this->FindMissingAliasBlockFiles(bSilentlyCorrect, missingAliasBlockFileHash);
@@ -1486,8 +1486,8 @@ _("Project check detected %d external audio file(s) ('aliased files') \
\n\nIf you choose the first or second option below, you can try to \
\nfind and restore the missing files to their previous location.");
wxString msg;
msg.Printf(msgA, missingAliasedFilePathArray.GetCount());
msg.Printf(msgA, missingAliasedFilePathHash.size());
const wxChar *buttons[] = {_("Close project immediately with no changes"),
_("Temporarily replace missing audio with silence (this session only)"),
_("Replace missing audio with silence (permanent immediately)"),
@@ -1646,29 +1646,38 @@ _("Project check detected %d missing audio data blockfile(s) (.au), \
void DirManager::FindMissingAliasedFiles(
const bool bSilentlyCorrect, // input: same as for ProjectFSCK
BlockHash& missingAliasedBlockFileHash, // output: AliasBlockFiles whose aliased files are missing
wxArrayString& missingAliasedFilePathArray) // output: full paths of missing aliased files
BlockHash& missingAliasedFilePathHash) // output: full paths of missing aliased files
{
BlockHash::iterator iter = mBlockFileHash.begin();
while (iter != mBlockFileHash.end())
{
wxString key = iter->first;
wxString key = iter->first; // file name and extension
BlockFile *b = iter->second;
if (b->IsAlias())
{
wxFileName aliasedFileName = ((AliasBlockFile*)b)->GetAliasedFileName();
//vvvvv First clause should never happen when "replace with silence" works correctly.
if ((aliasedFileName.GetFullPath() != wxEmptyString) &&
wxString aliasedFileFullPath = aliasedFileName.GetFullPath();
//vvvvv wxEmptyString should never happen when "replace with silence" works correctly.
if ((aliasedFileFullPath != wxEmptyString) &&
!aliasedFileName.FileExists())
{
missingAliasedBlockFileHash[key] = b;
missingAliasedFilePathArray.Add(aliasedFileName.GetFullPath());
if (missingAliasedFilePathHash.find(aliasedFileFullPath) ==
missingAliasedFilePathHash.end()) // Add it only once.
missingAliasedFilePathHash[aliasedFileFullPath] = NULL; // Not really using the blocks here.
}
}
iter++;
}
if (!bSilentlyCorrect)
for (size_t i = 0; i < missingAliasedFilePathArray.GetCount(); i++)
wxLogWarning(_("Missing aliased audio file: %s"), missingAliasedFilePathArray[i].c_str());
{
iter = missingAliasedFilePathHash.begin();
while (iter != missingAliasedFilePathHash.end())
{
wxLogWarning(_("Missing aliased audio file: %s"), iter->first.c_str());
iter++;
}
}
}
void DirManager::FindMissingAliasBlockFiles(