Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5228] trunk/OpenMPT
|
From: <sag...@us...> - 2015-06-01 21:56:32
|
Revision: 5228
http://sourceforge.net/p/modplug/code/5228
Author: saga-games
Date: 2015-06-01 21:56:24 +0000 (Mon, 01 Jun 2015)
Log Message:
-----------
[Ref] Remove Wav.h and move the remaining required FOURCCs to Dlsbank.cpp, which is now the only usage site.
Modified Paths:
--------------
trunk/OpenMPT/build/autotools/Makefile.am
trunk/OpenMPT/build/vs2008/OpenMPT.vcproj
trunk/OpenMPT/build/vs2008/libopenmpt.vcproj
trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj
trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj
trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj
trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters
trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj
trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj
trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj
trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj.filters
trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj
trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj
trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj
trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj.filters
trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj
trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj
trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj
trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters
trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj
trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj.filters
trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj
trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj.filters
trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj
trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj.filters
trunk/OpenMPT/mptrack/mod2midi.cpp
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
trunk/OpenMPT/soundlib/Dlsbank.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
Removed Paths:
-------------
trunk/OpenMPT/soundlib/Wav.h
Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/autotools/Makefile.am 2015-06-01 21:56:24 UTC (rev 5228)
@@ -217,7 +217,6 @@
libopenmpt_la_SOURCES += soundlib/tuning.cpp
libopenmpt_la_SOURCES += soundlib/tuning.h
libopenmpt_la_SOURCES += soundlib/UpgradeModule.cpp
-libopenmpt_la_SOURCES += soundlib/Wav.h
libopenmpt_la_SOURCES += soundlib/WAVTools.cpp
libopenmpt_la_SOURCES += soundlib/WAVTools.h
libopenmpt_la_SOURCES += soundlib/WindowedFIR.cpp
@@ -421,7 +420,6 @@
libopenmpttest_SOURCES += soundlib/tuning.cpp
libopenmpttest_SOURCES += soundlib/tuning.h
libopenmpttest_SOURCES += soundlib/UpgradeModule.cpp
-libopenmpttest_SOURCES += soundlib/Wav.h
libopenmpttest_SOURCES += soundlib/WAVTools.cpp
libopenmpttest_SOURCES += soundlib/WAVTools.h
libopenmpttest_SOURCES += soundlib/WindowedFIR.cpp
Modified: trunk/OpenMPT/build/vs2008/OpenMPT.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2008/OpenMPT.vcproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -1980,10 +1980,6 @@
>
</File>
<File
- RelativePath="..\..\soundlib\Wav.h"
- >
- </File>
- <File
RelativePath="..\..\soundlib\WindowedFIR.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2008/libopenmpt.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmpt.vcproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2008/libopenmpt.vcproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -871,10 +871,6 @@
>
</File>
<File
- RelativePath="..\..\soundlib\Wav.h"
- >
- </File>
- <File
RelativePath="..\..\soundlib\WindowedFIR.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2008/libopenmptDLL.vcproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -919,10 +919,6 @@
>
</File>
<File
- RelativePath="..\..\soundlib\Wav.h"
- >
- </File>
- <File
RelativePath="..\..\soundlib\WindowedFIR.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2008/libopenmpt_test.vcproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -919,10 +919,6 @@
>
</File>
<File
- RelativePath="..\..\soundlib\Wav.h"
- >
- </File>
- <File
RelativePath="..\..\soundlib\WindowedFIR.cpp"
>
</File>
Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -504,7 +504,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2010/OpenMPT.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -509,9 +509,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -238,7 +238,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2010/libopenmpt.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -207,9 +207,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -242,7 +242,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2010/libopenmptDLL.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -207,9 +207,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -246,7 +246,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2010/libopenmpt_test.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -210,9 +210,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -510,7 +510,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2012/OpenMPT.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -509,9 +509,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -242,7 +242,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2012/libopenmpt.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -207,9 +207,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -246,7 +246,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2012/libopenmptDLL.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -207,9 +207,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -250,7 +250,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2012/libopenmpt_test.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -210,9 +210,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -511,7 +511,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2013/OpenMPT.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -509,9 +509,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -243,7 +243,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2013/libopenmpt.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -207,9 +207,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -247,7 +247,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2013/libopenmptDLL.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -207,9 +207,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -251,7 +251,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2013/libopenmpt_test.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -210,9 +210,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -511,7 +511,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2015/OpenMPT.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -509,9 +509,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -243,7 +243,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2015/libopenmpt.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -207,9 +207,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -247,7 +247,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2015/libopenmptDLL.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -207,9 +207,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -251,7 +251,6 @@
<ClInclude Include="..\..\soundlib\Tables.h" />
<ClInclude Include="..\..\soundlib\Tagging.h" />
<ClInclude Include="..\..\soundlib\WAVTools.h" />
- <ClInclude Include="..\..\soundlib\Wav.h" />
<ClInclude Include="..\..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\..\soundlib\XMTools.h" />
<ClInclude Include="..\..\soundlib\mod_specifications.h" />
Modified: trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/build/vs2015/libopenmpt_test.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -210,9 +210,6 @@
<ClInclude Include="..\..\soundlib\WAVTools.h">
<Filter>soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\..\soundlib\Wav.h">
- <Filter>soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\..\soundlib\WindowedFIR.h">
<Filter>soundlib</Filter>
</ClInclude>
Modified: trunk/OpenMPT/mptrack/mod2midi.cpp
===================================================================
--- trunk/OpenMPT/mptrack/mod2midi.cpp 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/mptrack/mod2midi.cpp 2015-06-01 21:56:24 UTC (rev 5228)
@@ -14,7 +14,6 @@
#include "../common/StringFixer.h"
#include "../common/mptFileIO.h"
#include "mod2midi.h"
-#include "Wav.h"
OPENMPT_NAMESPACE_BEGIN
@@ -26,30 +25,30 @@
typedef struct PACKED _RMIDDATACHUNK
{
- DWORD id_RIFF; // "RIFF"
- DWORD filelen;
- DWORD id_RMID; // "RMID"
- DWORD id_data; // "data"
- DWORD datalen;
+ char id_RIFF[4]; // "RIFF"
+ uint32 filelen;
+ char id_RMID[4]; // "RMID"
+ char id_data[4]; // "data"
+ uint32 datalen;
} RMIDDATACHUNK, *PRMIDDATACHUNK;
STATIC_ASSERT(sizeof(RMIDDATACHUNK) == 20);
typedef struct PACKED _MTHDCHUNK // (big endian)
{
- DWORD id; // "MThd" = 0x6468544D
- DWORD len; // 6
- WORD wFmt; // 0=single track, 1=synchro multitrack, 2=asynch multitrack
- WORD wTrks; // # of tracks
- WORD wDivision; // PPQN
+ char id[4]; // "MThd" = 0x6468544D
+ uint32 len; // 6
+ uint16 wFmt; // 0=single track, 1=synchro multitrack, 2=asynch multitrack
+ uint16 wTrks; // # of tracks
+ uint16 wDivision; // PPQN
} MTHDCHUNK, *PMTHDCHUNK;
STATIC_ASSERT(sizeof(MTHDCHUNK) == 14);
typedef struct PACKED _MTRKCHUNK // (big endian)
{
- DWORD id; // "MTrk" = 0x6B72544D
- DWORD len;
+ char id[4]; // "MTrk" = 0x6B72544D
+ uint32 len;
} MTRKCHUNK, *PMTRKCHUNK;
STATIC_ASSERT(sizeof(MTRKCHUNK) == 8);
@@ -385,12 +384,12 @@
if (!tempo) tempo = 125;
nTickMultiplier = MOD2MIDI_TEMPOFACTOR;
const uint16 wPPQN = static_cast<uint16>((tempo * nTickMultiplier) / 5);
- rmid.id_RIFF = IFFID_RIFF;
+ memcpy(rmid.id_RIFF, "RIFF", 4);
rmid.filelen = sizeof(rmid)+sizeof(mthd)-8;
- rmid.id_RMID = 0x44494D52; // "RMID"
- rmid.id_data = IFFID_data;
+ memcpy(rmid.id_RMID, "RMID", 4);
+ memcpy(rmid.id_data, "data", 4);
rmid.datalen = 0;
- mthd.id = 0x6468544d; // "MThd"
+ memcpy(mthd.id, "MThd", 4);
mthd.len = BigEndian(sizeof(mthd)-8);
mthd.wFmt = BigEndianW(1);
mthd.wTrks = static_cast<uint16>(Tracks.size()); // 1 track/channel
@@ -568,7 +567,7 @@
tmp[2] = 0x2f;
tmp[3] = 0x00;
Tracks[iTrk].Write(tmp, 4);
- mtrk.id = 0x6B72544D;
+ memcpy(mtrk.id, "MTrk", 4);
mtrk.len = BigEndian(Tracks[iTrk].nTrackSize);
fwrite(&mtrk, 1, sizeof(mtrk), f);
rmid.filelen += sizeof(mtrk) + Tracks[iTrk].nTrackSize;
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -1678,10 +1678,6 @@
>
</File>
<File
- RelativePath="..\soundlib\Wav.h"
- >
- </File>
- <File
RelativePath=".\WelcomeDialog.h"
>
</File>
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2015-06-01 21:56:24 UTC (rev 5228)
@@ -1024,7 +1024,6 @@
<ClInclude Include="..\soundlib\SoundFilePlayConfig.h" />
<ClInclude Include="..\soundlib\Tables.h" />
<ClInclude Include="..\soundlib\Tagging.h" />
- <ClInclude Include="..\soundlib\Wav.h" />
<ClInclude Include="..\soundlib\WAVTools.h" />
<ClInclude Include="..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\soundlib\XMTools.h" />
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2015-06-01 21:56:24 UTC (rev 5228)
@@ -741,9 +741,6 @@
<ClInclude Include="..\soundlib\Tables.h">
<Filter>Header Files\soundlib</Filter>
</ClInclude>
- <ClInclude Include="..\soundlib\Wav.h">
- <Filter>Header Files\soundlib</Filter>
- </ClInclude>
<ClInclude Include="..\common\AudioCriticalSection.h">
<Filter>Header Files\common</Filter>
</ClInclude>
Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp 2015-06-01 21:56:24 UTC (rev 5228)
@@ -16,7 +16,6 @@
#include "../common/mptFileIO.h"
#endif
#include "Dlsbank.h"
-#include "Wav.h"
#include "../common/StringFixer.h"
#include "../common/FileReader.h"
#include "../common/Endianness.h"
@@ -120,14 +119,29 @@
//////////////////////////////////////////////////////////
// DLS IFF Chunk IDs
+// Standard IFF chunks IDs
+#define IFFID_FORM 0x4d524f46
+#define IFFID_RIFF 0x46464952
+#define IFFID_LIST 0x5453494C
+#define IFFID_INFO 0x4F464E49
+
+// IFF Info fields
+#define IFFID_ICOP 0x504F4349
+#define IFFID_INAM 0x4D414E49
+#define IFFID_ICMT 0x544D4349
+#define IFFID_IENG 0x474E4549
+#define IFFID_ISFT 0x54465349
+#define IFFID_ISBJ 0x4A425349
+
+// Wave IFF chunks IDs
+#define IFFID_wave 0x65766177
+#define IFFID_wsmp 0x706D7377
+
#define IFFID_XDLS 0x534c4458
#define IFFID_DLS 0x20534C44
#define IFFID_MLS 0x20534C4D
#define IFFID_RMID 0x44494D52
#define IFFID_colh 0x686C6F63
-#define IFFID_vers 0x73726576
-#define IFFID_msyn 0x6E79736D
-#define IFFID_lins 0x736E696C
#define IFFID_ins 0x20736E69
#define IFFID_insh 0x68736E69
#define IFFID_ptbl 0x6C627470
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2015-06-01 21:56:24 UTC (rev 5228)
@@ -21,7 +21,6 @@
#ifndef MODPLUG_NO_FILESAVE
#include "../common/mptFileIO.h"
#endif
-#include "Wav.h"
#include "Tagging.h"
#include "ITTools.h"
#include "XMTools.h"
Deleted: trunk/OpenMPT/soundlib/Wav.h
===================================================================
--- trunk/OpenMPT/soundlib/Wav.h 2015-06-01 14:41:28 UTC (rev 5227)
+++ trunk/OpenMPT/soundlib/Wav.h 2015-06-01 21:56:24 UTC (rev 5228)
@@ -1,68 +0,0 @@
-/*
- * Wav.h
- * -----
- * Purpose: Headers for WAV reading / writing (WAV structs, FOURCCs, etc...)
- * Notes : Some FOURCCs are also used by the MIDI/DLS routines.
- * Authors: OpenMPT Devs
- * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
- */
-
-
-#pragma once
-
-
-OPENMPT_NAMESPACE_BEGIN
-
-
-// Standard IFF chunks IDs
-#define IFFID_FORM 0x4d524f46
-#define IFFID_RIFF 0x46464952
-#define IFFID_WAVE 0x45564157
-#define IFFID_LIST 0x5453494C
-#define IFFID_INFO 0x4F464E49
-
-// IFF Info fields
-#define IFFID_ICOP 0x504F4349
-#define IFFID_IART 0x54524149
-#define IFFID_IPRD 0x44525049
-#define IFFID_INAM 0x4D414E49
-#define IFFID_ICMT 0x544D4349
-#define IFFID_IENG 0x474E4549
-#define IFFID_ISFT 0x54465349
-#define IFFID_ISBJ 0x4A425349
-#define IFFID_IGNR 0x524E4749
-#define IFFID_ICRD 0x44524349
-
-// Wave IFF chunks IDs
-#define IFFID_wave 0x65766177
-#define IFFID_fmt 0x20746D66
-#define IFFID_wsmp 0x706D7377
-#define IFFID_data 0x61746164
-
-
-#ifdef NEEDS_PRAGMA_PACK
-#pragma pack(push, 1)
-#endif
-
-struct PACKED WAVEFILEHEADER
-{
- DWORD id_RIFF; // "RIFF"
- DWORD filesize; // file length-8
- DWORD id_WAVE;
-};
-
-STATIC_ASSERT(sizeof(WAVEFILEHEADER) == 12);
-
-struct PACKED WAVEDATAHEADER
-{
- DWORD id_data; // "data"
- DWORD length; // length of data
-};
-
-STATIC_ASSERT(sizeof(WAVEDATAHEADER) == 8);
-#ifdef NEEDS_PRAGMA_PACK
-#pragma pack(pop)
-#endif
-
-
-OPENMPT_NAMESPACE_END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
