AudioTrack for Jeskola Buzz 64-bit patch

audiotrack.x64.patch

diff -rupN original/input/input_machine.cpp new/input/input_machine.cpp
--- original/input/input_machine.cpp	2008-12-07 15:44:12.177669000 +0100
+++ new/input/input_machine.cpp	2014-04-20 12:15:57.865877900 +0200
@@ -5,7 +5,7 @@
 ** ©2004 Edward Powley                                 **
 ********************************************************/
 
-#include "../../mdk/mdk.h"
+#include "../MachineInterface.h"
 #include <float.h>
 #include <math.h>
 #include <stdlib.h>
@@ -97,14 +97,15 @@ bool mi::DblClickEvent(void *p)
 	return false;
 }
 
-void mi::MDKInit (CMachineDataInput * const pi)
+void mi::Init (CMachineDataInput * const pi)
 //Initialise machine and load data from file
 {
-	SetOutputMode(true);
+	//SetOutputMode(true);
+	pCB->SetMachineInterfaceEx(&ex);
 
 	m_thismac = pCB->GetThisMachine();
 
-	m_hMainDll = LoadLibrary("Gear\\Generators\\BTDSys AudioTrack BETA 081029.dll");
+	m_hMainDll = LoadLibrary("Gear\\Generators\\BTDSys AudioTrack BETA 081029.x64.dll");
 	if (!m_hMainDll)
 	{
 		std::string error; getWindowsErrorMessage(error);
@@ -135,14 +136,14 @@ void mi::MDKInit (CMachineDataInput * co
 
 ////////////////////////////////////////////////////////////////////////
 
-void mi::MDKSave (CMachineDataOutput * const po)
+void mi::Save (CMachineDataOutput * const po)
 //Save data to file
 {
 }
 
 ////////////////////////////////////////////////////////////////////////
 
-bool mi::MDKWorkStereo(float *psamples, int numsamples, const int mode)
+bool mi::Work(float *psamples, int numsamples, const int mode)
 {
 	m_lastposintick = pMasterInfo->PosInTick;
 	m_lastnumsamples = numsamples;
diff -rupN original/input/input_machine.h new/input/input_machine.h
--- original/input/input_machine.h	2008-10-11 02:36:22.887530000 +0200
+++ new/input/input_machine.h	2014-04-20 12:15:57.875877900 +0200
@@ -3,7 +3,7 @@
 
 #include <math.h>
 #include <windows.h>
-#include "../../mdk/mdk.h"
+#include "../MachineInterface.h"
 
 namespace InputMachine
 {
@@ -66,26 +66,25 @@ namespace InputMachine
 
 	class mi;
 
-	class miex : public CMDKMachineInterfaceEx
+	class miex : public CMachineInterfaceEx
 	{
 	public:
 		mi *pmi;
 	};
 
-	class mi : public CMDKMachineInterface
+	class mi : public CMachineInterface
 	{
 	public:
 		mi();
 		virtual ~mi();
 		virtual void Tick();
 		virtual void Stop();
-		virtual void MDKInit(CMachineDataInput * const pi);
-		virtual bool MDKWorkStereo(float *psamples, int numsamples, int const mode);
-		virtual bool MDKWork(float *psamples, int numsamples, int const mode) {return false;};
+		virtual void Init(CMachineDataInput * const pi);
+		virtual bool Work(float *psamples, int numsamples, int const mode);
 		virtual void Command(int const i);
-		virtual void MDKSave(CMachineDataOutput * const po);
+		virtual void Save(CMachineDataOutput * const po);
 		virtual char const *DescribeValue(int const param, int const value);
-		virtual CMDKMachineInterfaceEx *GetEx() { return &ex; }
+		virtual CMachineInterfaceEx *GetEx() { return &ex; }
 		virtual void OutputModeChanged(bool stereo) {}
 
 		bool DblClickEvent(void *p);
diff -rupN original/input/input_paperwork.cpp new/input/input_paperwork.cpp
--- original/input/input_paperwork.cpp	2008-10-11 02:36:22.887530000 +0200
+++ new/input/input_paperwork.cpp	2014-04-20 12:15:57.845877900 +0200
@@ -95,7 +95,7 @@ CMachineInfo const InputMachine::MacInfo
 {
 	MT_EFFECT,						//Machine type
 	MI_VERSION,						//Interface version
-	MIF_MONO_TO_STEREO | MIF_DOES_INPUT_MIXING | MIF_NO_OUTPUT,		//Flags
+	MIF_STEREO_EFFECT | MIF_NO_OUTPUT,		//Flags
 	0,								//Min tracks
 	0,								//Max tracks
 	NUMG,							//Number of global parameters
diff -rupN original/machine.cpp new/machine.cpp
--- original/machine.cpp	2008-12-13 20:04:48.952095000 +0100
+++ new/machine.cpp	2014-04-20 15:10:29.147861300 +0200
@@ -83,10 +83,11 @@ bool mi::RenameMachineEvent(CMachine *pm
 	return true;
 }
 
-void mi::MDKInit (CMachineDataInput * const pi)
+void mi::Init (CMachineDataInput * const pi)
 //Initialise machine and load data from file
 {
 	IWANTMFC;
+	pCB->SetMachineInterfaceEx(&ex);
 
 	if (!pCB->GetNearestWaveLevel(-2,-2) || pCB->GetHostVersion() < 2)
 	{
@@ -277,7 +278,7 @@ void mi::loadPrefs()
 
 ////////////////////////////////////////////////////////////////////////
 
-void mi::MDKSave (CMachineDataOutput * const po)
+void mi::Save (CMachineDataOutput * const po)
 //Save data to file
 {
 	po->Write((byte)4); // version
@@ -369,7 +370,7 @@ void mi::invalidateTakeIters(Pattern* pa
 	}
 }
 
-bool mi::MDKWorkStereo(float *psamples, int numsamples, const int mode)
+bool mi::WorkMonoToStereo(float *pin, float *pout, int numsamples, int const mode)
 {
 //	CMILock lock(pCB);
 
@@ -385,7 +386,7 @@ bool mi::MDKWorkStereo(float *psamples,
 	}
 
 	for (int i=0; i<numsamples*2; i++)
-		psamples[i] = 0.0f;
+		pout[i] = 0.0f;
 
 	double spt = (double)getRealSPT();
 	double tps = 1.0 / spt;
@@ -402,7 +403,7 @@ bool mi::MDKWorkStereo(float *psamples,
 
 	for (TakePlayer_vp::iterator i = m_takePlayers.begin(); i != m_takePlayers.end(); )
 	{
-		if ((*i)->work(psamples, numsamples, m_fadeampstep))
+		if ((*i)->work(pout, numsamples, m_fadeampstep))
 			++i;
 		else
 			i = m_takePlayers.erase(i);
@@ -411,11 +412,11 @@ bool mi::MDKWorkStereo(float *psamples,
 	// Silence output while recording
 	if (m_input && m_recording.seq && m_input->m_punch)
 		for (int i=0; i<numsamples*2; i++)
-			psamples[i] = 0.0f;
+			pout[i] = 0.0f;
 
 	for (int i=0; i<numsamples*2; i++)
 	{
-		if (psamples[i] > 0.1f || psamples[i] < -0.1f)
+		if (pout[i] > 0.1f || pout[i] < -0.1f)
 			return true;
 	}
 	return false;
diff -rupN original/machine.h new/machine.h
--- original/machine.h	2008-12-13 20:04:48.952095000 +0100
+++ new/machine.h	2014-04-20 15:32:18.556722100 +0200
@@ -52,7 +52,7 @@ extern CMachineInfo const MacInfo;
 
 class mi;
 
-class miex : public CMDKMachineInterfaceEx
+class miex : public CMachineInterfaceEx
 {
 public:
 	mi *pmi;
@@ -72,20 +72,20 @@ public:
 	virtual bool EnableCommandUI(int id);
 };
 
-class mi : public CMDKMachineInterface
+class mi : public CMachineInterface
 {
 public:
 	mi();
 	virtual ~mi();
 	virtual void Tick();
 	virtual void Stop();
-	virtual void MDKInit(CMachineDataInput * const pi);
-	virtual bool MDKWorkStereo(float *psamples, int numsamples, int const mode);
-	virtual bool MDKWork(float *psamples, int numsamples, int const mode) {return false;};
+	virtual void Init(CMachineDataInput * const pi);
+	virtual bool WorkMonoToStereo(float *pin, float *pout, int numsamples, int const mode);
+	virtual bool Work(float *psamples, int numsamples, int const mode) {return false;};
 	virtual void Command(int const i);
-	virtual void MDKSave(CMachineDataOutput * const po);
+	virtual void Save(CMachineDataOutput * const po);
 	virtual char const *DescribeValue(int const param, int const value);
-	virtual CMDKMachineInterfaceEx *GetEx() { return &ex; }
+	virtual CMachineInterfaceEx *GetEx() { return &ex; }
 	virtual void OutputModeChanged(bool stereo) {}
 	virtual void AttributesChanged();
 
diff -rupN original/pattern.cpp new/pattern.cpp
--- original/pattern.cpp	2008-10-29 20:07:44.903018000 +0100
+++ new/pattern.cpp	2014-04-20 15:32:50.540897700 +0200
@@ -288,7 +288,7 @@ void Pattern::onDataChanged()
 {
 	IWANTMFC;
 
-	pmi->pCB->SetModifiedFlag();
+	//pmi->pCB->SetModifiedFlag();
 
 	clearPatternBox();
 
diff -rupN original/PatternEditor.cpp new/PatternEditor.cpp
--- original/PatternEditor.cpp	2008-12-13 20:04:48.952095000 +0100
+++ new/PatternEditor.cpp	2014-04-20 01:04:16.053756100 +0200
@@ -110,7 +110,7 @@ void PatternEditor::Create(PatternEditor
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void PatternEditor::OnTimer(UINT nIDEvent)
+void PatternEditor::OnTimer(UINT_PTR nIDEvent)
 {
 	switch (nIDEvent)
 	{
diff -rupN original/PatternEditor.h new/PatternEditor.h
--- original/PatternEditor.h	2008-12-13 20:04:48.952095000 +0100
+++ new/PatternEditor.h	2014-04-20 01:04:16.033755000 +0200
@@ -128,7 +128,7 @@ public:
 	void OnZoomFit();
 	void OnZoomSelection();
 
-	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 
 	float getPlayPosX(double pos);
 	std::vector<int> m_todrawPlayPosXs;
diff -rupN original/rangemap.h new/rangemap.h
--- original/rangemap.h	2008-10-29 20:07:44.903018000 +0100
+++ new/rangemap.h	2014-04-20 00:41:15.436518000 +0200
@@ -158,7 +158,7 @@ public:
 	protected:
 		Tkviter m_iter;
 	public:
-		iterator() : m_iter(NULL) {}
+		iterator() : m_iter() {}
 		iterator(const Tkviter& iter) : m_iter(iter) {}
 
 		iterator& operator++() { ++m_iter; return *this; }
diff -rupN original/stdafx.h new/stdafx.h
--- original/stdafx.h	2008-10-20 02:17:46.597677000 +0200
+++ new/stdafx.h	2014-04-20 03:52:38.825699800 +0200
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <sdkddkver.h>
+
 #ifndef VC_EXTRALEAN
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 #endif
@@ -54,7 +56,7 @@
 
 #pragma warning(push)
 #pragma warning(disable:4267)
-#include "../mdk/mdk.h"
+#include "MachineInterface.h"
 #pragma warning(pop)
 
 // overloader wave formats