Merge pull request xbmc#22017 from notspiff/file_header_cleanup

Some filesystem/File.h header cleanup
Spacetech · Oct 11, 2022 · 98eac2e · 98eac2e
2 parents d8a36ca + c0f06dd
commit 98eac2e
Show file tree

Hide file tree

Showing 28 changed files with 64 additions and 35 deletions.
diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
@@ -26,6 +26,7 @@
 #include "events/NotificationEvent.h"
 #include "favourites/FavouritesService.h"
 #include "filesystem/Directory.h"
+#include "filesystem/File.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h" // for callback
 #include "guilib/LocalizeStrings.h"

diff --git a/xbmc/addons/FilesystemInstaller.cpp b/xbmc/addons/FilesystemInstaller.cpp
@@ -9,6 +9,7 @@
 
 #include "FileItem.h"
 #include "filesystem/Directory.h"
+#include "filesystem/File.h"
 #include "filesystem/SpecialProtocol.h"
 #include "utils/FileOperationJob.h"
 #include "utils/StringUtils.h"

diff --git a/xbmc/addons/settings/AddonSettings.cpp b/xbmc/addons/settings/AddonSettings.cpp
@@ -17,7 +17,6 @@
 #include "addons/gui/GUIDialogAddonSettings.h"
 #include "addons/settings/SettingUrlEncodedString.h"
 #include "filesystem/Directory.h"
-#include "filesystem/File.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/LocalizeStrings.h"
 #include "messaging/ApplicationMessenger.h"

diff --git a/xbmc/application/Application.cpp b/xbmc/application/Application.cpp
@@ -36,6 +36,7 @@
 #include "dialogs/GUIDialogKaiToast.h"
 #include "events/EventLog.h"
 #include "events/NotificationEvent.h"
+#include "filesystem/File.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIControlProfiler.h"
 #include "guilib/GUIFontManager.h"

diff --git a/xbmc/cdrip/Encoder.cpp b/xbmc/cdrip/Encoder.cpp
@@ -8,13 +8,16 @@
 
 #include "Encoder.h"
 
+#include "filesystem/File.h"
 #include "utils/log.h"
 
 #include <string.h>
 #include <utility>
 
 using namespace KODI::CDRIP;
 
