diff options
| author | James Cowgill <jcowgill@debian.org> | 2017-11-21 08:51:38 +0000 |
|---|---|---|
| committer | James Cowgill <jcowgill@debian.org> | 2017-11-21 08:51:38 +0000 |
| commit | 3b3e8a946b9409674a3b5b7f23a92b9e0c947120 (patch) | |
| tree | d45556add5c125e682ae7ecf736705841b67d939 /soundlib | |
| parent | a8a2f152bc3beee99e042993b4443751d8f513ed (diff) | |
New upstream version 0.3.3
Diffstat (limited to 'soundlib')
| -rw-r--r-- | soundlib/Load_mod.cpp | 2 | ||||
| -rw-r--r-- | soundlib/Load_stp.cpp | 4 | ||||
| -rw-r--r-- | soundlib/Sndfile.h | 12 | ||||
| -rw-r--r-- | soundlib/modsmp_ctrl.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/soundlib/Load_mod.cpp b/soundlib/Load_mod.cpp index 93542e7..1584389 100644 --- a/soundlib/Load_mod.cpp +++ b/soundlib/Load_mod.cpp @@ -1964,7 +1964,7 @@ struct PT36Header char magicMODL[4]; // "MODL" }; -MPT_BINARY_STRUCT(PT36Header, 12); +MPT_BINARY_STRUCT(PT36Header, 12) static bool ValidateHeader(const PT36Header &fileHeader) diff --git a/soundlib/Load_stp.cpp b/soundlib/Load_stp.cpp index 9088554..207521d 100644 --- a/soundlib/Load_stp.cpp +++ b/soundlib/Load_stp.cpp @@ -39,7 +39,7 @@ struct STPFileHeader uint16be sampleStructSize; }; -MPT_BINARY_STRUCT(STPFileHeader, 204); +MPT_BINARY_STRUCT(STPFileHeader, 204) // Sample header (common part between all versions) @@ -85,7 +85,7 @@ struct STPSampleHeader } }; -MPT_BINARY_STRUCT(STPSampleHeader, 20); +MPT_BINARY_STRUCT(STPSampleHeader, 20) struct STPLoopInfo diff --git a/soundlib/Sndfile.h b/soundlib/Sndfile.h index 3d1f4fa..8bd77c6 100644 --- a/soundlib/Sndfile.h +++ b/soundlib/Sndfile.h @@ -118,15 +118,17 @@ struct GetLengthTarget ROWINDEX startRow; ORDERINDEX startOrder; SEQUENCEINDEX sequence; + + struct pos_type + { + ROWINDEX row; + ORDERINDEX order; + }; union { double time; - struct - { - ROWINDEX row; - ORDERINDEX order; - } pos; + pos_type pos; }; enum Mode diff --git a/soundlib/modsmp_ctrl.cpp b/soundlib/modsmp_ctrl.cpp index 5edf2f7..1e97c09 100644 --- a/soundlib/modsmp_ctrl.cpp +++ b/soundlib/modsmp_ctrl.cpp @@ -15,8 +15,6 @@ #include "../soundbase/SampleFormatConverters.h" #include "../soundbase/SampleFormatCopy.h" -#define new DEBUG_NEW - OPENMPT_NAMESPACE_BEGIN namespace ctrlSmp |