Update of /cvsroot/alpp/openalpp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31472/src
Modified Files:
groupsource.cpp
Log Message:
Minor patches applied
Index: groupsource.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/groupsource.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** groupsource.cpp 11 Nov 2004 07:57:58 -0000 1.9
--- groupsource.cpp 7 Feb 2005 19:42:41 -0000 1.10
***************
*** 44,48 ****
}
! ALfloat FilterDoppler(ALuint source) {
// This space intentionally left blank. Doppler effects don't really make
// much sense for group sources.
--- 44,48 ----
}
! ALfloat FilterDoppler(ALuint) {
// This space intentionally left blank. Doppler effects don't really make
// much sense for group sources.
***************
*** 376,381 ****
bsize=loadsize;
bdata=(ALshort *)converter.apply(loaddata,format,
! (unsigned int)freq,(unsigned int)bsize);
if(!bdata)
--- 376,384 ----
bsize=loadsize;
+
+ // Fix to make g++3.4.2 happy
+ unsigned int usize=bsize;
bdata=(ALshort *)converter.apply(loaddata,format,
! (unsigned int)freq,usize);
if(!bdata)
***************
*** 394,399 ****
size=loadsize;
data=(ALshort *)converter.apply(loaddata,format,
! (unsigned int)freq,(unsigned int)size);
if(!data)
throw FatalError("Error converting data to internal format!");
--- 397,403 ----
size=loadsize;
+ unsigned int usize = size;
data=(ALshort *)converter.apply(loaddata,format,
! (unsigned int)freq,usize);
if(!data)
throw FatalError("Error converting data to internal format!");
***************
*** 412,416 ****
}
ALint amp;
! for(unsigned int i=0;i<(size/2);i++) {
amp=bdata[i]+data[i];
if(amp>32767)
--- 416,420 ----
}
ALint amp;
! for(ALsizei i=0;i<(size/2);i++) {
amp=bdata[i]+data[i];
if(amp>32767)
|
