tfmx.c,.h: added portamento and envelope-effect (envelope not active yet)

	renamed some variables
	made sure the fixed-point multiplications have the same results, even in cornercases
paula.cpp: changed/reverted stuff in Paula again.

svn-id: r41410

2 files changed, 10 insertions, 0 deletions

diff --git a/tfmx/tfmxdebug.cpp b/tfmx/tfmxdebug.cpp
index f6ef03dc08..0c411582f8 100644
--- a/tfmx/tfmxdebug.cpp
+++ b/tfmx/tfmxdebug.cpp
@@ -120,6 +120,15 @@ void displayTrackstep(const void *const vptr) {
 	}
 }
 
+void displayMacroStep(const void *const vptr, int chan, int index) {
+	const byte *const macroData = (const byte *const)vptr;
+
+	if (macroData[0] < ARRAYSIZE(macrocmds))
+		debug("%02X %02X %s %02X%02X%02X", chan, index, macrocmds[macroData[0]], macroData[1], macroData[2], macroData[3]);
+	else
+		debug("%02X %02X Unkown Macro #%02X %02X%02X%02X", chan, index, macroData[0], macroData[1], macroData[2], macroData[3]);
+}
+
 void displayMacroStep(const void *const vptr) {
 	const byte *const macroData = (const byte *const)vptr;
 
diff --git a/tfmx/tfmxdebug.h b/tfmx/tfmxdebug.h
index dba283b673..e849e561a9 100644
--- a/tfmx/tfmxdebug.h
+++ b/tfmx/tfmxdebug.h
@@ -4,6 +4,7 @@
 void displayTrackstep(const void *const vptr);
 void displayPatternstep(const void *const vptr);
 void displayMacroStep(const void *const vptr);
+void displayMacroStep(const void *const vptr, int chan, int index);
 void dumpTracksteps(Audio::Tfmx &player, uint16 first, uint16 last);
 void dumpTrackstepsBySong(Audio::Tfmx &player, int song);
 void dumpMacro(Audio::Tfmx &player, uint16 macroIndex, uint16 len = 0, uint16 start = 0);