From 1a8f07de821323d18252044cd2bb13226fc33a5d Mon Sep 17 00:00:00 2001 From: darkeye Date: Mon, 19 Feb 2007 07:55:42 +0000 Subject: [PATCH] fixing TwoLameLibEncoder.cpp for 64-bit compilation, minor code cleanup, fixes #11 --- darkice/trunk/src/TwoLameLibEncoder.cpp | 2 +- darkice/trunk/src/VorbisLibEncoder.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/darkice/trunk/src/TwoLameLibEncoder.cpp b/darkice/trunk/src/TwoLameLibEncoder.cpp index 26693d4..08d5198 100644 --- a/darkice/trunk/src/TwoLameLibEncoder.cpp +++ b/darkice/trunk/src/TwoLameLibEncoder.cpp @@ -116,7 +116,7 @@ TwoLameLibEncoder :: open ( void ) if ( !twolame_opts ) { throw Exception( __FILE__, __LINE__, "TwoLAME lib init error", - (int) twolame_opts); + (long int) twolame_opts); } if ( 0 > twolame_set_num_channels( twolame_opts, getInChannel()) ) { diff --git a/darkice/trunk/src/VorbisLibEncoder.cpp b/darkice/trunk/src/VorbisLibEncoder.cpp index 4fde50a..2f5e276 100644 --- a/darkice/trunk/src/VorbisLibEncoder.cpp +++ b/darkice/trunk/src/VorbisLibEncoder.cpp @@ -274,12 +274,14 @@ VorbisLibEncoder :: write ( const void * buf, if ( bitsPerSample == 8 ) { char * buf8 = (char *) buf; unsigned int ix = sampleSize * i; - buf8[i] = (buf8[ix] + buf8[++ix]) / 2; + unsigned int iix = ix; + buf8[i] = (buf8[ix] + buf8[++iix]) / 2; } if ( bitsPerSample == 16 ) { short * buf16 = (short *) buf; unsigned int ix = (bitsPerSample >> 3) * i; - buf16[i] = (buf16[ix] + buf16[++ix]) / 2; + unsigned int iix = ix; + buf16[i] = (buf16[ix] + buf16[++iix]) / 2; } } len >>= 1;