Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-13 16:16:33 +01:00
Code Issues Releases Wiki Activity

ImportFileHandles

Browse Source
This commit is contained in:
Paul Licameli
2016-03-31 01:23:51 -04:00
parent 83e9e7de97
commit e6e7b73043
10 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/import/ImportFFmpeg.cpp
View File

@@ -183,7 +183,7 @@ public:
wxString GetPluginFormatDescription();
///! Probes the file and opens it if appropriate
ImportFileHandle *Open(const wxString &Filename) override;
std::unique_ptr<ImportFileHandle> Open(const wxString &Filename) override;
};
///! Does acual import, returned by FFmpegImportPlugin::Open
@@ -293,9 +293,9 @@ wxString FFmpegImportPlugin::GetPluginFormatDescription()
return DESC;
}
ImportFileHandle *FFmpegImportPlugin::Open(const wxString &filename)
std::unique_ptr<ImportFileHandle> FFmpegImportPlugin::Open(const wxString &filename)
{
FFmpegImportFileHandle *handle = new FFmpegImportFileHandle(filename);
auto handle = std::make_unique<FFmpegImportFileHandle>(filename);
//Check if we're loading explicitly supported format
wxString extension = filename.AfterLast(wxT('.'));
@@ -322,18 +322,16 @@ ImportFileHandle *FFmpegImportPlugin::Open(const wxString &filename)
}
if (!FFmpegLibsInst->ValidLibsLoaded())
{
delete handle;
return NULL;
}
// Open the file for import
bool success = handle->Init();
if (!success) {
delete handle;
return NULL;
}
return handle;
return std::move(handle);
}