diff options
Diffstat (limited to 'sound/softsynth')
| -rw-r--r-- | sound/softsynth/mt32/mt32_file.cpp | 2 | ||||
| -rw-r--r-- | sound/softsynth/mt32/mt32_file.h | 2 | ||||
| -rw-r--r-- | sound/softsynth/mt32/partialManager.cpp | 6 | ||||
| -rw-r--r-- | sound/softsynth/mt32/tables.cpp | 2 | 
4 files changed, 4 insertions, 8 deletions
diff --git a/sound/softsynth/mt32/mt32_file.cpp b/sound/softsynth/mt32/mt32_file.cpp index 8cf4e14a7d..86cb29fd49 100644 --- a/sound/softsynth/mt32/mt32_file.cpp +++ b/sound/softsynth/mt32/mt32_file.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2003-2004 Various contributors +/* Copyright (c) 2003-2005 Various contributors   *   * Permission is hereby granted, free of charge, to any person obtaining a copy   * of this software and associated documentation files (the "Software"), to diff --git a/sound/softsynth/mt32/mt32_file.h b/sound/softsynth/mt32/mt32_file.h index c0fd050e18..5f05c9e9ae 100644 --- a/sound/softsynth/mt32/mt32_file.h +++ b/sound/softsynth/mt32/mt32_file.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2003-2004 Various contributors +/* Copyright (c) 2003-2005 Various contributors   *   * Permission is hereby granted, free of charge, to any person obtaining a copy   * of this software and associated documentation files (the "Software"), to diff --git a/sound/softsynth/mt32/partialManager.cpp b/sound/softsynth/mt32/partialManager.cpp index fb6973a0b2..3d3b6302db 100644 --- a/sound/softsynth/mt32/partialManager.cpp +++ b/sound/softsynth/mt32/partialManager.cpp @@ -19,11 +19,7 @@   * IN THE SOFTWARE.   */ -#ifdef __amigaos4__ -#include <strings.h> -#else -#include <memory.h> -#endif +#include <string.h>  #include "mt32emu.h" diff --git a/sound/softsynth/mt32/tables.cpp b/sound/softsynth/mt32/tables.cpp index 199221986e..e12f306cf9 100644 --- a/sound/softsynth/mt32/tables.cpp +++ b/sound/softsynth/mt32/tables.cpp @@ -164,7 +164,7 @@ void Tables::initEnvelopes(float samplerate) {  		if (elf == 0) {  			envDeltaMaxTime[lf] = 63;  		} else { -			float cap = 11 * (float)log(elf) + 64; +			float cap = 11.0f * logf(elf) + 64;  			if (cap > 100.0f) {  				cap = 100.0f;  			}  | 
