internal cleanup (move files)

2024-11-23 22:41:05 +01:00 · 2023-05-14 20:17:51 +02:00 · 2023-05-14 20:17:51 +02:00 · eadaf21bde
commit eadaf21bde
parent 2e3205ad41
27 changed files with 79 additions and 75 deletions
--- a/audacious/plugin.cc
+++ b/audacious/plugin.cc
@ -16,7 +16,7 @@

 extern "C" {
 #include "../src/vgmstream.h"
-#include "../src/plugins.h"
+#include "../src/api.h"
 }
 #include "plugin.h"
 #include "vfs.h"
--- a/cli/vgmstream123.c
+++ b/cli/vgmstream123.c
@ -38,7 +38,7 @@
 #endif

 #include "../src/vgmstream.h"
-#include "../src/plugins.h"
+#include "../src/api.h"
 #include "../src/util/samples_ops.h"

 #include "../version.h"
--- a/cli/vgmstream_cli.c
+++ b/cli/vgmstream_cli.c
@ -5,7 +5,7 @@

 #include <getopt.h>
 #include "../src/vgmstream.h"
-#include "../src/plugins.h"
+#include "../src/api.h"
 #include "../src/util.h"
 #include "../src/util/samples_ops.h"
 //todo use <>?
--- a/doc/BUILD.md
+++ b/doc/BUILD.md
@ -10,7 +10,7 @@ vgmstream can be compiled using one of several build scripts that are available

 Because each module has different quirks one can't use a single tool for everything. You should be able to build most using a standard *compiler* (GCC/MSVC/Clang) using common *build systems* (scripts/CMake/autotools) in any typical *OS* (Windows/Linux/macOS).

-64-bit support should work but hasn't been throughly tested (may have subtle decoding bugs in some codecs), since most used components are plugins for 32-bit players. Windows libraries for extra codecs are included for 32-bit only at the moment.
+64-bit support should work but hasn't been as throughly tested, since most used components are plugins for 32-bit players. Windows libraries for extra codecs are included for 32-bit only at the moment.

 Though it's rather flexible (like using Windows with GCC and autotools), some combos may be a bit more complex to get working depending on your system and other factors.

--- a/fb2k/foo_vgmstream.cpp
+++ b/fb2k/foo_vgmstream.cpp
@ -12,7 +12,7 @@

 extern "C" {
 #include "../src/vgmstream.h"
-#include "../src/plugins.h"
+#include "../src/api.h"
 }
 #include "foo_vgmstream.h"
 #include "foo_filetypes.h"
--- a/src/api.h
+++ b/src/api.h
@ -1,6 +1,10 @@
-//possible future public/opaque API
 #ifndef _API_H_
 #define _API_H_
+
+#include "base/plugins.h"
+
+
+//possible future public/opaque API
 #if 0

 #include <stdint.h>
--- a/src/base/decode.c
+++ b/src/base/decode.c
@ -1,7 +1,7 @@
-#include "vgmstream.h"
+#include "../vgmstream.h"
+#include "../layout/layout.h"
+#include "../coding/coding.h"
 #include "decode.h"
-#include "layout/layout.h"
-#include "coding/coding.h"
 #include "mixing.h"
 #include "plugins.h"

--- a/src/base/decode.h
+++ b/src/base/decode.h
@ -1,7 +1,7 @@
 #ifndef _DECODE_H
 #define _DECODE_H

-#include "vgmstream.h"
+#include "../vgmstream.h"

 void free_codec(VGMSTREAM* vgmstream);
 void seek_codec(VGMSTREAM* vgmstream);
--- a/src/base/info.c
+++ b/src/base/info.c
@ -1,7 +1,7 @@
 #include <ctype.h>
 #include "../vgmstream.h"
 #include "../coding/coding.h"
-#include "../mixing.h"
+#include "mixing.h"
 #include "../util/channel_mappings.h"


--- a/src/base/mixing.c
+++ b/src/base/mixing.c
@ -1,7 +1,7 @@
-#include "vgmstream.h"
+#include "../vgmstream.h"
+#include "../util/channel_mappings.h"
 #include "mixing.h"
 #include "plugins.h"
-#include "util/channel_mappings.h"
 #include <math.h>
 #include <limits.h>

