mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-17 00:20:06 +02:00
Fix some comments, var names, and formatting.
This commit is contained in:
parent
5d2f9301b6
commit
66f7ec0c5c
@ -2000,12 +2000,12 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event)
|
|||||||
|
|
||||||
if (gAudacityProjects.IsEmpty() && !gIsQuitting) {
|
if (gAudacityProjects.IsEmpty() && !gIsQuitting) {
|
||||||
|
|
||||||
// LL: On the Mac, we don't want the logger open after all projects
|
|
||||||
// have been closed since it's menu will show instead of the
|
|
||||||
// common menu.
|
|
||||||
wxGetApp().mLogger->Show(false);
|
wxGetApp().mLogger->Show(false);
|
||||||
|
|
||||||
#if !defined(__WXMAC__)
|
#if !defined(__WXMAC__)
|
||||||
|
// LL: On the Mac, we don't want the logger open after all projects
|
||||||
|
// have been closed since its menu will show instead of the
|
||||||
|
// common menu.
|
||||||
if (quitOnClose) {
|
if (quitOnClose) {
|
||||||
QuitAudacity();
|
QuitAudacity();
|
||||||
}
|
}
|
||||||
@ -2453,30 +2453,27 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// This is a regular project, check it and ask user
|
// This is a regular project, check it and ask user
|
||||||
int status=GetDirManager()->ProjectFSCK(err, false);
|
int status = GetDirManager()->ProjectFSCK(err, false);
|
||||||
|
if (status & FSCKstatus_CLOSEREQ)
|
||||||
if(status & FSCKstatus_CLOSEREQ){
|
{
|
||||||
// there was an error in the load/check and the user
|
// There was an error in the load/check and the user
|
||||||
// explictly opted to close the project
|
// explictly opted to close the project.
|
||||||
|
|
||||||
mTracks->Clear(true);
|
mTracks->Clear(true);
|
||||||
|
|
||||||
mFileName = wxT("");
|
mFileName = wxT("");
|
||||||
SetProjectTitle();
|
SetProjectTitle();
|
||||||
mTrackPanel->Refresh(true);
|
mTrackPanel->Refresh(true);
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (status & FSCKstatus_CHANGED)
|
else if (status & FSCKstatus_CHANGED)
|
||||||
{
|
{
|
||||||
|
|
||||||
t = iter.First();
|
t = iter.First();
|
||||||
while (t) {
|
while (t) {
|
||||||
if (t->GetKind() == Track::Wave)
|
if (t->GetKind() == Track::Wave)
|
||||||
{
|
{
|
||||||
// Only wave tracks have a notion of "changed"
|
// Only wave tracks have a notion of "changed".
|
||||||
for (WaveClipList::compatibility_iterator it=((WaveTrack*)t)->GetClipIterator();
|
for (WaveClipList::compatibility_iterator clipIter = ((WaveTrack*)t)->GetClipIterator();
|
||||||
it; it=it->GetNext())
|
clipIter;
|
||||||
it->GetData()->MarkChanged();
|
clipIter=clipIter->GetNext())
|
||||||
|
clipIter->GetData()->MarkChanged();
|
||||||
}
|
}
|
||||||
t = iter.Next();
|
t = iter.Next();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user