mirror of
https://github.com/cookiengineer/audacity
synced 2025-09-24 16:01:16 +02:00
Fix some old typos, indentations.
Clarify some comments. Remove some DirManager methods that were declared but not defined.
This commit is contained in:
parent
536af8ad52
commit
ad09727b7f
@ -48,6 +48,8 @@
|
||||
|
||||
#include "Audacity.h"
|
||||
|
||||
#include <time.h> // to use time() for srand()
|
||||
|
||||
#include <wx/defs.h>
|
||||
#include <wx/app.h>
|
||||
#include <wx/dir.h>
|
||||
@ -68,9 +70,6 @@
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
// seed random number generator
|
||||
#include <time.h>
|
||||
|
||||
#include "AudacityApp.h"
|
||||
#include "BlockFile.h"
|
||||
#include "blockfile/LegacyBlockFile.h"
|
||||
@ -311,9 +310,10 @@ DirManager::DirManager()
|
||||
|
||||
mRef = 1; // MM: Initial refcount is 1 by convention
|
||||
|
||||
// Seed the random number generator.
|
||||
// this need not be strictly uniform or random, but it should give
|
||||
// unclustered numbers
|
||||
srand(time(0));
|
||||
srand(time(NULL));
|
||||
|
||||
// Set up local temp subdir
|
||||
// Previously, Audacity just named project temp directories "project0",
|
||||
|
@ -120,17 +120,17 @@ class DirManager: public XMLTagHandler {
|
||||
int ProjectFSCK(const bool bForceError, const bool bSilentlyCorrect);
|
||||
|
||||
void FindMissingAliasedFiles(
|
||||
const bool bSilentlyCorrect, // input: same as for ProjectFSCK
|
||||
const bool bSilentlyCorrect, // input: true => do not log warnings on files
|
||||
BlockHash& missingAliasedFileAUFHash, // output: (.auf) AliasBlockFiles whose aliased files are missing
|
||||
BlockHash& missingAliasedFilePathHash); // output: full paths of missing aliased files
|
||||
void FindMissingAUFs(
|
||||
const bool bSilentlyCorrect, // input: same as for ProjectFSCK
|
||||
const bool bSilentlyCorrect, // input: true => do not log warnings on files
|
||||
BlockHash& missingAUFHash); // output: missing (.auf) AliasBlockFiles
|
||||
void FindMissingAUs(
|
||||
const bool bSilentlyCorrect, // input: same as for ProjectFSCK
|
||||
const bool bSilentlyCorrect, // input: true => do not log warnings on files
|
||||
BlockHash& missingAUHash); // missing data (.au) blockfiles
|
||||
void FindOrphanBlockFiles( // Find .au and .auf files that are not in the project.
|
||||
const bool bSilentlyCorrect, // input: same as for ProjectFSCK
|
||||
const bool bSilentlyCorrect, // input: true => do not log warnings on files
|
||||
const wxArrayString& filePathArray, // input: all files in project directory
|
||||
wxArrayString& orphanFilePathArray); // output: orphan files
|
||||
|
||||
@ -159,17 +159,9 @@ class DirManager: public XMLTagHandler {
|
||||
|
||||
private:
|
||||
|
||||
// Create new unique track name
|
||||
wxString NewTrackName();
|
||||
|
||||
wxFileName MakeBlockFileName();
|
||||
wxFileName MakeBlockFilePath(wxString value);
|
||||
|
||||
// Create new unique names
|
||||
wxString NewTempBlockName();
|
||||
wxString NewBlockName();
|
||||
|
||||
//////////////////////////
|
||||
|
||||
int mRef; // MM: Current refcount
|
||||
|
||||
|
@ -724,11 +724,10 @@ void AudacityProject::CreateMenusAndCommands()
|
||||
#endif
|
||||
|
||||
c->AddItem(wxT("AddLabel"), _("Add Label At &Selection"), FN(OnAddLabel), wxT("Ctrl+B"),
|
||||
AlwaysEnabledFlag,
|
||||
AlwaysEnabledFlag);
|
||||
c->AddItem(wxT("AddLabelPlaying"), _("Add Label At &Playback Position"), FN(OnAddLabelPlaying), wxT("Ctrl+M"),
|
||||
0,
|
||||
AudioIONotBusyFlag);
|
||||
AlwaysEnabledFlag, AlwaysEnabledFlag);
|
||||
c->AddItem(wxT("AddLabelPlaying"), _("Add Label At &Playback Position"),
|
||||
FN(OnAddLabelPlaying), wxT("Ctrl+M"),
|
||||
0, AudioIONotBusyFlag);
|
||||
c->AddItem(wxT("EditLabels"), _("&Edit Labels"), FN(OnEditLabels));
|
||||
|
||||
c->AddSeparator();
|
||||
|
@ -323,13 +323,13 @@ Track *TrackListIterator::Last(bool skiplinked)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Track *TrackListIterator::Next(bool SkipLinked)
|
||||
Track *TrackListIterator::Next(bool skipLinked)
|
||||
{
|
||||
#ifdef DEBUG_TLI // if we are debugging this bit
|
||||
wxASSERT_MSG((!cur || (*l).Contains((*cur).t)), wxT("cur invalid at start of Next(). List changed since iterator created?")); // check that cur is in the list
|
||||
#endif
|
||||
|
||||
if (SkipLinked && cur && cur->t->GetLinked()) {
|
||||
if (skipLinked && cur && cur->t->GetLinked()) {
|
||||
cur = cur->next;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user