--- a/src/base/mixing.h
+++ b/src/base/mixing.h
@ -1,7 +1,7 @@
 #ifndef _MIXING_H_
 #define _MIXING_H_

-#include "vgmstream.h"
+#include "../vgmstream.h"

 /* Applies mixing commands to the sample buffer. Mixing must be externally enabled and
 * outbuf must big enough to hold output_channels*samples_to_do */
--- a/src/base/plugins.c
+++ b/src/base/plugins.c
@ -1,7 +1,7 @@
-#include "vgmstream.h"
+#include "../vgmstream.h"
+#include "../util/log.h"
 #include "plugins.h"
 #include "mixing.h"
-#include "util/log.h"


 /* ****************************************** */
--- a/src/base/plugins.h
+++ b/src/base/plugins.h
@ -4,8 +4,8 @@
 #ifndef _PLUGINS_H_
 #define _PLUGINS_H_

-#include "streamfile.h"
-#include "vgmstream.h"
+#include "../streamfile.h"
+#include "../vgmstream.h"


 /* ****************************************** */
--- a/src/base/render.c
+++ b/src/base/render.c
@ -1,5 +1,5 @@
-#include "vgmstream.h"
-#include "layout/layout.h"
+#include "../vgmstream.h"
+#include "../layout/layout.h"
 #include "render.h"
 #include "decode.h"
 #include "mixing.h"
--- a/src/base/render.h
+++ b/src/base/render.h
@ -1,7 +1,7 @@
 #ifndef _RENDER_H
 #define _RENDER_H

-#include "vgmstream.h"
+#include "../vgmstream.h"

 void free_layout(VGMSTREAM* vgmstream);
 void reset_layout(VGMSTREAM* vgmstream);
--- a/src/base/seek.c
+++ b/src/base/seek.c
@ -1,5 +1,5 @@
-#include "vgmstream.h"
-#include "layout/layout.h"
+#include "../vgmstream.h"
+#include "../layout/layout.h"
 #include "render.h"
 #include "decode.h"
 #include "mixing.h"
--- a/src/layout/blocked.c
+++ b/src/layout/blocked.c
@ -1,6 +1,6 @@
 #include "layout.h"
 #include "../vgmstream.h"
-#include "../decode.h"
+#include "../base/decode.h"
 #include "../coding/coding.h"


--- a/src/layout/flat.c
+++ b/src/layout/flat.c
@ -1,6 +1,6 @@
 #include "layout.h"
 #include "../vgmstream.h"