+CEncoder::CEncoder() = default;
+
 CEncoder::~CEncoder()
 {
   FileClose();

diff --git a/xbmc/cdrip/Encoder.h b/xbmc/cdrip/Encoder.h
@@ -9,13 +9,17 @@
 #pragma once
 
 #include "IEncoder.h"
-#include "filesystem/File.h"
 
 #include <memory>
 #include <stdint.h>
 #include <stdio.h>
 #include <string>
 
+namespace XFILE
+{
+class CFile;
+}
+
 namespace KODI
 {
 namespace CDRIP
@@ -26,7 +30,7 @@ constexpr size_t WRITEBUFFER_SIZE = 131072; // 128k buffer
 class CEncoder : public IEncoder
 {
 public:
-  CEncoder() = default;
+  CEncoder();
   virtual ~CEncoder();
 
   bool EncoderInit(const std::string& strFile, int iInChannels, int iInRate, int iInBits);

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp
@@ -6,9 +6,11 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include "cores/AudioEngine/Interfaces/AESound.h"
-#include "ActiveAE.h"
 #include "ActiveAESound.h"
+
+#include "ActiveAE.h"
+#include "cores/AudioEngine/Interfaces/AESound.h"
+#include "filesystem/File.h"
 #include "utils/log.h"
 
 extern "C" {

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.h
@@ -10,10 +10,14 @@
 
 #include "cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h"
 #include "cores/AudioEngine/Interfaces/AESound.h"
-#include "filesystem/File.h"
 
 class DllAvUtil;
 
+namespace XFILE
+{
+class CFile;
+}
+
 namespace ActiveAE
 {
 

diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
@@ -16,7 +16,6 @@
 #include "URL.h"
 #include "filesystem/BlurayCallback.h"
 #include "filesystem/Directory.h"
-#include "filesystem/File.h"
 #include "filesystem/SpecialProtocol.h"
 #include "guilib/LocalizeStrings.h"
 #include "settings/DiscSettings.h"

diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamMultiSource.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamMultiSource.cpp
@@ -9,8 +9,6 @@
 #include "InputStreamMultiSource.h"
 
 #include "DVDFactoryInputStream.h"
-#include "filesystem/File.h"
-#include "utils/StringUtils.h"
 #include "utils/log.h"
 
 #include <map>

diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp
@@ -10,7 +10,6 @@
 
 #include "DVDInputStreams/DVDFactoryInputStream.h"
 #include "DVDInputStreams/DVDInputStream.h"
-#include "filesystem/File.h"
 #include "utils/CharsetConverter.h"
 #include "utils/CharsetDetection.h"
 #include "utils/URIUtils.h"

diff --git a/xbmc/cores/paplayer/AudioDecoder.cpp b/xbmc/cores/paplayer/AudioDecoder.cpp
@@ -10,6 +10,7 @@
 
 #include "CodecFactory.h"
 #include "FileItem.h"
+#include "ICodec.h"
 #include "ServiceBroker.h"
 #include "application/Application.h"
 #include "music/tags/MusicInfoTag.h"
@@ -141,6 +142,11 @@ AEAudioFormat CAudioDecoder::GetFormat()
   return m_codec->m_format;
 }
 
+unsigned int CAudioDecoder::GetChannels()
+{
+  return GetFormat().m_channelLayout.Count();
+}
+
 int64_t CAudioDecoder::Seek(int64_t time)
 {
   m_pcmBuffer.Clear();
@@ -328,6 +334,14 @@ int CAudioDecoder::ReadSamples(int numsamples)
   return RET_SLEEP; // nothing to do
 }
 
+bool CAudioDecoder::CanSeek()
+{
+  if (m_codec)
+    return m_codec->CanSeek();
+  else
+    return false;
+}
+
 float CAudioDecoder::GetReplayGain(float &peakVal)
 {
 #define REPLAY_GAIN_DEFAULT_LEVEL 89.0f

diff --git a/xbmc/cores/paplayer/AudioDecoder.h b/xbmc/cores/paplayer/AudioDecoder.h
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "ICodec.h"
-#include "cores/AudioEngine/Utils/AEChannelInfo.h"
 #include "threads/CriticalSection.h"
 #include "utils/RingBuffer.h"
 
+struct AEAudioFormat;
 class CFileItem;
+class ICodec;
 
 #define PACKET_SIZE 3840    // audio packet size - we keep 1 in reserve for gapless playback
                             // using a multiple of 1, 2, 3, 4, 5, 6 to guarantee track alignment
@@ -48,13 +48,7 @@ class CAudioDecoder
 
   int ReadSamples(int numsamples);
 
-  bool CanSeek()
-  {
-    if (m_codec)
-      return m_codec->CanSeek();
-    else
-      return false;
-  }
+  bool CanSeek();
   int64_t Seek(int64_t time);
   int64_t TotalTime();
   void SetTotalTime(int64_t time);
@@ -63,7 +57,7 @@ class CAudioDecoder
   void SetStatus(int status) { m_status = status; }
 
   AEAudioFormat GetFormat();
-  unsigned int GetChannels() { return GetFormat().m_channelLayout.Count(); }
+  unsigned int GetChannels();
   // Data management
   unsigned int GetDataSize(bool checkPktSize);
   void *GetData(unsigned int samples);

diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp
@@ -9,7 +9,9 @@
 #include "PAPlayer.h"
 
 #include "FileItem.h"
+#include "ICodec.h"
 #include "ServiceBroker.h"
+#include "URL.h"
 #include "Util.h"
 #include "cores/AudioEngine/Interfaces/AE.h"
 #include "cores/AudioEngine/Interfaces/AEStream.h"

diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
@@ -16,6 +16,7 @@
 #include "cores/VideoPlayer/Interface/InputStreamConstants.h"
 #include "cores/paplayer/PAPlayer.h"
 #include "dialogs/GUIDialogContextMenu.h"
+#include "filesystem/File.h"
 #include "guilib/LocalizeStrings.h"
 #include "profiles/ProfileManager.h"
 #include "settings/AdvancedSettings.h"

diff --git a/xbmc/dialogs/GUIDialogCache.h b/xbmc/dialogs/GUIDialogCache.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "filesystem/File.h"
+#include "filesystem/IFileTypes.h"
 #include "threads/SystemClock.h"
 #include "threads/Thread.h"
 

diff --git a/xbmc/filesystem/File.h b/xbmc/filesystem/File.h
@@ -32,13 +32,6 @@ namespace XFILE
 
 class IFile;
 
-class IFileCallback
-{
-public:
-  virtual bool OnFileCallback(void* pContext, int ipercent, float avgSpeed) = 0;
-  virtual ~IFileCallback() = default;
-};
-
 class CFileStreamBuffer;
 
 class CFile

diff --git a/xbmc/filesystem/FileCache.cpp b/xbmc/filesystem/FileCache.cpp
@@ -9,7 +9,6 @@
 #include "FileCache.h"
 
 #include "CircularCache.h"
-#include "File.h"
 #include "ServiceBroker.h"
 #include "URL.h"
 #include "settings/AdvancedSettings.h"

diff --git a/xbmc/filesystem/IFileTypes.h b/xbmc/filesystem/IFileTypes.h
@@ -99,4 +99,10 @@ enum FileProperty
   FILE_PROPERTY_EFFECTIVE_URL               /**< Get effective URL for redirected streams  */
 };
 
+class IFileCallback
+{
+public:
+  virtual bool OnFileCallback(void* pContext, int ipercent, float avgSpeed) = 0;
+  virtual ~IFileCallback() = default;
+};
 }
diff --git a/xbmc/filesystem/UDFBlockInput.cpp b/xbmc/filesystem/UDFBlockInput.cpp
@@ -8,6 +8,8 @@
 
 #include "UDFBlockInput.h"
 
+#include "filesystem/File.h"
+
 #include <mutex>
 
 #include <udfread/udfread.h>

diff --git a/xbmc/filesystem/UDFBlockInput.h b/xbmc/filesystem/UDFBlockInput.h
@@ -8,13 +8,17 @@
 
 #pragma once
 
-#include "filesystem/File.h"
 #include "threads/CriticalSection.h"
 
 #include <memory>
 
 #include <udfread/blockinput.h>
 
+namespace XFILE
+{
+class CFile;
+}
+
 class CUDFBlockInput
 {
 public:

diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp
@@ -17,7 +17,6 @@
 #include "ServiceBroker.h"
 #include "Util.h"
 #include "cores/DllLoader/DllLoaderContainer.h"
-#include "filesystem/File.h"
 #include "filesystem/SpecialProtocol.h"
 #include "interfaces/AnnouncementManager.h"
 #include "interfaces/legacy/AddonUtils.h"

diff --git a/xbmc/network/httprequesthandler/HTTPFileHandler.cpp b/xbmc/network/httprequesthandler/HTTPFileHandler.cpp
@@ -8,6 +8,7 @@
 
 #include "HTTPFileHandler.h"
 
+#include "filesystem/File.h"
 #include "utils/Mime.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"

diff --git a/xbmc/network/httprequesthandler/HTTPFileHandler.h b/xbmc/network/httprequesthandler/HTTPFileHandler.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "XBDateTime.h"
-#include "filesystem/File.h"
 #include "network/httprequesthandler/IHTTPRequestHandler.h"
 
 #include <string>

diff --git a/xbmc/utils/FileOperationJob.h b/xbmc/utils/FileOperationJob.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "FileItem.h"
-#include "filesystem/File.h"
+#include "filesystem/IFileTypes.h"
 #include "utils/ProgressJob.h"
 
 #include <string>

diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp
@@ -16,6 +16,7 @@
 #include "URIUtils.h"
 #include "URL.h"
 #include "Util.h"
+#include "filesystem/File.h"
 #include "filesystem/MultiPathDirectory.h"
 #include "filesystem/SpecialProtocol.h"
 #include "filesystem/StackDirectory.h"

diff --git a/xbmc/video/VideoInfoDownloader.cpp b/xbmc/video/VideoInfoDownloader.cpp
@@ -9,7 +9,7 @@
 #include "VideoInfoDownloader.h"
 
 #include "dialogs/GUIDialogProgress.h"
-#include "messaging/ApplicationMessenger.h"
+#include "filesystem/CurlFile.h"
 #include "messaging/helpers/DialogOKHelper.h"
 #include "utils/Variant.h"
 #include "utils/log.h"

diff --git a/xbmc/video/VideoInfoDownloader.h b/xbmc/video/VideoInfoDownloader.h
@@ -11,7 +11,6 @@
 #include "Episode.h"
 #include "VideoInfoTag.h"
 #include "addons/Scraper.h"
-#include "filesystem/CurlFile.h"
 #include "threads/Thread.h"
 
 #include <string>
@@ -25,6 +24,10 @@ namespace ADDON
 {
 class CScraperError;
 }
+namespace XFILE
+{
+class CurlFile;
+}
 
 typedef std::vector<CScraperUrl> MOVIELIST;