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

DirManager.cpp does not depend on Sequence.cpp...

Browse Source 
... This does not yet break any dependency cycles
This commit is contained in:
Paul Licameli
2019-05-14 11:25:42 -04:00
parent 9b32fc7a2b
commit d46bb29e3a
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/DirManager.cpp
View File

@@ -94,7 +94,6 @@
#include "InconsistencyException.h"
#include "Project.h"
#include "Prefs.h"
#include "Sequence.h"
#include "widgets/Warning.h"
#include "widgets/ErrorDialog.h"
#include "widgets/ProgressDialog.h"
@@ -397,8 +396,6 @@ DirManager::DirManager()
projPath = wxT("");
projName = wxT("");
mLoadingTarget = NULL;
mLoadingTargetIdx = 0;
mMaxSamples = ~size_t(0);
// toplevel pool hash is fully populated to begin
@@ -1345,12 +1342,13 @@ BlockFilePtr DirManager::CopyBlockFile(const BlockFilePtr &b)
bool DirManager::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
{
if( mLoadingTarget == NULL )
if( !mLoadingTarget )
return false;
BlockFilePtr pBlockFile {};
BlockFilePtr &target = mLoadingTarget->at(mLoadingTargetIdx).f;
BlockFilePtr &target = mLoadingTarget();
mLoadingTarget = nullptr;
if (!wxStricmp(tag, wxT("silentblockfile"))) {
// Silent blocks don't actually have a file associated, so