Remove ImportRaw.h from other headers

src/ProjectFileManager.h

@@ -15,7 +15,6 @@ Paul Licameli split from AudacityProject.h
 #include <vector>
 
 #include "ClientData.h" // to inherit
-#include "import/ImportRaw.h" // defines TrackHolders
 #include "FileNames.h" // for FileType
 
 class wxString;
@@ -30,6 +29,7 @@ class XMLTagHandler;
 namespace ProjectFileIORegistry{ struct Entry; }
 
 using WaveTrackArray = std::vector < std::shared_ptr < WaveTrack > >;
+using TrackHolders = std::vector< WaveTrackArray >;
 
 class ProjectFileManager final
    : public ClientData::Base

src/import/Import.cpp

@@ -58,6 +58,8 @@ and ImportLOF.cpp.
 
 #include "../widgets/ProgressDialog.h"
 
+using NewChannelGroup = std::vector< std::shared_ptr<WaveTrack> >;
+
 // ============================================================================
 //
 // Return reference to singleton

src/import/Import.h

@@ -11,7 +11,6 @@
 #ifndef _IMPORT_
 #define _IMPORT_
 
-#include "ImportRaw.h" // defines TrackHolders
 #include "ImportForwards.h"
 #include "audacity/Types.h"
 #include <vector>
@@ -34,8 +33,10 @@ class UnusableImportPlugin;
 typedef bool (*progress_callback_t)( void *userData, float percent );
 
 class ExtImportItem;
+class WaveTrack;
 
 using ExtImportItems = std::vector< std::unique_ptr<ExtImportItem> >;
+using TrackHolders = std::vector< std::vector< std::shared_ptr<WaveTrack> > >;
 
 class ExtImportItem
 {

src/import/ImportFLAC.cpp

@@ -94,6 +94,7 @@ extern "C" {
 
 
 class FLACImportFileHandle;
+using NewChannelGroup = std::vector< std::shared_ptr<WaveTrack> >;
 
 class MyFLACFile final : public FLAC::Decoder::File
 {

src/import/ImportMP3.cpp

@@ -100,6 +100,8 @@ public:
    std::unique_ptr<ImportFileHandle> Open(const FilePath &Filename, AudacityProject*) override;
 };
 
+using NewChannelGroup = std::vector< std::shared_ptr<WaveTrack> >;
+
 class MP3ImportFileHandle final : public ImportFileHandle
 {
 public:

src/import/ImportOGG.cpp

@@ -77,6 +77,8 @@ static Importer::RegisteredUnusableImportPlugin registered{
 #include "../WaveTrack.h"
 #include "ImportPlugin.h"
 
+using NewChannelGroup = std::vector< std::shared_ptr<WaveTrack> >;
+
 class OggImportPlugin final : public ImportPlugin
 {
 public:

src/import/ImportPCM.cpp

@@ -404,6 +404,8 @@ struct id3_tag_deleter {
 using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
 #endif
 
+using NewChannelGroup = std::vector< std::shared_ptr<WaveTrack> >;
+
 ProgressResult PCMImportFileHandle::Import(TrackFactory *trackFactory,
                                 TrackHolders &outTracks,
                                 Tags *tags)

src/import/ImportPlugin.h

@@ -49,8 +49,7 @@ but little else.
 
 #include "audacity/Types.h"
 #include "../Internat.h"
-
-#include "ImportRaw.h" // defines TrackHolders
+#include "../MemoryX.h"
 
 class AudacityProject;
 class ProgressDialog;
@@ -108,6 +107,9 @@ protected:
 };
 
 
+class WaveTrack;
+using TrackHolders = std::vector< std::vector< std::shared_ptr<WaveTrack> > >;
+
 class ImportFileHandle /* not final */
 {
 public:

src/menus/FileMenus.cpp

@@ -23,6 +23,7 @@
 #include "../export/ExportMultiple.h"
 #include "../import/Import.h"
 #include "../import/ImportMIDI.h"
+#include "../import/ImportRaw.h"
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/FileHistory.h"
 

src/ondemand/ODDecodeFFmpegTask.h

@@ -16,7 +16,6 @@
 
 #ifdef EXPERIMENTAL_OD_FFMPEG
 
-#include "../import/ImportRaw.h" // for TrackHolders
 #include <vector>
 #include "ODDecodeTask.h"
 
@@ -27,6 +26,9 @@ using ScsPtr = std::shared_ptr<Scs>;
 struct FFmpegContext;
 class ODFileDecoder;
 class WaveTrack;
+using NewChannelGroup = std::vector< std::shared_ptr<WaveTrack> >;
+using TrackHolders = std::vector< NewChannelGroup >;
+
 /// A class representing a modular task to be used with the On-Demand structures.
 class ODDecodeFFmpegTask final : public ODDecodeTask
 {