From 7d89e5ff6887f0a1c070a62eab3e51c4bed8c85c Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 10 Aug 2016 22:17:17 -0400 Subject: [PATCH] Pass containers by ref to import plugin factories, use STL idiom --- src/import/Import.cpp | 16 ++++++++-------- src/import/ImportFFmpeg.cpp | 6 +++--- src/import/ImportFFmpeg.h | 4 ++-- src/import/ImportFLAC.cpp | 12 ++++++------ src/import/ImportFLAC.h | 4 ++-- src/import/ImportGStreamer.cpp | 6 +++--- src/import/ImportGStreamer.h | 4 ++-- src/import/ImportLOF.cpp | 6 +++--- src/import/ImportLOF.h | 4 ++-- src/import/ImportMP3.cpp | 12 ++++++------ src/import/ImportMP3.h | 4 ++-- src/import/ImportOGG.cpp | 12 ++++++------ src/import/ImportOGG.h | 4 ++-- src/import/ImportPCM.cpp | 6 +++--- src/import/ImportPCM.h | 4 ++-- src/import/ImportQT.cpp | 12 ++++++------ src/import/ImportQT.h | 4 ++-- 17 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/import/Import.cpp b/src/import/Import.cpp index a52b893d1..9f2537868 100644 --- a/src/import/Import.cpp +++ b/src/import/Import.cpp @@ -101,20 +101,20 @@ bool Importer::Initialize() // build the list of import plugin and/or unusableImporters. // order is significant. If none match, they will all be tried // in the order defined here. - GetPCMImportPlugin(mImportPluginList, mUnusableImportPluginList); - GetOGGImportPlugin(mImportPluginList, mUnusableImportPluginList); - GetFLACImportPlugin(mImportPluginList, mUnusableImportPluginList); - GetMP3ImportPlugin(mImportPluginList, mUnusableImportPluginList); - GetLOFImportPlugin(mImportPluginList, mUnusableImportPluginList); + GetPCMImportPlugin(*mImportPluginList, *mUnusableImportPluginList); + GetOGGImportPlugin(*mImportPluginList, *mUnusableImportPluginList); + GetFLACImportPlugin(*mImportPluginList, *mUnusableImportPluginList); + GetMP3ImportPlugin(*mImportPluginList, *mUnusableImportPluginList); + GetLOFImportPlugin(*mImportPluginList, *mUnusableImportPluginList); #if defined(USE_FFMPEG) - GetFFmpegImportPlugin(mImportPluginList, mUnusableImportPluginList); + GetFFmpegImportPlugin(*mImportPluginList, *mUnusableImportPluginList); #endif #ifdef USE_QUICKTIME - GetQTImportPlugin(mImportPluginList, mUnusableImportPluginList); + GetQTImportPlugin(*mImportPluginList, *mUnusableImportPluginList); #endif #if defined(USE_GSTREAMER) - GetGStreamerImportPlugin(mImportPluginList, mUnusableImportPluginList); + GetGStreamerImportPlugin(*mImportPluginList, *mUnusableImportPluginList); #endif ReadImportItems(); diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp index beff6bdb4..07b2118f2 100644 --- a/src/import/ImportFFmpeg.cpp +++ b/src/import/ImportFFmpeg.cpp @@ -283,10 +283,10 @@ private: }; -void GetFFmpegImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *WXUNUSED(unusableImportPluginList)) +void GetFFmpegImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &WXUNUSED(unusableImportPluginList)) { - importPluginList->Append(new FFmpegImportPlugin); + importPluginList.push_back( new FFmpegImportPlugin ); } diff --git a/src/import/ImportFFmpeg.h b/src/import/ImportFFmpeg.h index 41395ce18..e5a48699f 100644 --- a/src/import/ImportFFmpeg.h +++ b/src/import/ImportFFmpeg.h @@ -13,7 +13,7 @@ LRN #include "ImportForwards.h" -void GetFFmpegImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList); +void GetFFmpegImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList); #endif diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp index 7c11a0d66..51ae08f74 100644 --- a/src/import/ImportFLAC.cpp +++ b/src/import/ImportFLAC.cpp @@ -56,13 +56,13 @@ static const wxChar *exts[] = #ifndef USE_LIBFLAC -void GetFLACImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) +void GetFLACImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList) { UnusableImportPlugin* flacIsUnsupported = new UnusableImportPlugin(DESC, wxArrayString(WXSIZEOF(exts), exts)); - unusableImportPluginList->Append(flacIsUnsupported); + unusableImportPluginList.push_back( flacIsUnsupported ); } #else /* USE_LIBFLAC */ @@ -282,10 +282,10 @@ FLAC__StreamDecoderWriteStatus MyFLACFile::write_callback(const FLAC__Frame *fra } -void GetFLACImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *WXUNUSED(unusableImportPluginList)) +void GetFLACImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &WXUNUSED(unusableImportPluginList)) { - importPluginList->Append(new FLACImportPlugin); + importPluginList.push_back( new FLACImportPlugin ); } diff --git a/src/import/ImportFLAC.h b/src/import/ImportFLAC.h index 0dc38ca8b..75c158e23 100644 --- a/src/import/ImportFLAC.h +++ b/src/import/ImportFLAC.h @@ -13,8 +13,8 @@ #include "ImportForwards.h" -void GetFLACImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList); +void GetFLACImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList); #endif diff --git a/src/import/ImportGStreamer.cpp b/src/import/ImportGStreamer.cpp index 4c54dd54d..e760feadb 100644 --- a/src/import/ImportGStreamer.cpp +++ b/src/import/ImportGStreamer.cpp @@ -261,8 +261,8 @@ public: // ---------------------------------------------------------------------------- // Instantiate GStreamerImportPlugin and add to the list of known importers void -GetGStreamerImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList * WXUNUSED(unusableImportPluginList)) +GetGStreamerImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList & WXUNUSED(unusableImportPluginList)) { wxLogMessage(wxT("Audacity is built against GStreamer version %d.%d.%d-%d"), GST_VERSION_MAJOR, @@ -300,7 +300,7 @@ GetGStreamerImportPlugin(ImportPluginList *importPluginList, return; // Add to list of importers - importPluginList->push_back(std::move(plug)); + importPluginList.push_back( plug.release() ); } // ============================================================================ diff --git a/src/import/ImportGStreamer.h b/src/import/ImportGStreamer.h index 5923820f3..373a352b0 100644 --- a/src/import/ImportGStreamer.h +++ b/src/import/ImportGStreamer.h @@ -13,7 +13,7 @@ LRN #include "ImportPlugin.h" -void GetGStreamerImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList); +void GetGStreamerImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList); #endif diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp index a618a73ec..f92c3d0f8 100644 --- a/src/import/ImportLOF.cpp +++ b/src/import/ImportLOF.cpp @@ -175,10 +175,10 @@ LOFImportFileHandle::LOFImportFileHandle scrollOffset = 0; } -void GetLOFImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList * WXUNUSED(unusableImportPluginList)) +void GetLOFImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList & WXUNUSED(unusableImportPluginList)) { - importPluginList->Append(new LOFImportPlugin); + importPluginList.push_back( new LOFImportPlugin ); } wxString LOFImportPlugin::GetPluginFormatDescription() diff --git a/src/import/ImportLOF.h b/src/import/ImportLOF.h index af2a51e1c..48843382d 100644 --- a/src/import/ImportLOF.h +++ b/src/import/ImportLOF.h @@ -56,7 +56,7 @@ #include "ImportForwards.h" -void GetLOFImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList); +void GetLOFImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList); #endif diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp index 30daf344b..cacec2346 100644 --- a/src/import/ImportMP3.cpp +++ b/src/import/ImportMP3.cpp @@ -56,13 +56,13 @@ static const wxChar *exts[] = #ifndef USE_LIBMAD -void GetMP3ImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) +void GetMP3ImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList) { UnusableImportPlugin* mp3IsUnsupported = new UnusableImportPlugin(DESC, wxArrayString(WXSIZEOF(exts), exts)); - unusableImportPluginList->Append(mp3IsUnsupported); + unusableImportPluginList.push_back( mp3IsUnsupported ); } #else /* USE_LIBMAD */ @@ -153,10 +153,10 @@ private: mad_decoder mDecoder; }; -void GetMP3ImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList * WXUNUSED(unusableImportPluginList)) +void GetMP3ImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList & WXUNUSED(unusableImportPluginList)) { - importPluginList->Append(new MP3ImportPlugin); + importPluginList.push_back( new MP3ImportPlugin ); } /* The MAD callbacks */ diff --git a/src/import/ImportMP3.h b/src/import/ImportMP3.h index bebd28c34..5a4c9a8bf 100644 --- a/src/import/ImportMP3.h +++ b/src/import/ImportMP3.h @@ -13,7 +13,7 @@ #include "ImportForwards.h" -void GetMP3ImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList); +void GetMP3ImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList); #endif diff --git a/src/import/ImportOGG.cpp b/src/import/ImportOGG.cpp index e81cc8e42..81c13ef03 100644 --- a/src/import/ImportOGG.cpp +++ b/src/import/ImportOGG.cpp @@ -55,13 +55,13 @@ static const wxChar *exts[] = /* BPF There is no real reason to compile without LIBVORBIS, but if you do, you will needs this header */ #include "ImportPlugin.h" -void GetOGGImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) +void GetOGGImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList) { UnusableImportPlugin* oggIsUnsupported = new UnusableImportPlugin(DESC, wxArrayString(WXSIZEOF(exts), exts)); - unusableImportPluginList->Append(oggIsUnsupported); + unusableImportPluginList.push_back( oggIsUnsupported ); } #else /* USE_LIBVORBIS */ @@ -160,10 +160,10 @@ private: sampleFormat mFormat; }; -void GetOGGImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList * WXUNUSED(unusableImportPluginList)) +void GetOGGImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList & WXUNUSED(unusableImportPluginList)) { - importPluginList->Append(new OggImportPlugin); + importPluginList.push_back( new OggImportPlugin ); } wxString OggImportPlugin::GetPluginFormatDescription() diff --git a/src/import/ImportOGG.h b/src/import/ImportOGG.h index 946384188..731020762 100644 --- a/src/import/ImportOGG.h +++ b/src/import/ImportOGG.h @@ -13,7 +13,7 @@ #include "ImportForwards.h" -void GetOGGImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList); +void GetOGGImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList); #endif diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp index cce787a00..180a98cbf 100644 --- a/src/import/ImportPCM.cpp +++ b/src/import/ImportPCM.cpp @@ -113,10 +113,10 @@ private: sampleFormat mFormat; }; -void GetPCMImportPlugin(ImportPluginList * importPluginList, - UnusableImportPluginList * WXUNUSED(unusableImportPluginList)) +void GetPCMImportPlugin(ImportPluginList & importPluginList, + UnusableImportPluginList & WXUNUSED(unusableImportPluginList)) { - importPluginList->Append(new PCMImportPlugin); + importPluginList.push_back( new PCMImportPlugin ); } wxString PCMImportPlugin::GetPluginFormatDescription() diff --git a/src/import/ImportPCM.h b/src/import/ImportPCM.h index ead1e4bf7..9d444742c 100644 --- a/src/import/ImportPCM.h +++ b/src/import/ImportPCM.h @@ -13,8 +13,8 @@ #include "ImportForwards.h" -void GetPCMImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList); +void GetPCMImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList); #endif diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp index c7438392d..3168d039a 100644 --- a/src/import/ImportQT.cpp +++ b/src/import/ImportQT.cpp @@ -27,13 +27,13 @@ static const wxChar *exts[] = #ifndef USE_QUICKTIME -void GetQTImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) +void GetQTImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList) { UnusableImportPlugin* qtIsUnsupported = new UnusableImportPlugin(DESC, wxArrayString(WXSIZEOF(exts), exts)); - unusableImportPluginList->Append(qtIsUnsupported); + unusableImportPluginList.push_back( qtIsUnsupported ); } #else /* USE_QUICKTIME */ @@ -162,10 +162,10 @@ class QTImportFileHandle final : public ImportFileHandle Movie mMovie; }; -void GetQTImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) +void GetQTImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList) { - importPluginList->Append(new QTImportPlugin); + importPluginList.push_back( new QTImportPlugin ); } wxString QTImportPlugin::GetPluginFormatDescription() diff --git a/src/import/ImportQT.h b/src/import/ImportQT.h index c4c374285..7ca9ada98 100644 --- a/src/import/ImportQT.h +++ b/src/import/ImportQT.h @@ -13,7 +13,7 @@ #include "ImportForwards.h" -void GetQTImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList); +void GetQTImportPlugin(ImportPluginList &importPluginList, + UnusableImportPluginList &unusableImportPluginList); #endif