1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-15 07:01:18 +02:00

Mac build fixes; and implement deleters for our imitation unique_ptr

This commit is contained in:
Paul Licameli
2016-04-10 14:15:51 -04:00
parent 2696da89cb
commit 59af732763
11 changed files with 299 additions and 236 deletions

View File

@@ -167,7 +167,7 @@ std::unique_ptr<ImportFileHandle> PCMImportPlugin::Open(const wxString &filename
//char str[1000];
//sf_error_str((SNDFILE *)NULL, str, 1000);
return NULL;
return nullptr;
} else if (file &&
(info.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_OGG) {
// mchinen 15.1.2012 - disallowing libsndfile to handle
@@ -181,7 +181,7 @@ std::unique_ptr<ImportFileHandle> PCMImportPlugin::Open(const wxString &filename
// When the bug is fixed, we can check version to avoid only
// the broken builds.
return NULL;
return nullptr;
}
return std::make_unique<PCMImportFileHandle>(filename, file, info);