Hi all, Got a few small patches here to fix warnings and to persuade LAME to compile under MSVC and Cygwin; they mainly handle cases where BRHIST and HAVEGTK are not defined. The files affected are Makefile.MSVC brhist.c get_audio.c lame.c loopold.c machine.h parse.c psymodel.c quantize.c Also, I'm getting an assertion failure in psymodel.c line 658, "partition_s[j] >= 0". This affects both MSVC and Cygwin (gcc) versions, so I don't think it's compiler-specific. It happens on testcase.wav, for example, but on all others I've tried too. It seems that partition_s[j] is never being changed from its initial value of -1. ------------------------------------------------------------------- cvs -q diff (in directory R:\Source\lame\) Index: Makefile.MSVC =================================================================== RCS file: /cvsroot/lame/lame/Makefile.MSVC,v retrieving revision 1.1.1.1 diff -r1.1.1.1 Makefile.MSVC 8c8 < # CC_OPTS = /nologo /Zi --- > # CC_OPTS = /nologo /Zi /Ge /GZ 34a35 > parse.c \ Index: brhist.c =================================================================== RCS file: /cvsroot/lame/lame/brhist.c,v retrieving revision 1.1 diff -r1.1 brhist.c 2d1 < #include <termcap.h> 10a10 > #include <termcap.h> Index: get_audio.c =================================================================== RCS file: /cvsroot/lame/lame/get_audio.c,v retrieving revision 1.18 diff -r1.18 get_audio.c 0a1,3 > #ifdef __CYGWIN__ > #include <io.h> > #endif Index: lame.c =================================================================== RCS file: /cvsroot/lame/lame/lame.c,v retrieving revision 1.50 diff -r1.50 lame.c 81a82 > #ifdef BRHIST 88c89 < --- > #endif 520c521 < III_psy_ratio *masking; /*LR ratios and MS ratios*/ --- > III_psy_ratio (*masking)[2]; /*LR ratios and MS ratios*/ Index: loopold.c =================================================================== RCS file: /cvsroot/lame/lame/loopold.c,v retrieving revision 1.25 diff -r1.25 loopold.c 182c182,185 < int sfb, bits, huff_bits; --- > #ifdef HAVEGTK > int sfb; > #endif > int bits, huff_bits; Index: machine.h =================================================================== RCS file: /cvsroot/lame/lame/machine.h,v retrieving revision 1.7 diff -r1.7 machine.h 78c78 < #ifdef _WIN32 --- > #if defined _WIN32 && !defined __CYGWIN__ Index: parse.c =================================================================== RCS file: /cvsroot/lame/lame/parse.c,v retrieving revision 1.4 diff -r1.4 parse.c 0a1,3 > #ifdef __CYGWIN__ > #include <io.h> > #endif Index: psymodel.c =================================================================== RCS file: /cvsroot/lame/lame/psymodel.c,v retrieving revision 1.31 diff -r1.31 psymodel.c 396c396 < fft_short( wsamp_s, energy_s, chn, buffer); --- > fft_short( (FLOAT *)wsamp_s, energy_s, chn, buffer); Index: quantize.c =================================================================== RCS file: /cvsroot/lame/lame/quantize.c,v retrieving revision 1.42 diff -r1.42 quantize.c 577c577,580 < int sfb, huff_bits; --- > #ifdef HAVEGTK > int sfb; > #endif > int huff_bits; ------------------------------------------------------------------- Cheers, -- Mat. -- MP3 ENCODER mailing list ( http://geek.rcc.se/mp3encoder/ )
