diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp mac/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp --- orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp Sun Jul 3 16:31:35 2005 +++ mac/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp Mon Nov 28 02:05:18 2005 @@ -23,7 +23,7 @@ } // get format information - GetInfo(APE_INFO_WAVEFORMATEX, (int) &m_wfeInput); + GetInfo(APE_INFO_WAVEFORMATEX, (long) &m_wfeInput); m_nBlockAlign = GetInfo(APE_INFO_BLOCK_ALIGN); // initialize other stuff @@ -367,7 +367,7 @@ /***************************************************************************************** Get information from the decompressor *****************************************************************************************/ -int CAPEDecompress::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2) +int CAPEDecompress::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2) { int nRetVal = 0; BOOL bHandled = TRUE; diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h mac/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h --- orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h Thu Mar 10 13:36:25 2005 +++ mac/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h Mon Nov 28 02:05:37 2005 @@ -22,7 +22,7 @@ int GetData(char * pBuffer, int nBlocks, int * pBlocksRetrieved); int Seek(int nBlockOffset); - int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0); + int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0); protected: diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp mac/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp --- orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp Mon Nov 28 02:15:38 2005 +++ mac/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp Mon Nov 28 02:13:29 2005 @@ -129,7 +129,7 @@ /***************************************************************************************** Primary query function *****************************************************************************************/ -int CAPEInfo::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2) +int CAPEInfo::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2) { int nRetVal = -1; @@ -254,7 +254,7 @@ } else { - WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0); + WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0); WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader, m_APEFileInfo.nWAVDataBytes, &wfeFormat, m_APEFileInfo.nWAVTerminatingBytes); memcpy(pBuffer, &WAVHeader, sizeof(WAVE_HEADER)); diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h mac/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h --- orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h Thu Mar 10 13:36:25 2005 +++ mac/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h Mon Nov 28 02:13:35 2005 @@ -82,7 +82,7 @@ virtual ~CAPEInfo(); // query for information - int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0); + int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0); private: diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp mac/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp --- orig/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp Thu Mar 10 13:36:25 2005 +++ mac/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp Mon Nov 28 02:00:57 2005 @@ -291,7 +291,7 @@ if (spAPEDecompress == NULL || nFunctionRetVal != ERROR_SUCCESS) throw(nFunctionRetVal); // get the input format - THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeInput)) + THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeInput)) // allocate space for the header spTempBuffer.Assign(new unsigned char [spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)], TRUE); diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/MACLib.h mac/work/mac-3.99-u4-b4/src/MACLib/MACLib.h --- orig/work/mac-3.99-u4-b4/src/MACLib/MACLib.h Tue May 31 10:02:27 2005 +++ mac/work/mac-3.99-u4-b4/src/MACLib/MACLib.h Mon Nov 28 02:06:30 2005 @@ -259,7 +259,7 @@ // int nParam2 // generic parameter... usage is listed in APE_DECOMPRESS_FIELDS ////////////////////////////////////////////////////////////////////////////////////////////// - virtual int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0) = 0; + virtual int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0) = 0; }; /************************************************************************************************* diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp mac/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp --- orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp Fri Mar 11 13:23:37 2005 +++ mac/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp Mon Nov 28 02:11:44 2005 @@ -165,7 +165,7 @@ return ERROR_SUCCESS; } -int CAPEDecompressOld::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2) +int CAPEDecompressOld::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2) { int nRetVal = 0; BOOL bHandled = TRUE; diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h mac/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h --- orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h Thu Mar 10 13:36:26 2005 +++ mac/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h Mon Nov 28 02:11:54 2005 @@ -13,7 +13,7 @@ int GetData(char * pBuffer, int nBlocks, int * pBlocksRetrieved); int Seek(int nBlockOffset); - int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0); + int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0); protected: