[Scummvm-cvs-logs] CVS: scummvm/sound/softsynth/mt32 mt32_file.cpp,1.1,1.2 mt32_file.h,1.2,1.3 partialManager.cpp,1.3,1.4 tables.cpp,1.4,1.5

Jerome Fisher kingguppy at users.sourceforge.net
Sun Jul 3 15:59:52 CEST 2005


Update of /cvsroot/scummvm/scummvm/sound/softsynth/mt32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22417

Modified Files:
	mt32_file.cpp mt32_file.h partialManager.cpp tables.cpp 
Log Message:
- Small changes to sync with Munt.


Index: mt32_file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/mt32/mt32_file.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mt32_file.cpp	25 Dec 2004 18:34:44 -0000	1.1
+++ mt32_file.cpp	3 Jul 2005 22:56:51 -0000	1.2
@@ -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

Index: mt32_file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/mt32/mt32_file.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mt32_file.h	9 May 2005 12:26:07 -0000	1.2
+++ mt32_file.h	3 Jul 2005 22:56:51 -0000	1.3
@@ -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

Index: partialManager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/mt32/partialManager.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- partialManager.cpp	9 May 2005 21:21:21 -0000	1.3
+++ partialManager.cpp	3 Jul 2005 22:56:51 -0000	1.4
@@ -19,11 +19,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifdef __amigaos4__
-#include <strings.h>
-#else
-#include <memory.h>
-#endif
+#include <string.h>
 
 #include "mt32emu.h"
 

Index: tables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/mt32/tables.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tables.cpp	9 May 2005 22:38:44 -0000	1.4
+++ tables.cpp	3 Jul 2005 22:56:51 -0000	1.5
@@ -164,7 +164,7 @@
 		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;
 			}





More information about the Scummvm-git-logs mailing list