Return wide type from ImportFileHandle::GetFileUncompressedBytes()...

... and use override.  But this function isn't (yet?) used anywhere.

src/import/ImportFFmpeg.cpp

@@ -204,7 +204,7 @@ public:
 
 
    wxString GetFileDescription();
-   int GetFileUncompressedBytes();
+   ByteCount GetFileUncompressedBytes() override;
 
    ///! Imports audio
    ///\return import status (see Import.cpp)
@@ -460,7 +460,7 @@ wxString FFmpegImportFileHandle::GetFileDescription()
 }
 
 
-int FFmpegImportFileHandle::GetFileUncompressedBytes()
+auto FFmpegImportFileHandle::GetFileUncompressedBytes() -> ByteCount
 {
    // TODO: Get Uncompressed byte count.
    return 0;

src/import/ImportFLAC.cpp

@@ -153,7 +153,7 @@ public:
    bool Init();
 
    wxString GetFileDescription();
-   int GetFileUncompressedBytes();
+   ByteCount GetFileUncompressedBytes() override;
    int Import(TrackFactory *trackFactory, TrackHolders &outTracks,
               Tags *tags) override;
 
@@ -427,7 +427,7 @@ wxString FLACImportFileHandle::GetFileDescription()
 }
 
 
-int FLACImportFileHandle::GetFileUncompressedBytes()
+auto FLACImportFileHandle::GetFileUncompressedBytes() -> ByteCount
 {
    // TODO: Get Uncompressed byte count.
    return 0;

src/import/ImportGStreamer.cpp

@@ -170,7 +170,7 @@ public:
    bool Init();
 
    wxString GetFileDescription();
-   int GetFileUncompressedBytes();
+   ByteCount GetFileUncompressedBytes() override;
 
    ///! Called by Import.cpp
    ///\return number of readable audio streams in the file
@@ -1005,8 +1005,8 @@ GStreamerImportFileHandle::GetFileDescription()
 
 // ----------------------------------------------------------------------------
 // Return number of uncompressed bytes in file...doubtful this is possible
-int
-GStreamerImportFileHandle::GetFileUncompressedBytes()
+auto
+GStreamerImportFileHandle::GetFileUncompressedBytes() -> ByteCount
 {
    return 0;
 }

src/import/ImportLOF.cpp

@@ -124,7 +124,7 @@ public:
    ~LOFImportFileHandle();
 
    wxString GetFileDescription();
-   int GetFileUncompressedBytes();
+   ByteCount GetFileUncompressedBytes() override;
    int Import(TrackFactory *trackFactory, TrackHolders &outTracks,
               Tags *tags) override;
 
@@ -226,7 +226,7 @@ wxString LOFImportFileHandle::GetFileDescription()
    return DESC;
 }
 
-int LOFImportFileHandle::GetFileUncompressedBytes()
+auto LOFImportFileHandle::GetFileUncompressedBytes() -> ByteCount
 {
    return 0;
 }

src/import/ImportMP3.cpp

@@ -130,7 +130,7 @@ public:
    ~MP3ImportFileHandle();
 
    wxString GetFileDescription();
-   int GetFileUncompressedBytes();
+   ByteCount GetFileUncompressedBytes() override;
    int Import(TrackFactory *trackFactory, TrackHolders &outTracks,
               Tags *tags) override;
 
@@ -199,7 +199,7 @@ wxString MP3ImportFileHandle::GetFileDescription()
    return DESC;
 }
 
-int MP3ImportFileHandle::GetFileUncompressedBytes()
+auto MP3ImportFileHandle::GetFileUncompressedBytes() -> ByteCount
 {
    // TODO
    return 0;

src/import/ImportOGG.cpp

@@ -123,7 +123,7 @@ public:
    ~OggImportFileHandle();
 
    wxString GetFileDescription();
-   int GetFileUncompressedBytes();
+   ByteCount GetFileUncompressedBytes() override;
    int Import(TrackFactory *trackFactory, TrackHolders &outTracks,
               Tags *tags) override;
 
@@ -223,7 +223,7 @@ wxString OggImportFileHandle::GetFileDescription()
    return DESC;
 }
 
-int OggImportFileHandle::GetFileUncompressedBytes()
+auto OggImportFileHandle::GetFileUncompressedBytes() -> ByteCount
 {
    // TODO:
    return 0;

src/import/ImportPCM.cpp

@@ -93,7 +93,7 @@ public:
    ~PCMImportFileHandle();
 
    wxString GetFileDescription();
-   int GetFileUncompressedBytes();
+   ByteCount GetFileUncompressedBytes() override;
    int Import(TrackFactory *trackFactory, TrackHolders &outTracks,
               Tags *tags) override;
 
@@ -215,7 +215,7 @@ wxString PCMImportFileHandle::GetFileDescription()
    return SFCall<wxString>(sf_header_name, mInfo.format);
 }
 
-int PCMImportFileHandle::GetFileUncompressedBytes()
+auto PCMImportFileHandle::GetFileUncompressedBytes() -> ByteCount
 {
    return mInfo.frames * mInfo.channels * SAMPLE_SIZE(mFormat);
 }

src/import/ImportPlugin.h

@@ -147,8 +147,10 @@ public:
    virtual wxString GetFileDescription() = 0;
 
    // Return an estimate of how many bytes the file will occupy once
-   // imported
-   virtual int GetFileUncompressedBytes() = 0;
+   // imported.  In principle this may exceed main memory, so don't use
+   // size_t.
+   using ByteCount = unsigned long long;
+   virtual ByteCount GetFileUncompressedBytes() = 0;
 
    // do the actual import, creating whatever tracks are necessary with
    // the TrackFactory and calling the progress callback every iteration

src/import/ImportQT.cpp

@@ -135,7 +135,7 @@ class QTImportFileHandle final : public ImportFileHandle
    }
 
    wxString GetFileDescription();
-   int GetFileUncompressedBytes();
+   ByteCount GetFileUncompressedBytes() override;
 
    wxInt32 GetStreamCount()
    {
@@ -219,7 +219,7 @@ wxString QTImportFileHandle::GetFileDescription()
    return DESC;
 }
 
-int QTImportFileHandle::GetFileUncompressedBytes()
+auto QTImportFileHandle::GetFileUncompressedBytes() -> ByteCount
 {
    return 0;
 }
@@ -460,8 +460,8 @@ void QTImportFileHandle::AddMetadata(Tags *tags)
 
       QTPropertyValuePtr outValPtr = nil;
       QTPropertyValueType outPropType;
-      ByteCount outPropValueSize;
-      ByteCount outPropValueSizeUsed = 0;
+      ::ByteCount outPropValueSize;
+      ::ByteCount outPropValueSizeUsed = 0;
       UInt32 outPropFlags;
       UInt32 dataType;