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

(bug 113, "Missing Aliased Files" dialog)

Browse Source 
Re-ordered buttons so "Close project immediately" is first, per Gale's suggestion.
This commit is contained in:
v.audacity 2010-08-05 02:19:09 +00:00
parent a4407b5f70
commit bfb3c639b4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/DirManager.cpp
View File

@ -1537,13 +1537,14 @@ _("Project check detected %d external audio file(s) ('aliased files') \
msg.Printf(msgA, missingAliasFiles.size()); msg.Printf(msgA, missingAliasFiles.size());
const wxChar *buttons[] = const wxChar *buttons[] =
{_("Replace missing audio with silence (permanent upon save)"), {_("Close project immediately with no further changes"),
_("Replace missing audio with silence (permanent upon save)"),
_("Temporarily replace missing audio with silence (this session only)"), _("Temporarily replace missing audio with silence (this session only)"),
_("Close project immediately with no further changes"),
NULL}; NULL};
action = ShowMultiDialog(msg, _("Warning - Missing Aliased Files"), buttons); action = ShowMultiDialog(msg, _("Warning - Missing Aliased Files"), buttons);
if(action==2)return (ret | FSCKstatus_CLOSEREQ); if (action == 0)
return (ret | FSCKstatus_CLOSEREQ);
} }
BlockHash::iterator i=missingAliasList.begin(); BlockHash::iterator i=missingAliasList.begin();
@ -1551,7 +1552,7 @@ _("Project check detected %d external audio file(s) ('aliased files') \
AliasBlockFile *b = (AliasBlockFile *)i->second; //this is AliasBlockFile *b = (AliasBlockFile *)i->second; //this is
//safe, we checked that it's an alias block file earlier //safe, we checked that it's an alias block file earlier
if(action==0){ if (action == 1) {
//vvvvv This is incorrect in several ways. //vvvvv This is incorrect in several ways.
// It returns FSCKstatus_CHANGED, and that makes AudacityProject::OpenFile // It returns FSCKstatus_CHANGED, and that makes AudacityProject::OpenFile
// do a PushState, but the tracks lower on the stack are identical to // do a PushState, but the tracks lower on the stack are identical to
@ -1567,7 +1568,9 @@ _("Project check detected %d external audio file(s) ('aliased files') \
b->ChangeAliasedFileName(dummy); b->ChangeAliasedFileName(dummy);
b->Recover(); b->Recover();
ret |= FSCKstatus_CHANGED; ret |= FSCKstatus_CHANGED;
}else if(action==1){ }
else if (action == 1)
{
// silence the log for this session // silence the log for this session
//vvvvv Note, then, that "temporarily replace with silence" is really not what's done. //vvvvv Note, then, that "temporarily replace with silence" is really not what's done.
// Also, doesn't change the waveform to silence. // Also, doesn't change the waveform to silence.