Merge branch 'master' of https://github.com/tildearrow/furnace into es5506_alt

* 'master' of https://github.com/tildearrow/furnace:
  implement channel swapping
  implement relative pitch macro mode
  prepare for relative pitch macro

# Conflicts:
#	src/gui/insEdit.cpp

src/engine/dispatch.h

@@ -466,4 +466,8 @@ class DivDispatch {
 #define COLOR_NTSC (315000000.0/88.0)
 #define COLOR_PAL (283.75*15625.0+25.0)
 
+#define CLAMP_VAR(x,xMin,xMax) \
+  if ((x)<(xMin)) (x)=(xMin); \
+  if ((x)>(xMax)) (x)=(xMax);
+
 #endif