-#include "../decode.h"
+#include "../base/decode.h"


 /* Decodes samples for flat streams.
--- a/src/layout/interleave.c
+++ b/src/layout/interleave.c
@ -1,6 +1,6 @@
 #include "layout.h"
 #include "../vgmstream.h"
-#include "../decode.h"
+#include "../base/decode.h"


 /* Decodes samples for interleaved streams.
--- a/src/layout/layered.c
+++ b/src/layout/layered.c
@ -1,8 +1,8 @@
 #include "layout.h"
 #include "../vgmstream.h"
-#include "../decode.h"
-#include "../mixing.h"
-#include "../plugins.h"
+#include "../base/decode.h"
+#include "../base/mixing.h"
+#include "../base/plugins.h"

 #define VGMSTREAM_MAX_LAYERS 255
 #define VGMSTREAM_LAYER_SAMPLE_BUFFER 8192
--- a/src/layout/segmented.c
+++ b/src/layout/segmented.c
@ -1,8 +1,8 @@
 #include "layout.h"
 #include "../vgmstream.h"
-#include "../decode.h"
-#include "../mixing.h"
-#include "../plugins.h"
+#include "../base/decode.h"
+#include "../base/mixing.h"
+#include "../base/plugins.h"

 #define VGMSTREAM_MAX_SEGMENTS 1024
 #define VGMSTREAM_SEGMENT_SAMPLE_BUFFER 8192
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@ -81,15 +81,15 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="api.h" />
-    <ClInclude Include="decode.h" />
-    <ClInclude Include="mixing.h" />
-    <ClInclude Include="plugins.h" />
-    <ClInclude Include="render.h" />
    <ClInclude Include="streamfile.h" />
    <ClInclude Include="streamtypes.h" />
    <ClInclude Include="util.h" />
    <ClInclude Include="vgmstream.h" />
    <ClInclude Include="vgmstream_types.h" />
+    <ClInclude Include="base\decode.h" />
+    <ClInclude Include="base\mixing.h" />
+    <ClInclude Include="base\plugins.h" />
+    <ClInclude Include="base\render.h" />
    <ClInclude Include="coding\acm_decoder_libacm.h" />
    <ClInclude Include="coding\circus_decoder_lib.h" />
    <ClInclude Include="coding\circus_decoder_lib_data.h" />
@ -184,16 +184,16 @@
    <ClInclude Include="util\text_reader.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="decode.c" />
    <ClCompile Include="formats.c" />
-    <ClCompile Include="mixing.c" />
-    <ClCompile Include="plugins.c" />
-    <ClCompile Include="render.c" />
-    <ClCompile Include="seek.c" />
    <ClCompile Include="streamfile.c" />
    <ClCompile Include="util.c" />
    <ClCompile Include="vgmstream.c" />
+    <ClCompile Include="base\decode.c" />
    <ClCompile Include="base\info.c" />
+    <ClCompile Include="base\mixing.c" />
+    <ClCompile Include="base\plugins.c" />
+    <ClCompile Include="base\render.c" />
+    <ClCompile Include="base\seek.c" />
    <ClCompile Include="coding\acm_decoder.c" />
    <ClCompile Include="coding\acm_decoder_decode.c" />
    <ClCompile Include="coding\acm_decoder_util.c" />
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@ -68,18 +68,6 @@
    <ClInclude Include="api.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="decode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="mixing.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="plugins.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="render.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="streamfile.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@ -95,6 +83,18 @@
    <ClInclude Include="vgmstream_types.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="base\decode.h">
+      <Filter>base\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="base\mixing.h">
+      <Filter>base\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="base\plugins.h">
+      <Filter>base\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="base\render.h">
+      <Filter>base\Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="coding\acm_decoder_libacm.h">
      <Filter>coding\Header Files</Filter>
    </ClInclude>
@ -373,24 +373,9 @@
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="decode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="formats.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="mixing.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="plugins.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="render.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="seek.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="streamfile.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@ -400,9 +385,24 @@
    <ClCompile Include="vgmstream.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="base\decode.c">
+      <Filter>base\Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="base\info.c">
      <Filter>base\Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="base\mixing.c">
+      <Filter>base\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="base\plugins.c">
+      <Filter>base\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="base\render.c">
+      <Filter>base\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="base\seek.c">
+      <Filter>base\Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="coding\acm_decoder.c">
      <Filter>coding\Source Files</Filter>
    </ClCompile>
--- a/src/meta/txtp.c
+++ b/src/meta/txtp.c
@ -1,8 +1,8 @@
 #include "meta.h"
 #include "../coding/coding.h"
 #include "../layout/layout.h"
-#include "../mixing.h"
-#include "../plugins.h"
+#include "../base/mixing.h"
+#include "../base/plugins.h"
 #include "../util/text_reader.h"

 #include <math.h>
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@ -9,9 +9,9 @@
 #include "meta/meta.h"
 #include "layout/layout.h"
 #include "coding/coding.h"
-#include "decode.h"
-#include "render.h"
-#include "mixing.h"
+#include "base/decode.h"
+#include "base/render.h"
+#include "base/mixing.h"

 static void try_dual_file_stereo(VGMSTREAM* opened_vgmstream, STREAMFILE* sf, VGMSTREAM* (*init_vgmstream_function)(STREAMFILE*));

--- a/winamp/in_vgmstream.h
+++ b/winamp/in_vgmstream.h
@ -22,7 +22,7 @@
 #include <math.h>

 #include "../src/vgmstream.h"
-#include "../src/plugins.h"
+#include "../src/api.h"
 #include "sdk/in2.h"
 #include "sdk/wa_ipc.h"
 #include "sdk/ipc_pe.h"
--- a/xmplay/xmp_vgmstream.c
+++ b/xmplay/xmp_vgmstream.c
@ -13,7 +13,7 @@

 #include "xmpin.h"
 #include "../src/vgmstream.h"
-#include "../src/plugins.h"
+#include "../src/api.h"


 #include "../version.h"