Moved some files to the loader/cache subdirectory

oleg68 · Dec 29, 2023 · 9ea8a73 · 9ea8a73
1 parent f207106
commit 9ea8a73
Show file tree

Hide file tree

Showing 13 changed files with 4,863 additions and 6,621 deletions.
diff --git a/ide-projects/NetBeans12/nbproject/configurations.xml b/ide-projects/NetBeans12/nbproject/configurations.xml
diff --git a/src/grandorgue/CMakeLists.txt b/src/grandorgue/CMakeLists.txt
@@ -129,6 +129,9 @@ loader/GOFileStore.cpp
 loader/GOLoaderFilename.cpp
 loader/GOLoadThread.cpp
 loader/GOLoadWorker.cpp
+loader/cache/GOCache.cpp
+loader/cache/GOCacheCleaner.cpp
+loader/cache/GOCacheWriter.cpp
 midi/dialog-creator/GOMidiDialogCreatorProxy.cpp
 midi/ports/GOMidiInPort.cpp
 midi/ports/GOMidiOutPort.cpp
@@ -202,9 +205,6 @@ yaml/GOSaveableToYaml.cpp
 yaml/go-wx-yaml.cpp
 GOAudioGauge.cpp
 GOAudioRecorder.cpp
-GOCache.cpp
-GOCacheCleaner.cpp
-GOCacheWriter.cpp
 GOBitmapCache.cpp
 GOEvent.cpp
 GOLog.cpp

diff --git a/src/grandorgue/GOFrame.cpp b/src/grandorgue/GOFrame.cpp
@@ -34,6 +34,7 @@
 #include "gui/GOGUIPanel.h"
 #include "gui/primitives/go_gui_utils.h"
 #include "help/GOHelpRequestor.h"
+#include "loader/cache/GOCacheCleaner.h"
 #include "midi/GOMidi.h"
 #include "midi/GOMidiEvent.h"
 #include "sound/GOSound.h"
@@ -42,7 +43,6 @@
 
 #include "GOApp.h"
 #include "GOAudioGauge.h"
-#include "GOCacheCleaner.h"
 #include "GODocument.h"
 #include "GOEvent.h"
 #include "GOLogicalRect.h"

diff --git a/src/grandorgue/GOOrganController.cpp b/src/grandorgue/GOOrganController.cpp
@@ -46,6 +46,8 @@
 #include "gui/GOGUISequencerPanel.h"
 #include "loader/GOLoadThread.h"
 #include "loader/GOLoaderFilename.h"
+#include "loader/cache/GOCache.h"
+#include "loader/cache/GOCacheWriter.h"
 #include "midi/GOMidi.h"
 #include "midi/GOMidiEvent.h"
 #include "midi/GOMidiPlayer.h"
@@ -68,8 +70,6 @@
 
 #include "GOAudioRecorder.h"
 #include "GOBuffer.h"
-#include "GOCache.h"
-#include "GOCacheWriter.h"
 #include "GODocument.h"
 #include "GOEvent.h"
 #include "GOHash.h"

diff --git a/src/grandorgue/GOCache.cpp → src/grandorgue/loader/cache/GOCache.cpp b/src/grandorgue/GOCache.cpp → src/grandorgue/loader/cache/GOCache.cpp
diff --git a/src/grandorgue/GOCache.h → src/grandorgue/loader/cache/GOCache.h b/src/grandorgue/GOCache.h → src/grandorgue/loader/cache/GOCache.h
diff --git a/src/grandorgue/GOCacheCleaner.cpp → ...randorgue/loader/cache/GOCacheCleaner.cpp b/src/grandorgue/GOCacheCleaner.cpp → ...randorgue/loader/cache/GOCacheCleaner.cpp
diff --git a/src/grandorgue/GOCacheCleaner.h → src/grandorgue/loader/cache/GOCacheCleaner.h b/src/grandorgue/GOCacheCleaner.h → src/grandorgue/loader/cache/GOCacheCleaner.h
diff --git a/src/grandorgue/GOCacheWriter.cpp → ...grandorgue/loader/cache/GOCacheWriter.cpp b/src/grandorgue/GOCacheWriter.cpp → ...grandorgue/loader/cache/GOCacheWriter.cpp
diff --git a/src/grandorgue/GOCacheWriter.h → src/grandorgue/loader/cache/GOCacheWriter.h b/src/grandorgue/GOCacheWriter.h → src/grandorgue/loader/cache/GOCacheWriter.h
diff --git a/src/grandorgue/sound/GOSoundAudioSection.cpp b/src/grandorgue/sound/GOSoundAudioSection.cpp
@@ -9,9 +9,10 @@
 
 #include <wx/intl.h>
 
+#include "loader/cache/GOCache.h"
+#include "loader/cache/GOCacheWriter.h"
+
 #include "GOAlloc.h"
-#include "GOCache.h"
-#include "GOCacheWriter.h"
 #include "GOMemoryPool.h"
 #include "GOSampleStatistic.h"
 #include "GOSoundCompress.h"

diff --git a/src/grandorgue/sound/GOSoundProvider.cpp b/src/grandorgue/sound/GOSoundProvider.cpp
@@ -9,8 +9,9 @@
 
 #include <wx/intl.h>
 
-#include "GOCache.h"
-#include "GOCacheWriter.h"
+#include "loader/cache/GOCache.h"
+#include "loader/cache/GOCacheWriter.h"
+
 #include "GOMemoryPool.h"
 #include "GOSampleStatistic.h"
 #include "GOSoundAudioSection.h"

diff --git a/src/grandorgue/sound/GOSoundReleaseAlignTable.cpp b/src/grandorgue/sound/GOSoundReleaseAlignTable.cpp
@@ -9,8 +9,8 @@
 
 #include <stdlib.h>
 
-#include "GOCache.h"
-#include "GOCacheWriter.h"
+#include "loader/cache/GOCache.h"
+#include "loader/cache/GOCacheWriter.h"
 #include "sound/GOSoundAudioSection.h"
 
 #ifndef NDEBUG