mirror of
https://github.com/clangen/musikcube.git
synced 2025-02-21 03:41:10 +00:00
General repo/build/project cleanup:
- Removed unused md5 and fftw-3 remnants - Renamed 3rdparty/lib -> 3rdparty/win32_lib to match win32_include - Removed core/sdk/config.h - Fixed various compiler warnings
This commit is contained in:
casey langen
parent
f0505363c5
commit
7efcf60e1d
2
src/3rdparty/3rdparty.vcxproj
vendored
2
src/3rdparty/3rdparty.vcxproj
vendored
@ -89,7 +89,6 @@
|
||||
<ClCompile Include="src\sqlite\sqlite3.c">
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\md5\md5.c" />
|
||||
<ClCompile Include="src\wcwidth.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@ -98,7 +97,6 @@
|
||||
<ClInclude Include="include\sqlite\sqlite3.h" />
|
||||
<ClInclude Include="include\sqlite\sqlite3ext.h" />
|
||||
<ClInclude Include="include\sigslot\sigslot.h" />
|
||||
<ClInclude Include="include\md5\md5.h" />
|
||||
<ClInclude Include="include\wcwidth.h" />
|
||||
<ClInclude Include="include\_kiss_fft_guts.h" />
|
||||
</ItemGroup>
|
||||
|
||||
9
src/3rdparty/3rdparty.vcxproj.filters
vendored
9
src/3rdparty/3rdparty.vcxproj.filters
vendored
@ -11,17 +11,11 @@
|
||||
<Filter Include="src\sigslot">
|
||||
<UniqueIdentifier>{57af24a7-d581-4aac-94af-fb79332228ab}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="src\md5">
|
||||
<UniqueIdentifier>{d5daddec-d920-4412-a600-3e0998d7dfe9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\sqlite\sqlite3.c">
|
||||
<Filter>src\sqlite</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\md5\md5.c">
|
||||
<Filter>src\md5</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\wcwidth.c">
|
||||
<Filter>src</Filter>
|
||||
</ClCompile>
|
||||
@ -42,9 +36,6 @@
|
||||
<ClInclude Include="include\sigslot\sigslot.h">
|
||||
<Filter>src\sigslot</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="include\md5\md5.h">
|
||||
<Filter>src\md5</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="include\wcwidth.h">
|
||||
<Filter>src</Filter>
|
||||
</ClInclude>
|
||||
|
||||
91
src/3rdparty/include/md5/md5.h
vendored
91
src/3rdparty/include/md5/md5.h
vendored
@ -1,91 +0,0 @@
|
||||
/*
|
||||
Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved.
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
L. Peter Deutsch
|
||||
ghost@aladdin.com
|
||||
|
||||
*/
|
||||
/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
|
||||
/*
|
||||
Independent implementation of MD5 (RFC 1321).
|
||||
|
||||
This code implements the MD5 Algorithm defined in RFC 1321, whose
|
||||
text is available at
|
||||
http://www.ietf.org/rfc/rfc1321.txt
|
||||
The code is derived from the text of the RFC, including the test suite
|
||||
(section A.5) but excluding the rest of Appendix A. It does not include
|
||||
any code or documentation that is identified in the RFC as being
|
||||
copyrighted.
|
||||
|
||||
The original and principal author of md5.h is L. Peter Deutsch
|
||||
<ghost@aladdin.com>. Other authors are noted in the change history
|
||||
that follows (in reverse chronological order):
|
||||
|
||||
2002-04-13 lpd Removed support for non-ANSI compilers; removed
|
||||
references to Ghostscript; clarified derivation from RFC 1321;
|
||||
now handles byte order either statically or dynamically.
|
||||
1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
|
||||
1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
|
||||
added conditionalization for C++ compilation from Martin
|
||||
Purschke <purschke@bnl.gov>.
|
||||
1999-05-03 lpd Original version.
|
||||
*/
|
||||
|
||||
#ifndef md5_INCLUDED
|
||||
# define md5_INCLUDED
|
||||
|
||||
/*
|
||||
* This package supports both compile-time and run-time determination of CPU
|
||||
* byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
|
||||
* compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
|
||||
* defined as non-zero, the code will be compiled to run only on big-endian
|
||||
* CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
|
||||
* run on either big- or little-endian CPUs, but will run slightly less
|
||||
* efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
|
||||
*/
|
||||
|
||||
typedef unsigned char md5_byte_t; /* 8-bit byte */
|
||||
typedef unsigned int md5_word_t; /* 32-bit word */
|
||||
|
||||
/* Define the state of the MD5 Algorithm. */
|
||||
typedef struct md5_state_s {
|
||||
md5_word_t count[2]; /* message length in bits, lsw first */
|
||||
md5_word_t abcd[4]; /* digest buffer */
|
||||
md5_byte_t buf[64]; /* accumulate block */
|
||||
} md5_state_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
/* Initialize the algorithm. */
|
||||
void md5_init(md5_state_t *pms);
|
||||
|
||||
/* Append a string to the message. */
|
||||
void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
|
||||
|
||||
/* Finish the message and return the digest. */
|
||||
void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* end extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* md5_INCLUDED */
|
||||
381
src/3rdparty/src/md5/md5.c
vendored
381
src/3rdparty/src/md5/md5.c
vendored
@ -1,381 +0,0 @@
|
||||
/*
|
||||
Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
L. Peter Deutsch
|
||||
ghost@aladdin.com
|
||||
|
||||
*/
|
||||
/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
|
||||
/*
|
||||
Independent implementation of MD5 (RFC 1321).
|
||||
|
||||
This code implements the MD5 Algorithm defined in RFC 1321, whose
|
||||
text is available at
|
||||
http://www.ietf.org/rfc/rfc1321.txt
|
||||
The code is derived from the text of the RFC, including the test suite
|
||||
(section A.5) but excluding the rest of Appendix A. It does not include
|
||||
any code or documentation that is identified in the RFC as being
|
||||
copyrighted.
|
||||
|
||||
The original and principal author of md5.c is L. Peter Deutsch
|
||||
<ghost@aladdin.com>. Other authors are noted in the change history
|
||||
that follows (in reverse chronological order):
|
||||
|
||||
2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
|
||||
either statically or dynamically; added missing #include <string.h>
|
||||
in library.
|
||||
2002-03-11 lpd Corrected argument list for main(), and added int return
|
||||
type, in test program and T value program.
|
||||
2002-02-21 lpd Added missing #include <stdio.h> in test program.
|
||||
2000-07-03 lpd Patched to eliminate warnings about "constant is
|
||||
unsigned in ANSI C, signed in traditional"; made test program
|
||||
self-checking.
|
||||
1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
|
||||
1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
|
||||
1999-05-03 lpd Original version.
|
||||
*/
|
||||
|
||||
#include "md5.h"
|
||||
#include <string.h>
|
||||
|
||||
#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
|
||||
#ifdef ARCH_IS_BIG_ENDIAN
|
||||
# define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
|
||||
#else
|
||||
# define BYTE_ORDER 0
|
||||
#endif
|
||||
|
||||
#define T_MASK ((md5_word_t)~0)
|
||||
#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
|
||||
#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
|
||||
#define T3 0x242070db
|
||||
#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
|
||||
#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
|
||||
#define T6 0x4787c62a
|
||||
#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
|
||||
#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
|
||||
#define T9 0x698098d8
|
||||
#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
|
||||
#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
|
||||
#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
|
||||
#define T13 0x6b901122
|
||||
#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
|
||||
#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
|
||||
#define T16 0x49b40821
|
||||
#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
|
||||
#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
|
||||
#define T19 0x265e5a51
|
||||
#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
|
||||
#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
|
||||
#define T22 0x02441453
|
||||
#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
|
||||
#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
|
||||
#define T25 0x21e1cde6
|
||||
#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
|
||||
#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
|
||||
#define T28 0x455a14ed
|
||||
#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
|
||||
#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
|
||||
#define T31 0x676f02d9
|
||||
#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
|
||||
#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
|
||||
#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
|
||||
#define T35 0x6d9d6122
|
||||
#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
|
||||
#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
|
||||
#define T38 0x4bdecfa9
|
||||
#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
|
||||
#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
|
||||
#define T41 0x289b7ec6
|
||||
#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
|
||||
#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
|
||||
#define T44 0x04881d05
|
||||
#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
|
||||
#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
|
||||
#define T47 0x1fa27cf8
|
||||
#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
|
||||
#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
|
||||
#define T50 0x432aff97
|
||||
#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
|
||||
#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
|
||||
#define T53 0x655b59c3
|
||||
#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
|
||||
#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
|
||||
#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
|
||||
#define T57 0x6fa87e4f
|
||||
#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
|
||||
#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
|
||||
#define T60 0x4e0811a1
|
||||
#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
|
||||
#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
|
||||
#define T63 0x2ad7d2bb
|
||||
#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
|
||||
|
||||
|
||||
static void
|
||||
md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
|
||||
{
|
||||
md5_word_t
|
||||
a = pms->abcd[0], b = pms->abcd[1],
|
||||
c = pms->abcd[2], d = pms->abcd[3];
|
||||
md5_word_t t;
|
||||
#if BYTE_ORDER > 0
|
||||
/* Define storage only for big-endian CPUs. */
|
||||
md5_word_t X[16];
|
||||
#else
|
||||
/* Define storage for little-endian or both types of CPUs. */
|
||||
md5_word_t xbuf[16];
|
||||
const md5_word_t *X;
|
||||
#endif
|
||||
|
||||
{
|
||||
#if BYTE_ORDER == 0
|
||||
/*
|
||||
* Determine dynamically whether this is a big-endian or
|
||||
* little-endian machine, since we can use a more efficient
|
||||
* algorithm on the latter.
|
||||
*/
|
||||
static const int w = 1;
|
||||
|
||||
if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
|
||||
#endif
|
||||
#if BYTE_ORDER <= 0 /* little-endian */
|
||||
{
|
||||
/*
|
||||
* On little-endian machines, we can process properly aligned
|
||||
* data without copying it.
|
||||
*/
|
||||
if (!((data - (const md5_byte_t *)0) & 3)) {
|
||||
/* data are properly aligned */
|
||||
X = (const md5_word_t *)data;
|
||||
} else {
|
||||
/* not aligned */
|
||||
memcpy(xbuf, data, 64);
|
||||
X = xbuf;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if BYTE_ORDER == 0
|
||||
else /* dynamic big-endian */
|
||||
#endif
|
||||
#if BYTE_ORDER >= 0 /* big-endian */
|
||||
{
|
||||
/*
|
||||
* On big-endian machines, we must arrange the bytes in the
|
||||
* right order.
|
||||
*/
|
||||
const md5_byte_t *xp = data;
|
||||
int i;
|
||||
|
||||
# if BYTE_ORDER == 0
|
||||
X = xbuf; /* (dynamic only) */
|
||||
# else
|
||||
# define xbuf X /* (static only) */
|
||||
# endif
|
||||
for (i = 0; i < 16; ++i, xp += 4)
|
||||
xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
|
||||
|
||||
/* Round 1. */
|
||||
/* Let [abcd k s i] denote the operation
|
||||
a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
|
||||
#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
|
||||
#define SET(a, b, c, d, k, s, Ti)\
|
||||
t = a + F(b,c,d) + X[k] + Ti;\
|
||||
a = ROTATE_LEFT(t, s) + b
|
||||
/* Do the following 16 operations. */
|
||||
SET(a, b, c, d, 0, 7, T1);
|
||||
SET(d, a, b, c, 1, 12, T2);
|
||||
SET(c, d, a, b, 2, 17, T3);
|
||||
SET(b, c, d, a, 3, 22, T4);
|
||||
SET(a, b, c, d, 4, 7, T5);
|
||||
SET(d, a, b, c, 5, 12, T6);
|
||||
SET(c, d, a, b, 6, 17, T7);
|
||||
SET(b, c, d, a, 7, 22, T8);
|
||||
SET(a, b, c, d, 8, 7, T9);
|
||||
SET(d, a, b, c, 9, 12, T10);
|
||||
SET(c, d, a, b, 10, 17, T11);
|
||||
SET(b, c, d, a, 11, 22, T12);
|
||||
SET(a, b, c, d, 12, 7, T13);
|
||||
SET(d, a, b, c, 13, 12, T14);
|
||||
SET(c, d, a, b, 14, 17, T15);
|
||||
SET(b, c, d, a, 15, 22, T16);
|
||||
#undef SET
|
||||
|
||||
/* Round 2. */
|
||||
/* Let [abcd k s i] denote the operation
|
||||
a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
|
||||
#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
|
||||
#define SET(a, b, c, d, k, s, Ti)\
|
||||
t = a + G(b,c,d) + X[k] + Ti;\
|
||||
a = ROTATE_LEFT(t, s) + b
|
||||
/* Do the following 16 operations. */
|
||||
SET(a, b, c, d, 1, 5, T17);
|
||||
SET(d, a, b, c, 6, 9, T18);
|
||||
SET(c, d, a, b, 11, 14, T19);
|
||||
SET(b, c, d, a, 0, 20, T20);
|
||||
SET(a, b, c, d, 5, 5, T21);
|
||||
SET(d, a, b, c, 10, 9, T22);
|
||||
SET(c, d, a, b, 15, 14, T23);
|
||||
SET(b, c, d, a, 4, 20, T24);
|
||||
SET(a, b, c, d, 9, 5, T25);
|
||||
SET(d, a, b, c, 14, 9, T26);
|
||||
SET(c, d, a, b, 3, 14, T27);
|
||||
SET(b, c, d, a, 8, 20, T28);
|
||||
SET(a, b, c, d, 13, 5, T29);
|
||||
SET(d, a, b, c, 2, 9, T30);
|
||||
SET(c, d, a, b, 7, 14, T31);
|
||||
SET(b, c, d, a, 12, 20, T32);
|
||||
#undef SET
|
||||
|
||||
/* Round 3. */
|
||||
/* Let [abcd k s t] denote the operation
|
||||
a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
|
||||
#define H(x, y, z) ((x) ^ (y) ^ (z))
|
||||
#define SET(a, b, c, d, k, s, Ti)\
|
||||
t = a + H(b,c,d) + X[k] + Ti;\
|
||||
a = ROTATE_LEFT(t, s) + b
|
||||
/* Do the following 16 operations. */
|
||||
SET(a, b, c, d, 5, 4, T33);
|
||||
SET(d, a, b, c, 8, 11, T34);
|
||||
SET(c, d, a, b, 11, 16, T35);
|
||||
SET(b, c, d, a, 14, 23, T36);
|
||||
SET(a, b, c, d, 1, 4, T37);
|
||||
SET(d, a, b, c, 4, 11, T38);
|
||||
SET(c, d, a, b, 7, 16, T39);
|
||||
SET(b, c, d, a, 10, 23, T40);
|
||||
SET(a, b, c, d, 13, 4, T41);
|
||||
SET(d, a, b, c, 0, 11, T42);
|
||||
SET(c, d, a, b, 3, 16, T43);
|
||||
SET(b, c, d, a, 6, 23, T44);
|
||||
SET(a, b, c, d, 9, 4, T45);
|
||||
SET(d, a, b, c, 12, 11, T46);
|
||||
SET(c, d, a, b, 15, 16, T47);
|
||||
SET(b, c, d, a, 2, 23, T48);
|
||||
#undef SET
|
||||
|
||||
/* Round 4. */
|
||||
/* Let [abcd k s t] denote the operation
|
||||
a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
|
||||
#define I(x, y, z) ((y) ^ ((x) | ~(z)))
|
||||
#define SET(a, b, c, d, k, s, Ti)\
|
||||
t = a + I(b,c,d) + X[k] + Ti;\
|
||||
a = ROTATE_LEFT(t, s) + b
|
||||
/* Do the following 16 operations. */
|
||||
SET(a, b, c, d, 0, 6, T49);
|
||||
SET(d, a, b, c, 7, 10, T50);
|
||||
SET(c, d, a, b, 14, 15, T51);
|
||||
SET(b, c, d, a, 5, 21, T52);
|
||||
SET(a, b, c, d, 12, 6, T53);
|
||||
SET(d, a, b, c, 3, 10, T54);
|
||||
SET(c, d, a, b, 10, 15, T55);
|
||||
SET(b, c, d, a, 1, 21, T56);
|
||||
SET(a, b, c, d, 8, 6, T57);
|
||||
SET(d, a, b, c, 15, 10, T58);
|
||||
SET(c, d, a, b, 6, 15, T59);
|
||||
SET(b, c, d, a, 13, 21, T60);
|
||||
SET(a, b, c, d, 4, 6, T61);
|
||||
SET(d, a, b, c, 11, 10, T62);
|
||||
SET(c, d, a, b, 2, 15, T63);
|
||||
SET(b, c, d, a, 9, 21, T64);
|
||||
#undef SET
|
||||
|
||||
/* Then perform the following additions. (That is increment each
|
||||
of the four registers by the value it had before this block
|
||||
was started.) */
|
||||
pms->abcd[0] += a;
|
||||
pms->abcd[1] += b;
|
||||
pms->abcd[2] += c;
|
||||
pms->abcd[3] += d;
|
||||
}
|
||||
|
||||
void
|
||||
md5_init(md5_state_t *pms)
|
||||
{
|
||||
pms->count[0] = pms->count[1] = 0;
|
||||
pms->abcd[0] = 0x67452301;
|
||||
pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
|
||||
pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
|
||||
pms->abcd[3] = 0x10325476;
|
||||
}
|
||||
|
||||
void
|
||||
md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
|
||||
{
|
||||
const md5_byte_t *p = data;
|
||||
int left = nbytes;
|
||||
int offset = (pms->count[0] >> 3) & 63;
|
||||
md5_word_t nbits = (md5_word_t)(nbytes << 3);
|
||||
|
||||
if (nbytes <= 0)
|
||||
return;
|
||||
|
||||
/* Update the message length. */
|
||||
pms->count[1] += nbytes >> 29;
|
||||
pms->count[0] += nbits;
|
||||
if (pms->count[0] < nbits)
|
||||
pms->count[1]++;
|
||||
|
||||
/* Process an initial partial block. */
|
||||
if (offset) {
|
||||
int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
|
||||
|
||||
memcpy(pms->buf + offset, p, copy);
|
||||
if (offset + copy < 64)
|
||||
return;
|
||||
p += copy;
|
||||
left -= copy;
|
||||
md5_process(pms, pms->buf);
|
||||
}
|
||||
|
||||
/* Process full blocks. */
|
||||
for (; left >= 64; p += 64, left -= 64)
|
||||
md5_process(pms, p);
|
||||
|
||||
/* Process a final partial block. */
|
||||
if (left)
|
||||
memcpy(pms->buf, p, left);
|
||||
}
|
||||
|
||||
void
|
||||
md5_finish(md5_state_t *pms, md5_byte_t digest[16])
|
||||
{
|
||||
static const md5_byte_t pad[64] = {
|
||||
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
};
|
||||
md5_byte_t data[8];
|
||||
int i;
|
||||
|
||||
/* Save the length before padding. */
|
||||
for (i = 0; i < 8; ++i)
|
||||
data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
|
||||
/* Pad to 56 bytes mod 64. */
|
||||
md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
|
||||
/* Append the length. */
|
||||
md5_append(pms, data, 8);
|
||||
for (i = 0; i < 16; ++i)
|
||||
digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
|
||||
}
|
||||
BIN
src/3rdparty/win32_bin/libfftw3-3.dll
vendored
BIN
src/3rdparty/win32_bin/libfftw3-3.dll
vendored
Binary file not shown.
BIN
src/3rdparty/win32_bin/libfftw3-3.lib
vendored
BIN
src/3rdparty/win32_bin/libfftw3-3.lib
vendored
Binary file not shown.
BIN
src/3rdparty/win32_bin/libfftw3f-3.dll
vendored
BIN
src/3rdparty/win32_bin/libfftw3f-3.dll
vendored
Binary file not shown.
BIN
src/3rdparty/win32_bin/libfftw3f-3.lib
vendored
BIN
src/3rdparty/win32_bin/libfftw3f-3.lib
vendored
Binary file not shown.
@ -36,6 +36,7 @@
|
||||
|
||||
#include "ntddcdrm.h"
|
||||
#include "devioctl.h"
|
||||
#include <string>
|
||||
|
||||
using namespace musik::core::sdk;
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@ bool CddaDecoder::Open(IDataStream* data) {
|
||||
double CddaDecoder::SetPosition(double seconds) {
|
||||
LONGLONG bytesPerSecond = (CDDA_SAMPLE_RATE * data->GetChannelCount() * sizeof(short));
|
||||
LONGLONG offset = (LONGLONG)((float)bytesPerSecond * seconds);
|
||||
if (this->data->SetPosition(offset)) {
|
||||
if (this->data->SetPosition((PositionType) offset)) {
|
||||
return seconds;
|
||||
}
|
||||
|
||||
|
||||
@ -34,4 +34,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
|
||||
#include <shlwapi.h>
|
||||
#include <Windows.h>
|
||||
@ -36,9 +36,7 @@
|
||||
|
||||
#include <core/sdk/constants.h>
|
||||
|
||||
#include <ks.h>
|
||||
#include <ksmedia.h>
|
||||
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
|
||||
@ -40,7 +40,11 @@
|
||||
#include <mutex>
|
||||
#include <atomic>
|
||||
|
||||
#include <mmreg.h>
|
||||
#include <Windows.h>
|
||||
#include <Mmsystem.h>
|
||||
#include <Mmreg.h>
|
||||
#include <KS.h>
|
||||
#include <Ksmedia.h>
|
||||
#include <dsound.h>
|
||||
|
||||
#include <core/sdk/IOutput.h>
|
||||
|
||||
@ -33,6 +33,3 @@
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <core/config.h>
|
||||
|
||||
|
||||
@ -38,14 +38,6 @@
|
||||
#include <iostream>
|
||||
#include <cstring>
|
||||
|
||||
static inline void copy(float* dst, float* src, size_t count) {
|
||||
#ifdef WIN32
|
||||
CopyMemory(dst, src, count * sizeof(float));
|
||||
#else
|
||||
memcpy(dst, src, count * sizeof(float));
|
||||
#endif
|
||||
}
|
||||
|
||||
FlacDecoder::FlacDecoder()
|
||||
: decoder(NULL)
|
||||
, outputBufferSize(0)
|
||||
@ -189,7 +181,7 @@ FLAC__StreamDecoderWriteStatus FlacDecoder::FlacWrite(
|
||||
void *clientData)
|
||||
{
|
||||
FlacDecoder *fdec = (FlacDecoder*) clientData;
|
||||
int sampleCount = fdec->channels * frame->header.blocksize;
|
||||
unsigned sampleCount = (unsigned) fdec->channels * frame->header.blocksize;
|
||||
|
||||
/* initialize the output buffer if it doesn't exist */
|
||||
if (sampleCount > fdec->outputBufferSize) {
|
||||
@ -241,7 +233,7 @@ bool FlacDecoder::GetBuffer(IBuffer *buffer) {
|
||||
if (FLAC__stream_decoder_process_single(this->decoder)) {
|
||||
if (this->outputBuffer && this->outputBufferUsed > 0) {
|
||||
buffer->SetSamples(this->outputBufferUsed);
|
||||
copy(buffer->BufferPointer(), this->outputBuffer, this->outputBufferUsed);
|
||||
memcpy(buffer->BufferPointer(), this->outputBuffer, this->outputBufferUsed);
|
||||
this->outputBufferUsed = 0; /* mark consumed */
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -95,13 +95,13 @@ class FlacDecoder : public musik::core::sdk::IDecoder {
|
||||
FLAC__StreamDecoderErrorStatus status,
|
||||
void *clientData);
|
||||
|
||||
protected:
|
||||
private:
|
||||
musik::core::sdk::IDataStream *stream;
|
||||
FLAC__StreamDecoder *decoder;
|
||||
|
||||
long channels;
|
||||
long sampleRate;
|
||||
uint64 totalSamples;
|
||||
unsigned long long totalSamples;
|
||||
int bitsPerSample;
|
||||
double duration;
|
||||
|
||||
|
||||
@ -42,6 +42,12 @@
|
||||
|
||||
using namespace musik::core::sdk;
|
||||
|
||||
inline bool endsWith(const std::string& s, const std::string& suffix) {
|
||||
return
|
||||
s.size() >= suffix.size() &&
|
||||
s.rfind(suffix) == (s.size() - suffix.size());
|
||||
}
|
||||
|
||||
FlacDecoderFactory::FlacDecoderFactory() {
|
||||
}
|
||||
|
||||
@ -61,6 +67,6 @@ bool FlacDecoderFactory::CanHandle(const char* type) const {
|
||||
std::transform(str.begin(), str.end(), str.begin(), tolower);
|
||||
|
||||
return
|
||||
musik::sdk::endsWith(type, ".flac") ||
|
||||
endsWith(type, ".flac") ||
|
||||
str.find("audio/flag") != std::string::npos;
|
||||
}
|
||||
|
||||
@ -38,15 +38,15 @@
|
||||
#include "FlacDecoderFactory.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
#define DLLEXPORT
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||
return true;
|
||||
}
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
class FlacPlugin : public musik::core::sdk::IPlugin {
|
||||
|
||||
@ -34,4 +34,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <core/sdk/config.h>
|
||||
#ifdef WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
@ -34,7 +34,7 @@
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "M4aDecoder.h"
|
||||
#include <string.h>
|
||||
#include <string>
|
||||
|
||||
using musik::core::sdk::IDataStream;
|
||||
using musik::core::sdk::IBuffer;
|
||||
|
||||
@ -37,9 +37,16 @@
|
||||
#include "M4aDecoderFactory.h"
|
||||
#include "M4aDecoder.h"
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
|
||||
using musik::core::sdk::IDecoder;
|
||||
|
||||
inline bool endsWith(const std::string& s, const std::string& suffix) {
|
||||
return
|
||||
s.size() >= suffix.size() &&
|
||||
s.rfind(suffix) == (s.size() - suffix.size());
|
||||
}
|
||||
|
||||
M4aDecoderFactory::M4aDecoderFactory() {
|
||||
}
|
||||
|
||||
@ -59,7 +66,7 @@ bool M4aDecoderFactory::CanHandle(const char* type) const {
|
||||
std::transform(str.begin(), str.end(), str.begin(), tolower);
|
||||
|
||||
return
|
||||
musik::sdk::endsWith(str, ".m4a") ||
|
||||
endsWith(str, ".m4a") ||
|
||||
str.find("audio/mp4") != std::string::npos;
|
||||
}
|
||||
|
||||
|
||||
@ -38,15 +38,15 @@
|
||||
#include <core/sdk/IPlugin.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
#define DLLEXPORT
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||
return true;
|
||||
}
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
class AacDecoderPlugin : public musik::core::sdk::IPlugin {
|
||||
|
||||
@ -34,4 +34,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <core/sdk/config.h>
|
||||
#ifdef WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
@ -41,6 +41,12 @@
|
||||
|
||||
using namespace musik::core::sdk;
|
||||
|
||||
inline bool endsWith(const std::string& s, const std::string& suffix) {
|
||||
return
|
||||
s.size() >= suffix.size() &&
|
||||
s.rfind(suffix) == (s.size() - suffix.size());
|
||||
}
|
||||
|
||||
NomadDecoderFactory::NomadDecoderFactory() {
|
||||
}
|
||||
|
||||
@ -59,7 +65,7 @@ bool NomadDecoderFactory::CanHandle(const char* type) const {
|
||||
std::string str(type);
|
||||
std::transform(str.begin(), str.end(), str.begin(), tolower);
|
||||
|
||||
if (musik::sdk::endsWith(str, ".mp3") ||
|
||||
if (endsWith(str, ".mp3") ||
|
||||
str.find("audio/mpeg3") != std::string::npos ||
|
||||
str.find("audio/x-mpeg-3") != std::string::npos ||
|
||||
str.find("audio/mp3") != std::string::npos)
|
||||
|
||||
@ -37,15 +37,15 @@
|
||||
#include "NomadDecoderFactory.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
#define DLLEXPORT
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||
return true;
|
||||
}
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
class NomadPlugin : public musik::core::sdk::IPlugin {
|
||||
|
||||
@ -34,9 +34,13 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <core/sdk/config.h>
|
||||
#include <math.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <shlwapi.h>
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#include <shlwapi.h>
|
||||
#endif
|
||||
|
||||
@ -34,10 +34,17 @@
|
||||
|
||||
#include "stdafx.h"
|
||||
#include <cctype>
|
||||
#include <string>
|
||||
#include <algorithm>
|
||||
#include "OggDecoderFactory.h"
|
||||
#include "OggDecoder.h"
|
||||
|
||||
inline bool endsWith(const std::string& s, const std::string& suffix) {
|
||||
return
|
||||
s.size() >= suffix.size() &&
|
||||
s.rfind(suffix) == (s.size() - suffix.size());
|
||||
}
|
||||
|
||||
OggDecoderFactory::OggDecoderFactory() {
|
||||
}
|
||||
|
||||
@ -57,8 +64,8 @@ bool OggDecoderFactory::CanHandle(const char* type) const {
|
||||
std::transform(str.begin(), str.end(), str.begin(), tolower);
|
||||
|
||||
return
|
||||
musik::sdk::endsWith(str, ".ogg") ||
|
||||
musik::sdk::endsWith(str, ".oga") ||
|
||||
endsWith(str, ".ogg") ||
|
||||
endsWith(str, ".oga") ||
|
||||
str.find("audio/ogg") != std::string::npos ||
|
||||
str.find("audio/vorbis") != std::string::npos;
|
||||
}
|
||||
|
||||
@ -39,11 +39,11 @@
|
||||
using namespace musik::core::sdk;
|
||||
|
||||
class OggDecoderFactory : public IDecoderFactory {
|
||||
public:
|
||||
OggDecoderFactory();
|
||||
~OggDecoderFactory();
|
||||
public:
|
||||
OggDecoderFactory();
|
||||
virtual ~OggDecoderFactory();
|
||||
|
||||
IDecoder* CreateDecoder();
|
||||
void Destroy();
|
||||
bool CanHandle(const char* type) const;
|
||||
virtual IDecoder* CreateDecoder();
|
||||
virtual void Destroy();
|
||||
virtual bool CanHandle(const char* type) const;
|
||||
};
|
||||
|
||||
@ -34,4 +34,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <core/config.h>
|
||||
#ifdef WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
@ -53,6 +53,7 @@
|
||||
#endif
|
||||
|
||||
#include <set>
|
||||
|
||||
#include <core/sdk/IMetadataReader.h>
|
||||
|
||||
class TaglibMetadataReader : public musik::core::sdk::IMetadataReader {
|
||||
|
||||
@ -35,27 +35,9 @@
|
||||
#pragma once
|
||||
|
||||
#ifdef WIN32
|
||||
// Modify the following defines if you have to target a platform prior to the ones specified below.
|
||||
// Refer to MSDN for the latest info on corresponding values for different platforms.
|
||||
#ifndef WINVER // Allow use of features specific to Windows XP or later.
|
||||
#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
|
||||
#endif
|
||||
|
||||
#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
|
||||
#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
|
||||
#endif
|
||||
|
||||
#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
|
||||
#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
|
||||
#endif
|
||||
|
||||
#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
|
||||
#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
|
||||
#endif
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
// Windows Header Files:
|
||||
#include <windows.h>
|
||||
|
||||
//#include "vld/vld.h"
|
||||
#endif //WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
@ -34,18 +34,18 @@
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "TaglibMetadataReader.h"
|
||||
#include "core/sdk/IPlugin.h"
|
||||
#include <core/sdk/IPlugin.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
#define DLLEXPORT
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||
return TRUE;
|
||||
}
|
||||
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||
return TRUE;
|
||||
}
|
||||
#endif
|
||||
|
||||
class TaglibPlugin : public musik::core::sdk::IPlugin {
|
||||
|
||||
@ -33,6 +33,3 @@
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <core/config.h>
|
||||
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "pch.h"
|
||||
#include "WaveOut.h"
|
||||
#include <core/sdk/constants.h>
|
||||
|
||||
|
||||
@ -32,9 +32,9 @@
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "pch.h"
|
||||
#include "WaveOutBuffer.h"
|
||||
#include "WaveOut.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
WaveOutBuffer::WaveOutBuffer(WaveOut *waveOut)
|
||||
|
||||
@ -34,13 +34,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "pch.h"
|
||||
#include <core/sdk/IBuffer.h>
|
||||
#include <core/sdk/IBufferProvider.h>
|
||||
#ifdef WIN32
|
||||
#include "Mmsystem.h"
|
||||
#else
|
||||
#include <alsa/asoundlib.h>
|
||||
#endif
|
||||
|
||||
class WaveOut;
|
||||
|
||||
|
||||
@ -32,21 +32,15 @@
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Precompiled headers
|
||||
#pragma once
|
||||
|
||||
#include <core/config.h>
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#define NOMINMAX
|
||||
|
||||
#ifdef WIN32
|
||||
#include <mmsystem.h>
|
||||
#include <mmreg.h>
|
||||
#include <ks.h>
|
||||
#include <ksmedia.h>
|
||||
|
||||
//#include "vld/vld.h"
|
||||
|
||||
#else
|
||||
|
||||
#include <alsa/asoundlib.h>
|
||||
|
||||
#endif //WIN32
|
||||
#include <windows.h>
|
||||
#include <Mmsystem.h>
|
||||
#include <Mmreg.h>
|
||||
#include <KS.h>
|
||||
#include <Ksmedia.h>
|
||||
@ -33,7 +33,6 @@
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "pch.h"
|
||||
|
||||
#include <core/sdk/IPlugin.h>
|
||||
#include "WaveOut.h"
|
||||
|
||||
|
||||
@ -195,7 +195,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved) {
|
||||
delete ::spectrumIn;
|
||||
delete ::spectrumOut;
|
||||
::spectrumIn = nullptr;
|
||||
::spectrumOut == nullptr;
|
||||
::spectrumOut = nullptr;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -25,12 +25,11 @@ set(CORE_SOURCES
|
||||
./library/track/Track.cpp
|
||||
./library/track/RetainedTrack.cpp
|
||||
./plugin/PluginFactory.cpp
|
||||
./runtime/Message.cpp
|
||||
./runtime/MessageQueue.cpp
|
||||
./runtime/Message.cpp
|
||||
./runtime/MessageQueue.cpp
|
||||
./support/Common.cpp
|
||||
./support/Preferences.cpp
|
||||
./support/PreferenceKeys.cpp
|
||||
../3rdparty/src/md5/md5.c
|
||||
../3rdparty/src/sqlite/sqlite3.c
|
||||
../3rdparty/src/kiss_fft.c
|
||||
../3rdparty/src/kiss_fftr.c
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "sdk/config.h"
|
||||
#include "utfutil.h"
|
||||
|
||||
#include <memory>
|
||||
@ -42,6 +41,20 @@
|
||||
#include <boost/format.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
|
||||
#ifdef WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#define NOMINMAX
|
||||
|
||||
typedef __int64 int64;
|
||||
typedef unsigned __int64 uint64;
|
||||
|
||||
#include <windows.h>
|
||||
#else
|
||||
typedef __uint64_t uint64;
|
||||
typedef __int64_t int64;
|
||||
#endif
|
||||
|
||||
typedef uint64 DBID;
|
||||
typedef uint64 VERSION;
|
||||
typedef uint64 DBTIME;
|
||||
@ -151,7 +151,6 @@
|
||||
<ClInclude Include="runtime\IMessageTarget.h" />
|
||||
<ClInclude Include="runtime\Message.h" />
|
||||
<ClInclude Include="runtime\MessageQueue.h" />
|
||||
<ClInclude Include="sdk\config.h" />
|
||||
<ClInclude Include="sdk\constants.h" />
|
||||
<ClInclude Include="sdk\IAnalyzer.h" />
|
||||
<ClInclude Include="sdk\IBuffer.h" />
|
||||
|
||||
@ -216,9 +216,6 @@
|
||||
<ClInclude Include="library\metadata\MetadataValue.h">
|
||||
<Filter>src\library\metadata</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="sdk\config.h">
|
||||
<Filter>src\sdk</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="sdk\IMetadataReader.h">
|
||||
<Filter>src\sdk</Filter>
|
||||
</ClInclude>
|
||||
|
||||
@ -36,7 +36,6 @@
|
||||
|
||||
#include <core/library/track/IndexerTrack.h>
|
||||
|
||||
#include <core/sdk/config.h>
|
||||
#include <core/support/Common.h>
|
||||
#include <core/db/Connection.h>
|
||||
#include <core/db/Statement.h>
|
||||
@ -118,11 +117,11 @@ std::string IndexerTrack::Uri() {
|
||||
}
|
||||
|
||||
int IndexerTrack::GetValue(const char* key, char* dst, int size) {
|
||||
return musik::sdk::copyString(this->GetValue(key), dst, size);
|
||||
return CopyString(this->GetValue(key), dst, size);
|
||||
}
|
||||
|
||||
int IndexerTrack::Uri(char* dst, int size) {
|
||||
return musik::sdk::copyString(this->Uri(), dst, size);
|
||||
return CopyString(this->Uri(), dst, size);
|
||||
}
|
||||
|
||||
Track::MetadataIteratorRange IndexerTrack::GetValues(const char* metakey) {
|
||||
@ -282,7 +281,7 @@ DBID IndexerTrack::SaveThumbnail(db::Connection& connection, const std::string&
|
||||
|
||||
#ifdef WIN32
|
||||
std::wstring wfilename = u8to16(filename);
|
||||
FILE *thumbFile = _wfopen(wfilename.c_str(), _T("wb"));
|
||||
FILE *thumbFile = _wfopen(wfilename.c_str(), L"wb");
|
||||
#else
|
||||
FILE *thumbFile = fopen(filename.c_str(), "wb");
|
||||
#endif
|
||||
|
||||
@ -37,7 +37,6 @@
|
||||
#include <core/library/track/LibraryTrack.h>
|
||||
#include <core/library/LibraryFactory.h>
|
||||
|
||||
#include <core/sdk/config.h>
|
||||
#include <core/support/Common.h>
|
||||
#include <core/db/Connection.h>
|
||||
#include <core/db/Statement.h>
|
||||
@ -98,11 +97,11 @@ std::string LibraryTrack::Uri() {
|
||||
}
|
||||
|
||||
int LibraryTrack::GetValue(const char* key, char* dst, int size) {
|
||||
return musik::sdk::copyString(this->GetValue(key), dst, size);
|
||||
return CopyString(this->GetValue(key), dst, size);
|
||||
}
|
||||
|
||||
int LibraryTrack::Uri(char* dst, int size) {
|
||||
return musik::sdk::copyString(this->Uri(), dst, size);
|
||||
return CopyString(this->Uri(), dst, size);
|
||||
}
|
||||
|
||||
Track::MetadataIteratorRange LibraryTrack::GetValues(const char* metakey) {
|
||||
|
||||
@ -43,8 +43,11 @@
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/thread/mutex.hpp>
|
||||
|
||||
#ifndef WIN32
|
||||
#ifdef WIN32
|
||||
#define STDCALL(fp) (__stdcall* fp)()
|
||||
#else
|
||||
#include <dlfcn.h>
|
||||
#define STDCALL(fp) (* fp)()
|
||||
#endif
|
||||
|
||||
namespace musik { namespace core {
|
||||
@ -53,28 +56,6 @@ namespace musik { namespace core {
|
||||
public:
|
||||
static PluginFactory& Instance();
|
||||
|
||||
private:
|
||||
|
||||
PluginFactory();
|
||||
~PluginFactory();
|
||||
void LoadPlugins();
|
||||
|
||||
private:
|
||||
#ifdef WIN32
|
||||
typedef musik::core::sdk::IPlugin* STDCALL(CallGetPlugin);
|
||||
#else
|
||||
typedef musik::core::sdk::IPlugin* (*CallGetPlugin)();
|
||||
#endif
|
||||
|
||||
typedef std::vector<musik::core::sdk::IPlugin*> PluginList;
|
||||
typedef std::vector<void*> HandleList;
|
||||
|
||||
PluginList loadedPlugins;
|
||||
HandleList loadedDlls;
|
||||
boost::mutex mutex;
|
||||
|
||||
public:
|
||||
|
||||
template <typename T>
|
||||
class DestroyDeleter {
|
||||
public: void operator()(T* t) {
|
||||
@ -100,11 +81,11 @@ namespace musik { namespace core {
|
||||
Iterator currentDll = allDlls.begin();
|
||||
while (currentDll != allDlls.end()) {
|
||||
PluginInterfaceCall funcPtr =
|
||||
#ifdef WIN32
|
||||
#ifdef WIN32
|
||||
(PluginInterfaceCall) GetProcAddress((HMODULE)(*currentDll), functionName);
|
||||
#else
|
||||
#else
|
||||
(PluginInterfaceCall) dlsym(*currentDll, functionName);
|
||||
#endif
|
||||
#endif
|
||||
if (funcPtr) {
|
||||
T* result = funcPtr();
|
||||
|
||||
@ -118,5 +99,25 @@ namespace musik { namespace core {
|
||||
|
||||
return plugins;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
PluginFactory();
|
||||
~PluginFactory();
|
||||
|
||||
void LoadPlugins();
|
||||
|
||||
#ifdef WIN32
|
||||
typedef musik::core::sdk::IPlugin* STDCALL(CallGetPlugin);
|
||||
#else
|
||||
typedef musik::core::sdk::IPlugin* (*CallGetPlugin)();
|
||||
#endif
|
||||
|
||||
typedef std::vector<musik::core::sdk::IPlugin*> PluginList;
|
||||
typedef std::vector<void*> HandleList;
|
||||
|
||||
PluginList loadedPlugins;
|
||||
HandleList loadedDlls;
|
||||
boost::mutex mutex;
|
||||
};
|
||||
} }
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <core/sdk/config.h>
|
||||
#include <core/config.h>
|
||||
#include <memory>
|
||||
|
||||
namespace musik { namespace core { namespace runtime {
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IMetadataWriter.h"
|
||||
#include "IBuffer.h"
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
class IBuffer {
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IBuffer.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IBuffer.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
typedef long PositionType;
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IDataStream.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IDataStream.h"
|
||||
#include "IBuffer.h"
|
||||
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IDecoder.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IMetadataWriter.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
class IMetadataWriter {
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IPlugin.h"
|
||||
#include "IDataStream.h"
|
||||
#include "IBuffer.h"
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "IPlaybackService.h"
|
||||
#include "ITrack.h"
|
||||
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
#include "constants.h"
|
||||
#include "IRetainedTrack.h"
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
class IPlugin {
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config.h"
|
||||
|
||||
namespace musik { namespace core { namespace sdk {
|
||||
|
||||
class ITrack {
|
||||
|
||||
@ -1,88 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (c) 2007-2016 musikcube team
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright notice,
|
||||
// this list of conditions and the following disclaimer.
|
||||
//
|
||||
// * Redistributions in binary form must reproduce the above copyright
|
||||
// notice, this list of conditions and the following disclaimer in the
|
||||
// documentation and/or other materials provided with the distribution.
|
||||
//
|
||||
// * Neither the name of the author nor the names of other contributors may
|
||||
// be used to endorse or promote products derived from this software
|
||||
// without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
// POSSIBILITY OF SUCH DAMAGE.
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0502
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#define NOMINMAX
|
||||
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
|
||||
#define sleep_ms(x) Sleep(x)
|
||||
|
||||
typedef __int64 int64;
|
||||
typedef unsigned __int64 uint64;
|
||||
|
||||
#define STDCALL(fp) (__stdcall* fp)()
|
||||
#else
|
||||
#include <cassert>
|
||||
#include <unistd.h>
|
||||
|
||||
#define sleep_ms(x) usleep(x * 1000)
|
||||
|
||||
typedef __uint64_t uint64;
|
||||
typedef __int64_t int64;
|
||||
|
||||
#define STDCALL(fp) (* fp)()
|
||||
#define _ASSERT assert
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
|
||||
/* a super small collection of inlined tools that most plugins will
|
||||
need to use. these should be header only, and have no dependencies
|
||||
other than STL */
|
||||
namespace musik {
|
||||
namespace sdk {
|
||||
inline bool endsWith(const std::string& s, const std::string& suffix) {
|
||||
return
|
||||
s.size() >= suffix.size() &&
|
||||
s.rfind(suffix) == (s.size() - suffix.size());
|
||||
}
|
||||
|
||||
static inline size_t copyString(const std::string& src, char* dst, size_t size) {
|
||||
size_t len = src.size() + 1; /* space for the null terminator */
|
||||
if (dst) {
|
||||
size_t copied = src.copy(dst, size - 1);
|
||||
dst[copied] = '\0';
|
||||
return copied + 1;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -90,9 +90,9 @@ std::string musik::core::GetHomeDirectory() {
|
||||
std::string directory;
|
||||
|
||||
#ifdef WIN32
|
||||
DWORD bufferSize = GetEnvironmentVariable(_T("USERPROFILE"), 0, 0);
|
||||
DWORD bufferSize = GetEnvironmentVariable(L"USERPROFILE", 0, 0);
|
||||
wchar_t *buffer = new wchar_t[bufferSize + 2];
|
||||
GetEnvironmentVariable(_T("USERPROFILE"), buffer, bufferSize);
|
||||
GetEnvironmentVariable(L"USERPROFILE", buffer, bufferSize);
|
||||
directory.assign(u16to8(buffer));
|
||||
delete[] buffer;
|
||||
#else
|
||||
@ -106,9 +106,9 @@ std::string musik::core::GetDataDirectory() {
|
||||
std::string directory;
|
||||
|
||||
#ifdef WIN32
|
||||
DWORD bufferSize = GetEnvironmentVariable(_T("APPDATA"), 0, 0);
|
||||
DWORD bufferSize = GetEnvironmentVariable(L"APPDATA", 0, 0);
|
||||
wchar_t *buffer = new wchar_t[bufferSize + 2];
|
||||
GetEnvironmentVariable(_T("APPDATA"), buffer, bufferSize);
|
||||
GetEnvironmentVariable(L"APPDATA", buffer, bufferSize);
|
||||
directory.assign(u16to8(buffer));
|
||||
directory.append("/mC2/");
|
||||
delete[] buffer;
|
||||
@ -160,3 +160,13 @@ uint64 musik::core::Checksum(char *data,unsigned int bytes) {
|
||||
}
|
||||
return sum;
|
||||
}
|
||||
|
||||
size_t musik::core::CopyString(const std::string& src, char* dst, size_t size) {
|
||||
size_t len = src.size() + 1; /* space for the null terminator */
|
||||
if (dst) {
|
||||
size_t copied = src.copy(dst, size - 1);
|
||||
dst[copied] = '\0';
|
||||
return copied + 1;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
@ -45,5 +45,6 @@ namespace musik { namespace core {
|
||||
std::string GetPath(const std::string &sFile);
|
||||
std::string GetPluginDirectory();
|
||||
uint64 Checksum(char *data,unsigned int bytes);
|
||||
size_t CopyString(const std::string& src, char* dst, size_t size);
|
||||
|
||||
} }
|
||||
|
||||
@ -60,8 +60,8 @@
|
||||
#include <boost/chrono.hpp>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <app/util/Win32Util.h>
|
||||
#undef MOUSE_MOVED
|
||||
#include <app/util/Win32Util.h>
|
||||
#undef MOUSE_MOVED
|
||||
#endif
|
||||
|
||||
using namespace musik::box::audio;
|
||||
@ -74,13 +74,13 @@ using namespace cursespp;
|
||||
#define MIN_HEIGHT 12
|
||||
|
||||
#ifdef WIN32
|
||||
int _main(int argc, _TCHAR* argv[]);
|
||||
int _main(int argc, wchar_t* argv[]);
|
||||
|
||||
int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow) {
|
||||
_main(0, 0);
|
||||
}
|
||||
|
||||
int _main(int argc, _TCHAR* argv[])
|
||||
int _main(int argc, wchar_t* argv[])
|
||||
#else
|
||||
int main(int argc, char* argv[])
|
||||
#endif
|
||||
|
||||
@ -72,7 +72,7 @@
|
||||
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>../3rdparty/lib;../../../boost_1_60_0/lib32-msvc-14.0;../3rdparty/win32_bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>../3rdparty/win32_lib;../../../boost_1_60_0/lib32-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@ -99,7 +99,7 @@
|
||||
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>../3rdparty/lib;../../../boost_1_60_0/lib32-msvc-14.0;../3rdparty/win32_bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>../3rdparty/win32_lib;../../../boost_1_60_0/lib32-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user