1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-07 12:12:23 +01:00

BlockFile.cpp does not depend on MissingAliasFileDialog.cpp ...

... instead use a hook function to call back when it is discovered that a
block file is missing.

This frees three files from dependency cycles
This commit is contained in:
Paul Licameli
2019-05-12 13:02:23 -04:00
parent 96ffc424cf
commit ce27977ff2
3 changed files with 39 additions and 3 deletions

View File

@@ -53,7 +53,6 @@ out.
#include "sndfile.h"
#include "FileException.h"
#include "FileFormats.h"
#include "MissingAliasFileDialog.h"
// msmeyer: Define this to add debug output via wxPrintf()
//#define DEBUG_BLOCKFILE
@@ -479,6 +478,23 @@ bool BlockFile::Read64K(float *buffer,
return result;
}
namespace {
BlockFile::MissingAliasFileFoundHook &GetMissingAliasFileFound()
{
static BlockFile::MissingAliasFileFoundHook theHook;
return theHook;
}
}
auto BlockFile::SetMissingAliasFileFound( MissingAliasFileFoundHook hook )
-> MissingAliasFileFoundHook
{
auto &theHook = GetMissingAliasFileFound();
auto result = theHook;
theHook = hook;
return result;
}
size_t BlockFile::CommonReadData(
bool mayThrow,
const wxFileName &fileName, bool &mSilentLog,
@@ -537,8 +553,9 @@ size_t BlockFile::CommonReadData(
if (pAliasFile) {
// Set a marker to display an error message for the silence
if (!MissingAliasFilesDialog::ShouldShow())
MissingAliasFilesDialog::Mark(pAliasFile);
auto hook = GetMissingAliasFileFound();
if (hook)
hook( pAliasFile );
}
}
}