diff options
| author | elupus <elupus@svn> | 2010-01-23 20:28:12 +0000 |
|---|---|---|
| committer | elupus <elupus@svn> | 2010-01-23 20:28:12 +0000 |
| commit | 514bc8bdcff14a6b0c38f4abed2bf9ffa9f74e4b (patch) | |
| tree | b1eb4384a01a316836f1efc05171f8b89453e148 /lib/libmodplug/src/load_mid.cpp | |
| parent | c059a8975af3ba9b96eb194ccedb3c5f23c1e505 (diff) | |
added: libmodplug library for win32 (totally untested, just made it compile and link)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27112 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'lib/libmodplug/src/load_mid.cpp')
| -rw-r--r-- | lib/libmodplug/src/load_mid.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/libmodplug/src/load_mid.cpp b/lib/libmodplug/src/load_mid.cpp index 1429af4baf..5a84b3500b 100644 --- a/lib/libmodplug/src/load_mid.cpp +++ b/lib/libmodplug/src/load_mid.cpp @@ -29,7 +29,7 @@ #include <string.h> #include <math.h> #include <ctype.h> -#include <unistd.h> // for sleep +#include "stdafx.h" #ifdef NEWMIKMOD #include "mikmod.h" @@ -119,6 +119,7 @@ typedef struct _MIDTRACK #define DupStr(h,buf,sz) strdup(buf) #define _mm_calloc(h,n,sz) calloc(n,sz) #define _mm_recalloc(h,buf,sz,elsz) realloc(buf,sz) +#undef _mm_free #define _mm_free(h,p) free(p) typedef struct { @@ -1157,7 +1158,7 @@ static int MID_ReadPatterns(MODCOMMAND *pattern[], WORD psize[], MIDHANDLE *h, i n = pat_modnote(e->note); ins = e->smpno; if( e->volume == 0 ) { - m->param = modticks(h, e->tracktick - tt1); + m->param = (BYTE)modticks(h, e->tracktick - tt1); if( m->param ) { // note cut m->command = CMD_S3MCMDEX; m->param |= 0xC0; @@ -1171,14 +1172,14 @@ static int MID_ReadPatterns(MODCOMMAND *pattern[], WORD psize[], MIDHANDLE *h, i else { vol = e->volume/2; if( el->volume == 0 ) { - m->param = modticks(h, el->tracktick - tt1); + m->param = (BYTE)modticks(h, el->tracktick - tt1); if( m->param ) { // note cut m->command = CMD_S3MCMDEX; m->param |= 0xC0; } } else { - m->param = modticks(h, e->tracktick - tt1); + m->param = (BYTE)modticks(h, e->tracktick - tt1); if( m->param ) { // note delay m->command = CMD_S3MCMDEX; m->param |= 0xD0; @@ -1211,7 +1212,7 @@ static int MID_ReadPatterns(MODCOMMAND *pattern[], WORD psize[], MIDHANDLE *h, i } else { // retrigger same note... m->command = CMD_RETRIG; - m->param = modticks(h, el->tracktick - tt1); + m->param = (BYTE)modticks(h, el->tracktick - tt1); } } else |