From 950514d8777570ee7f01dc54f192df5020eeacd6 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Wed, 11 Aug 2004 07:52:12 +0000 Subject: Add mac, Monkey's Audio Codec which was recently released in source code. It contain a library and an executable compressor/decompressor of .ape files. Does not build under 4.x, we hit the wall with missing wcstol(). Working patches would be welcomed. PR: ports/70153 Submitted by: Martin Dieringer --- audio/mac/files/patch-src-MACLib-APEInfo.cpp | 11 +++++++++++ audio/mac/files/patch-src-MACLib-APETag.cpp | 20 ++++++++++++++++++++ audio/mac/files/patch-src-MACLib-Assembly-Assembly.h | 11 +++++++++++ audio/mac/files/patch-src-MACLib-MACLib.cpp | 20 ++++++++++++++++++++ audio/mac/files/patch-src-MACLib-WAVInputSource.cpp | 11 +++++++++++ audio/mac/files/patch-src-Shared-NoWindows.h | 11 +++++++++++ 6 files changed, 84 insertions(+) create mode 100644 audio/mac/files/patch-src-MACLib-APEInfo.cpp create mode 100644 audio/mac/files/patch-src-MACLib-APETag.cpp create mode 100644 audio/mac/files/patch-src-MACLib-Assembly-Assembly.h create mode 100644 audio/mac/files/patch-src-MACLib-MACLib.cpp create mode 100644 audio/mac/files/patch-src-MACLib-WAVInputSource.cpp create mode 100644 audio/mac/files/patch-src-Shared-NoWindows.h (limited to 'audio/mac/files') diff --git a/audio/mac/files/patch-src-MACLib-APEInfo.cpp b/audio/mac/files/patch-src-MACLib-APEInfo.cpp new file mode 100644 index 000000000000..76151234632e --- /dev/null +++ b/audio/mac/files/patch-src-MACLib-APEInfo.cpp @@ -0,0 +1,11 @@ +--- src/MACLib/APEInfo.cpp.orig Wed May 12 08:07:13 2004 ++++ src/MACLib/APEInfo.cpp Mon Aug 9 20:25:20 2004 +@@ -40,7 +40,7 @@ + // we don't want to analyze right away for non-local files + // since a single I/O object is shared, we can't tag and read at the same time (i.e. in multiple threads) + BOOL bAnalyzeNow = TRUE; +- if ((wcsnicmp(pFilename, L"http://", 7) == 0) || (wcsnicmp(pFilename, L"m01p://", 7) == 0)) ++ if ((wcsncmp(pFilename, L"http://", 7) == 0) || (wcsncmp(pFilename, L"m01p://", 7) == 0)) + bAnalyzeNow = FALSE; + + m_spAPETag.Assign(new CAPETag(m_spIO, bAnalyzeNow)); diff --git a/audio/mac/files/patch-src-MACLib-APETag.cpp b/audio/mac/files/patch-src-MACLib-APETag.cpp new file mode 100644 index 000000000000..d9d911b6c48b --- /dev/null +++ b/audio/mac/files/patch-src-MACLib-APETag.cpp @@ -0,0 +1,20 @@ +--- src/MACLib/APETag.cpp.orig Wed May 12 08:10:49 2004 ++++ src/MACLib/APETag.cpp Mon Aug 9 20:26:04 2004 +@@ -310,7 +310,7 @@ + + for (int z = 0; z < m_nFields; z++) + { +- if (wcsicmp(m_aryFields[z]->GetFieldName(), pFieldName) == 0) ++ if (wcscmp(m_aryFields[z]->GetFieldName(), pFieldName) == 0) + return z; + } + +@@ -478,7 +478,7 @@ + BOOL bFound = FALSE; + while ((nGenreIndex < GENRE_COUNT) && (bFound == FALSE)) + { +- if (_wcsicmp(cBuffer, g_ID3Genre[nGenreIndex]) == 0) ++ if (wcscmp(cBuffer, g_ID3Genre[nGenreIndex]) == 0) + { + pID3Tag->Genre = nGenreIndex; + bFound = TRUE; diff --git a/audio/mac/files/patch-src-MACLib-Assembly-Assembly.h b/audio/mac/files/patch-src-MACLib-Assembly-Assembly.h new file mode 100644 index 000000000000..c9123d059239 --- /dev/null +++ b/audio/mac/files/patch-src-MACLib-Assembly-Assembly.h @@ -0,0 +1,11 @@ +--- src/MACLib/Assembly/Assembly.h.orig Wed May 12 06:35:56 2004 ++++ src/MACLib/Assembly/Assembly.h Mon Aug 9 20:26:40 2004 +@@ -6,7 +6,7 @@ + void Adapt(short * pM, const short * pAdapt, int nDirection, int nOrder); + int CalculateDotProduct(const short * pA, const short * pB, int nOrder); + BOOL GetMMXAvailable(); +-}; ++} + + #endif // #ifndef APE_ASSEMBLY_H + diff --git a/audio/mac/files/patch-src-MACLib-MACLib.cpp b/audio/mac/files/patch-src-MACLib-MACLib.cpp new file mode 100644 index 000000000000..386142cb0e5e --- /dev/null +++ b/audio/mac/files/patch-src-MACLib-MACLib.cpp @@ -0,0 +1,20 @@ +--- src/MACLib/MACLib.cpp.orig Wed May 12 08:56:22 2004 ++++ src/MACLib/MACLib.cpp Mon Aug 9 20:27:19 2004 +@@ -62,7 +62,7 @@ + pExtension--; + + // take the appropriate action (based on the extension) +- if (wcsicmp(pExtension, L".apl") == 0) ++ if (wcscmp(pExtension, L".apl") == 0) + { + // "link" file (.apl linked large APE file) + CAPELink APELink(pFilename); +@@ -72,7 +72,7 @@ + nStartBlock = APELink.GetStartBlock(); nFinishBlock = APELink.GetFinishBlock(); + } + } +- else if ((wcsicmp(pExtension, L".mac") == 0) || (wcsicmp(pExtension, L".ape") == 0)) ++ else if ((wcscmp(pExtension, L".mac") == 0) || (wcscmp(pExtension, L".ape") == 0)) + { + // plain .ape file + pAPEInfo = new CAPEInfo(&nErrorCode, pFilename); diff --git a/audio/mac/files/patch-src-MACLib-WAVInputSource.cpp b/audio/mac/files/patch-src-MACLib-WAVInputSource.cpp new file mode 100644 index 000000000000..8ce3aae98649 --- /dev/null +++ b/audio/mac/files/patch-src-MACLib-WAVInputSource.cpp @@ -0,0 +1,11 @@ +--- src/MACLib/WAVInputSource.cpp.orig Wed May 12 06:35:57 2004 ++++ src/MACLib/WAVInputSource.cpp Mon Aug 9 20:27:58 2004 +@@ -47,7 +47,7 @@ + pExtension--; + + // create the proper input source +- if (wcsicmp(pExtension, L".wav") == 0) ++ if (wcscmp(pExtension, L".wav") == 0) + { + if (pErrorCode) *pErrorCode = ERROR_SUCCESS; + return new CWAVInputSource(pSourceName, pwfeSource, pTotalBlocks, pHeaderBytes, pTerminatingBytes, pErrorCode); diff --git a/audio/mac/files/patch-src-Shared-NoWindows.h b/audio/mac/files/patch-src-Shared-NoWindows.h new file mode 100644 index 000000000000..ca15ca2be98b --- /dev/null +++ b/audio/mac/files/patch-src-Shared-NoWindows.h @@ -0,0 +1,11 @@ +--- src/Shared/NoWindows.h.orig Wed May 12 09:00:17 2004 ++++ src/Shared/NoWindows.h Mon Aug 9 20:28:34 2004 +@@ -50,7 +50,7 @@ + + #include + +-#define _FPOSOFF(fp) ((long)(fp).__pos) ++#define _FPOSOFF(fp) ((long)(fp)) + #define MAX_PATH 260 + + #ifndef _WAVEFORMATEX_ -- cgit v1.2.3