Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3852] trunk/OpenMPT/soundlib
|
From: <sag...@us...> - 2014-03-09 14:54:31
|
Revision: 3852
http://sourceforge.net/p/modplug/code/3852
Author: saga-games
Date: 2014-03-09 14:54:24 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
[Ref] Kill LPCBYTE.
Modified Paths:
--------------
trunk/OpenMPT/soundlib/Load_mdl.cpp
trunk/OpenMPT/soundlib/Load_med.cpp
trunk/OpenMPT/soundlib/Load_mid.cpp
trunk/OpenMPT/soundlib/Load_mt2.cpp
trunk/OpenMPT/soundlib/Snd_defs.h
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
Modified: trunk/OpenMPT/soundlib/Load_mdl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mdl.cpp 2014-03-09 14:11:32 UTC (rev 3851)
+++ trunk/OpenMPT/soundlib/Load_mdl.cpp 2014-03-09 14:54:24 UTC (rev 3852)
@@ -286,8 +286,8 @@
-bool CSoundFile::ReadMDL(const BYTE *lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags)
-//------------------------------------------------------------------------------------------------
+bool CSoundFile::ReadMDL(const uint8 *lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags)
+//-------------------------------------------------------------------------------------------------
{
DWORD dwMemPos, dwPos, blocklen, dwTrackPos;
const MDLFileHeader *pmsh = (const MDLFileHeader *)lpStream;
@@ -299,7 +299,7 @@
BYTE smpinfo[MAX_SAMPLES];
BYTE insvolenv[MAX_INSTRUMENTS];
BYTE inspanenv[MAX_INSTRUMENTS];
- LPCBYTE pvolenv, ppanenv, ppitchenv;
+ const uint8 *pvolenv, *ppanenv, *ppitchenv;
UINT nvolenv, npanenv, npitchenv;
std::vector<ROWINDEX> patternLength;
@@ -660,7 +660,7 @@
// Setup volume envelope
if ((nvolenv) && (pvolenv) && (insvolenv[iIns]))
{
- LPCBYTE pve = pvolenv;
+ const uint8 *pve = pvolenv;
for (UINT nve = 0; nve < nvolenv; nve++, pve += 33)
{
if (pve[0] + 1 == insvolenv[iIns])
@@ -670,7 +670,7 @@
// Setup panning envelope
if ((npanenv) && (ppanenv) && (inspanenv[iIns]))
{
- LPCBYTE ppe = ppanenv;
+ const uint8 *ppe = ppanenv;
for (UINT npe = 0; npe < npanenv; npe++, ppe += 33)
{
if (ppe[0] + 1 == inspanenv[iIns])
Modified: trunk/OpenMPT/soundlib/Load_med.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp 2014-03-09 14:11:32 UTC (rev 3851)
+++ trunk/OpenMPT/soundlib/Load_med.cpp 2014-03-09 14:54:24 UTC (rev 3852)
@@ -500,8 +500,8 @@
}
-bool CSoundFile::ReadMed(const BYTE *lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags)
-//------------------------------------------------------------------------------------------------
+bool CSoundFile::ReadMed(const uint8 *lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags)
+//-------------------------------------------------------------------------------------------------
{
const MEDMODULEHEADER *pmmh;
const MMD0SONGHEADER *pmsh;
Modified: trunk/OpenMPT/soundlib/Load_mid.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mid.cpp 2014-03-09 14:11:32 UTC (rev 3851)
+++ trunk/OpenMPT/soundlib/Load_mid.cpp 2014-03-09 14:54:24 UTC (rev 3852)
@@ -92,7 +92,7 @@
typedef struct MIDITRACK
{
- LPCBYTE ptracks, ptrmax;
+ const uint8 *ptracks, *ptrmax;
DWORD status;
LONG nexteventtime;
} MIDITRACK;
@@ -466,8 +466,8 @@
#define MIDIGLOBAL_XGSYSTEMON 0x0200
-bool CSoundFile::ReadMID(const BYTE *lpStream, DWORD dwMemLength, ModLoadingFlags loadFlags)
-//------------------------------------------------------------------------------------------
+bool CSoundFile::ReadMID(const uint8 *lpStream, DWORD dwMemLength, ModLoadingFlags loadFlags)
+//-------------------------------------------------------------------------------------------
{
const MIDIFILEHEADER *pmfh = (const MIDIFILEHEADER *)lpStream;
const MIDITRACKHEADER *pmth;
Modified: trunk/OpenMPT/soundlib/Load_mt2.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mt2.cpp 2014-03-09 14:11:32 UTC (rev 3851)
+++ trunk/OpenMPT/soundlib/Load_mt2.cpp 2014-03-09 14:54:24 UTC (rev 3852)
@@ -218,8 +218,8 @@
}
-bool CSoundFile::ReadMT2(LPCBYTE lpStream, DWORD dwMemLength, ModLoadingFlags loadFlags)
-//--------------------------------------------------------------------------------------
+bool CSoundFile::ReadMT2(const uint8 *lpStream, DWORD dwMemLength, ModLoadingFlags loadFlags)
+//------------------------------------------------------------------------------------------
{
MT2FILEHEADER *pfh = (MT2FILEHEADER *)lpStream;
DWORD dwMemPos, dwDrumDataPos, dwExtraDataPos;
Modified: trunk/OpenMPT/soundlib/Snd_defs.h
===================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h 2014-03-09 14:11:32 UTC (rev 3851)
+++ trunk/OpenMPT/soundlib/Snd_defs.h 2014-03-09 14:54:24 UTC (rev 3852)
@@ -14,10 +14,6 @@
#include "../common/typedefs.h"
#include "../common/FlagSet.h"
-#ifndef LPCBYTE
-typedef const BYTE * LPCBYTE;
-#endif
-
typedef uint32 ROWINDEX;
const ROWINDEX ROWINDEX_INVALID = uint32_max;
typedef uint16 CHANNELINDEX;
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2014-03-09 14:11:32 UTC (rev 3851)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2014-03-09 14:54:24 UTC (rev 3852)
@@ -761,7 +761,7 @@
}
file.Rewind();
- LPCBYTE lpStream = reinterpret_cast<const unsigned char*>(file.GetRawData());
+ const uint8 *lpStream = reinterpret_cast<const unsigned char*>(file.GetRawData());
DWORD dwMemLength = file.GetLength();
if(!ReadXM(file, loadFlags)
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2014-03-09 14:11:32 UTC (rev 3851)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2014-03-09 14:54:24 UTC (rev 3852)
@@ -630,7 +630,7 @@
bool ReadS3M(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadMod(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadM15(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
- bool ReadMed(const LPCBYTE lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags = loadCompleteModule);
+ bool ReadMed(const uint8 *lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadMTM(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadSTM(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadIT(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
@@ -642,14 +642,14 @@
bool ReadFAR(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadAMS(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadAMS2(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
- bool ReadMDL(const LPCBYTE lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags = loadCompleteModule);
+ bool ReadMDL(const uint8 *lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadOKT(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadDMF(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadPTM(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadDBM(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadAMF_Asylum(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadAMF_DSMI(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
- bool ReadMT2(const LPCBYTE lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags = loadCompleteModule);
+ bool ReadMT2(const uint8 *lpStream, const DWORD dwMemLength, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadPSM(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadPSM16(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadUMX(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
@@ -659,7 +659,7 @@
bool ReadAM(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadJ2B(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
bool ReadDIGI(FileReader &file, ModLoadingFlags loadFlags = loadCompleteModule);
- bool ReadMID(const LPCBYTE lpStream, DWORD dwMemLength, ModLoadingFlags loadFlags = loadCompleteModule);
+ bool ReadMID(const uint8 *lpStream, DWORD dwMemLength, ModLoadingFlags loadFlags = loadCompleteModule);
static std::vector<const char *> GetSupportedExtensions(bool otherFormats);
static std::pair<MOD_CHARSET_CERTAINTY, mpt::Charset> GetCharsetFromModType(MODTYPE modtype);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
