More major repair work. New OS X 10.10 SDK example project. New project structure. New Tutorials / Examples.

22 files changed, 0 insertions, 1769 deletions

diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.sdf b/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.sdf
deleted file mode 100755
index e802a91..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.sdf
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.sln b/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.sln
deleted file mode 100755
index 54f913d..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audioOutputExample", "audioOutputExample.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.suo b/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.suo
deleted file mode 100755
index 2301469..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.suo
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj b/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj
deleted file mode 100755
index bff2416..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{7FD42DF7-442E-479A-BA76-D0022F99702A}</ProjectGuid>

-    <RootNamespace>audioOutputExample</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)_debug</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..\libs\openFrameworks;..\..\..\libs\openFrameworks\graphics;..\..\..\libs\openFrameworks\app;..\..\..\libs\openFrameworks\sound;..\..\..\libs\openFrameworks\utils;..\..\..\libs\openFrameworks\communication;..\..\..\libs\openFrameworks\video;..\..\..\libs\openFrameworks\math;..\..\..\libs\openFrameworks\types;..\..\..\libs\openFrameworks\events;..\..\..\libs\glut\include;..\..\..\libs\rtAudio\include;..\..\..\libs\quicktime\include;..\..\..\libs\freetype\include;..\..\..\libs\freetype\include\freetype2;..\..\..\libs\freeImage\include;..\..\..\libs\fmodex\include;..\..\..\libs\videoInput\include;..\..\..\libs\glew\include\;..\..\..\libs\glu\include;..\..\..\libs\poco\include;..\..\..\addons;..\..\..\libs\openFrameworks\gl;..\..\..\libs\openFrameworks\3d;..\..\..\libs\tess2\include;..\..\..\libs\cairo\include\cairo%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;POCO_STATIC;CAIRO_WIN32_STATIC_BUILD;DISABLE_SOME_FLOATING_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>openframeworksLibDebug.lib;cairo-static.lib;pixman-1.lib;msimg32.lib;OpenGL32.lib;GLu32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.lib;glut32.lib;rtAudioD.lib;videoInput.lib;libfreetype.lib;FreeImage.lib;qtmlClient.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;glew32s.lib;fmodex_vc.lib;glu32.lib;PocoFoundationmdd.lib;PocoNetmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;Ws2_32.lib;tess2.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <AdditionalLibraryDirectories>..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreSpecificDefaultLibraries>atlthunk.lib; LIBC.lib; LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(TargetDir)$(TargetName)_debugInfo.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-    <PostBuildEvent>

-      <Message>adding DLLs and creating data folder</Message>

-      <Command>xcopy /e /i /y "$(ProjectDir)..\..\..\export\vs2010\*.dll" "$(ProjectDir)bin"
-if not exist "$(ProjectDir)bin\data" mkdir  "$(ProjectDir)bin\data"
-</Command>

-    </PostBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>..\..\..\libs\openFrameworks;..\..\..\libs\openFrameworks\graphics;..\..\..\libs\openFrameworks\app;..\..\..\libs\openFrameworks\sound;..\..\..\libs\openFrameworks\utils;..\..\..\libs\openFrameworks\communication;..\..\..\libs\openFrameworks\video;..\..\..\libs\openFrameworks\math;..\..\..\libs\openFrameworks\types;..\..\..\libs\openFrameworks\events;..\..\..\libs\glut\include;..\..\..\libs\rtAudio\include;..\..\..\libs\quicktime\include;..\..\..\libs\freetype\include;..\..\..\libs\freetype\include\freetype2;..\..\..\libs\freeImage\include;..\..\..\libs\fmodex\include;..\..\..\libs\videoInput\include;..\..\..\libs\glew\include\;..\..\..\libs\glu\include;..\..\..\libs\poco\include;..\..\..\addons;..\..\..\libs\openFrameworks\gl;..\..\..\libs\openFrameworks\3d;..\..\..\libs\tess2\include;..\..\..\libs\cairo\include\cairo%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;POCO_STATIC;CAIRO_WIN32_STATIC_BUILD;DISABLE_SOME_FLOATING_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>

-      </DebugInformationFormat>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>openframeworksLib.lib;cairo-static.lib;pixman-1.lib;msimg32.lib;OpenGL32.lib;GLu32.lib;kernel32.lib;setupapi.lib;glut32.lib;rtAudio.lib;videoInput.lib;libfreetype.lib;FreeImage.lib;qtmlClient.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;glew32s.lib;fmodex_vc.lib;glu32.lib;PocoFoundationmd.lib;PocoNetmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;tess2.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <IgnoreSpecificDefaultLibraries>atlthunk.lib; LIBC.lib; LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>false</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

-    </Link>

-    <PostBuildEvent>

-      <Message>adding DLLs and creating data folder</Message>

-      <Command>xcopy /e /i /y "$(ProjectDir)\..\..\..\export\vs2010\*.dll" "$(ProjectDir)\bin"
-if not exist "$(ProjectDir)\bin\data" mkdir  "$(ProjectDir)\bin\data"
-
-</Command>

-    </PostBuildEvent>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="src\main.cpp" />

-    <ClCompile Include="src\maximilian.cpp" />

-    <ClCompile Include="src\testApp.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="src\maximilian.h" />

-    <ClInclude Include="src\testApp.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">

-      <Project>{5837595d-aca9-485c-8e76-729040ce4b0b}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user b/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user
deleted file mode 100755
index 3f1e743..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/Assimp32.dll b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/Assimp32.dll
deleted file mode 100755
index c679e6d..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/Assimp32.dll
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/FreeImage.dll b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/FreeImage.dll
deleted file mode 100755
index e5b1afe..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/FreeImage.dll
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/FreeType-6.dll b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/FreeType-6.dll
deleted file mode 100755
index c13d534..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/FreeType-6.dll
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/Zlib.dll b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/Zlib.dll
deleted file mode 100755
index 198f0ec..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/Zlib.dll
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.exe b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.exe
deleted file mode 100755
index 25f7f9b..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.exe
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.exp b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.exp
deleted file mode 100755
index d54955e..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.exp
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.ilk b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.ilk
deleted file mode 100755
index e69de29..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.ilk
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.lib b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.lib
deleted file mode 100755
index 93c866b..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug.lib
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug_debugInfo.pdb b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug_debugInfo.pdb
deleted file mode 100755
index a73eac7..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/audioOutputExample_debug_debugInfo.pdb
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/fmodex.dll b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/fmodex.dll
deleted file mode 100755
index e8ff8f0..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/fmodex.dll
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/fmodexL.dll b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/fmodexL.dll
deleted file mode 100755
index b5c7125..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/fmodexL.dll
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/glut32.dll b/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/glut32.dll
deleted file mode 100755
index 106646f..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/bin/glut32.dll
+++ /dev/null
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/main.cpp b/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/main.cpp
deleted file mode 100755
index 6a32c6a..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "ofMain.h"
-#include "testApp.h"
-#include "ofAppGlutWindow.h"
-
-//========================================================================
-int main( ){
-
-    ofAppGlutWindow window;
-	ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context
-
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
-	ofRunApp( new testApp());
-
-}
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/maximilian.cpp b/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/maximilian.cpp
deleted file mode 100755
index 4814836..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/maximilian.cpp
+++ /dev/null
@@ -1,1026 +0,0 @@
-
-/*
- *  maximilian.cpp
- *  platform independent synthesis library using portaudio or rtaudio
- *
- *  Created by Mick Grierson on 29/12/2009.
- *  Copyright 2009 Mick Grierson & Strangeloop Limited. All rights reserved.
- *	Thanks to the Goldsmiths Creative Computing Team.
- *	Special thanks to Arturo Castro for the PortAudio implementation.
- *
- *	Permission is hereby granted, free of charge, to any person
- *	obtaining a copy of this software and associated documentation
- *	files (the "Software"), to deal in the Software without
- *	restriction, including without limitation the rights to use,
- *	copy, modify, merge, publish, distribute, sublicense, and/or sell
- *	copies of the Software, and to permit persons to whom the
- *	Software is furnished to do so, subject to the following
- *	conditions:
- *	
- *	The above copyright notice and this permission notice shall be
- *	included in all copies or substantial portions of the Software.
- *
- *	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,	
- *	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *	HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *	WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *	OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#include "maximilian.h"
-#include "math.h"
-
-
-//int channels=2;
-//int samplerate=44100; 
-//int buffersize=1024;
-float chandiv= 1;
-
-int maxiSettings::sampleRate = 44100;
-int maxiSettings::channels = 2;
-int maxiSettings::bufferSize = 1024;
-
-double sineBuffer[514]={0,0.012268,0.024536,0.036804,0.049042,0.06131,0.073547,0.085785,0.097992,0.1102,0.12241,0.13455,0.1467,0.15884,0.17093,0.18301,0.19507,0.20709,0.21909,0.23105,0.24295,0.25485,0.26669,0.2785,0.29025,0.30197,0.31366,0.32529,0.33685,0.34839,0.35986,0.37128,0.38266,0.39395,0.40521,0.41641,0.42752,0.4386,0.44958,0.46051,0.47137,0.48215,0.49286,0.50351,0.51407,0.52457,0.53497,0.54529,0.55554,0.5657,0.57578,0.58575,0.59567,0.60547,0.6152,0.62482,0.63437,0.6438,0.65314,0.66238,0.67151,0.68057,0.68951,0.69833,0.70706,0.7157,0.72421,0.7326,0.74091,0.74908,0.75717,0.76514,0.77298,0.7807,0.7883,0.79581,0.80316,0.81042,0.81754,0.82455,0.83142,0.8382,0.84482,0.85132,0.8577,0.86392,0.87006,0.87604,0.88187,0.8876,0.89319,0.89862,0.90396,0.90912,0.91415,0.91907,0.92383,0.92847,0.93295,0.93729,0.9415,0.94556,0.94949,0.95325,0.95691,0.96039,0.96375,0.96692,0.97,0.9729,0.97565,0.97827,0.98074,0.98306,0.98523,0.98724,0.98914,0.99084,0.99243,0.99387,0.99515,0.99628,0.99725,0.99808,0.99875,0.99927,0.99966,0.99988,0.99997,0.99988,0.99966,0.99927,0.99875,0.99808,0.99725,0.99628,0.99515,0.99387,0.99243,0.99084,0.98914,0.98724,0.98523,0.98306,0.98074,0.97827,0.97565,0.9729,0.97,0.96692,0.96375,0.96039,0.95691,0.95325,0.94949,0.94556,0.9415,0.93729,0.93295,0.92847,0.92383,0.91907,0.91415,0.90912,0.90396,0.89862,0.89319,0.8876,0.88187,0.87604,0.87006,0.86392,0.8577,0.85132,0.84482,0.8382,0.83142,0.82455,0.81754,0.81042,0.80316,0.79581,0.7883,0.7807,0.77298,0.76514,0.75717,0.74908,0.74091,0.7326,0.72421,0.7157,0.70706,0.69833,0.68951,0.68057,0.67151,0.66238,0.65314,0.6438,0.63437,0.62482,0.6152,0.60547,0.59567,0.58575,0.57578,0.5657,0.55554,0.54529,0.53497,0.52457,0.51407,0.50351,0.49286,0.48215,0.47137,0.46051,0.44958,0.4386,0.42752,0.41641,0.40521,0.39395,0.38266,0.37128,0.35986,0.34839,0.33685,0.32529,0.31366,0.30197,0.29025,0.2785,0.26669,0.25485,0.24295,0.23105,0.21909,0.20709,0.19507,0.18301,0.17093,0.15884,0.1467,0.13455,0.12241,0.1102,0.097992,0.085785,0.073547,0.06131,0.049042,0.036804,0.024536,0.012268,0,-0.012268,-0.024536,-0.036804,-0.049042,-0.06131,-0.073547,-0.085785,-0.097992,-0.1102,-0.12241,-0.13455,-0.1467,-0.15884,-0.17093,-0.18301,-0.19507,-0.20709,-0.21909,-0.23105,-0.24295,-0.25485,-0.26669,-0.2785,-0.29025,-0.30197,-0.31366,-0.32529,-0.33685,-0.34839,-0.35986,-0.37128,-0.38266,-0.39395,-0.40521,-0.41641,-0.42752,-0.4386,-0.44958,-0.46051,-0.47137,-0.48215,-0.49286,-0.50351,-0.51407,-0.52457,-0.53497,-0.54529,-0.55554,-0.5657,-0.57578,-0.58575,-0.59567,-0.60547,-0.6152,-0.62482,-0.63437,-0.6438,-0.65314,-0.66238,-0.67151,-0.68057,-0.68951,-0.69833,-0.70706,-0.7157,-0.72421,-0.7326,-0.74091,-0.74908,-0.75717,-0.76514,-0.77298,-0.7807,-0.7883,-0.79581,-0.80316,-0.81042,-0.81754,-0.82455,-0.83142,-0.8382,-0.84482,-0.85132,-0.8577,-0.86392,-0.87006,-0.87604,-0.88187,-0.8876,-0.89319,-0.89862,-0.90396,-0.90912,-0.91415,-0.91907,-0.92383,-0.92847,-0.93295,-0.93729,-0.9415,-0.94556,-0.94949,-0.95325,-0.95691,-0.96039,-0.96375,-0.96692,-0.97,-0.9729,-0.97565,-0.97827,-0.98074,-0.98306,-0.98523,-0.98724,-0.98914,-0.99084,-0.99243,-0.99387,-0.99515,-0.99628,-0.99725,-0.99808,-0.99875,-0.99927,-0.99966,-0.99988,-0.99997,-0.99988,-0.99966,-0.99927,-0.99875,-0.99808,-0.99725,-0.99628,-0.99515,-0.99387,-0.99243,-0.99084,-0.98914,-0.98724,-0.98523,-0.98306,-0.98074,-0.97827,-0.97565,-0.9729,-0.97,-0.96692,-0.96375,-0.96039,-0.95691,-0.95325,-0.94949,-0.94556,-0.9415,-0.93729,-0.93295,-0.92847,-0.92383,-0.91907,-0.91415,-0.90912,-0.90396,-0.89862,-0.89319,-0.8876,-0.88187,-0.87604,-0.87006,-0.86392,-0.8577,-0.85132,-0.84482,-0.8382,-0.83142,-0.82455,-0.81754,-0.81042,-0.80316,-0.79581,-0.7883,-0.7807,-0.77298,-0.76514,-0.75717,-0.74908,-0.74091,-0.7326,-0.72421,-0.7157,-0.70706,-0.69833,-0.68951,-0.68057,-0.67151,-0.66238,-0.65314,-0.6438,-0.63437,-0.62482,-0.6152,-0.60547,-0.59567,-0.58575,-0.57578,-0.5657,-0.55554,-0.54529,-0.53497,-0.52457,-0.51407,-0.50351,-0.49286,-0.48215,-0.47137,-0.46051,-0.44958,-0.4386,-0.42752,-0.41641,-0.40521,-0.39395,-0.38266,-0.37128,-0.35986,-0.34839,-0.33685,-0.32529,-0.31366,-0.30197,-0.29025,-0.2785,-0.26669,-0.25485,-0.24295,-0.23105,-0.21909,-0.20709,-0.19507,-0.18301,-0.17093,-0.15884,-0.1467,-0.13455,-0.12241,-0.1102,-0.097992,-0.085785,-0.073547,-0.06131,-0.049042,-0.036804,-0.024536,-0.012268,0,0.012268
-};
-
-double mtofarray[129]={0, 8.661957, 9.177024, 9.722718, 10.3, 10.913383, 11.562325, 12.25, 12.978271, 13.75, 14.567617, 15.433853, 16.351599, 17.323914, 18.354048, 19.445436, 20.601723, 21.826765, 23.124651, 24.5, 25.956543, 27.5, 29.135235, 30.867706, 32.703197, 34.647827, 36.708096, 38.890873, 41.203445, 43.65353, 46.249302, 49., 51.913086, 55., 58.27047, 61.735413, 65.406395, 69.295654, 73.416191, 77.781746, 82.406891, 87.30706, 92.498604, 97.998856, 103.826172, 110., 116.540939, 123.470825, 130.81279, 138.591309, 146.832382, 155.563492, 164.813782, 174.61412, 184.997208, 195.997711, 207.652344, 220., 233.081879, 246.94165, 261.62558, 277.182617,293.664764, 311.126984, 329.627563, 349.228241, 369.994415, 391.995422, 415.304688, 440., 466.163757, 493.883301, 523.25116, 554.365234, 587.329529, 622.253967, 659.255127, 698.456482, 739.988831, 783.990845, 830.609375, 880., 932.327515, 987.766602, 1046.502319, 1108.730469, 1174.659058, 1244.507935, 1318.510254, 1396.912964, 1479.977661, 1567.981689, 1661.21875, 1760., 1864.655029, 1975.533203, 2093.004639, 2217.460938, 2349.318115, 2489.015869, 2637.020508, 2793.825928, 2959.955322, 3135.963379, 3322.4375, 3520., 3729.31, 3951.066406, 4186.009277, 4434.921875, 4698.63623, 4978.031738, 5274.041016, 5587.651855, 5919.910645, 6271.926758, 6644.875, 7040., 7458.620117, 7902.132812, 8372.018555, 8869.84375, 9397.272461, 9956.063477, 10548.082031, 11175.303711, 11839.821289, 12543.853516, 13289.75};
-
-void setup();//use this to do any initialisation if you want.
-
-void play(double *channels);//run dac! 
-
-maxiOsc::maxiOsc(){
-	phase = 0.0;
-//	memset(phases,0,500);
-//	memset(freqs,0,500);
-}
-
-double maxiOsc::noise() {
-	//always the same unless you seed it.
-	float r = rand()/(float)RAND_MAX;
-	output=r*2-1;
-	return(output);
-}
-
-void maxiOsc::phaseReset(double phaseIn) {
-	phase=phaseIn;
-	
-}
-
-double maxiOsc::sinewave(double frequency) {
-	output=sin (phase*(TWOPI));
-	if ( phase >= 1.0 ) phase -= 1.0;
-	phase += (1./(maxiSettings::sampleRate/(frequency)));
-	return(output);
-	
-}
-
-double maxiOsc::sinebuf4(double frequency) {
-	double remainder;
-	double a,b,c,d,a1,a2,a3;
-	phase += 512./(maxiSettings::sampleRate/(frequency));
-	if ( phase >= 511 ) phase -=512;
-	remainder = phase - floor(phase);
-	
-	if (phase==0) {
-		a=sineBuffer[(long) 512];
-		b=sineBuffer[(long) phase];
-		c=sineBuffer[(long) phase+1];
-		d=sineBuffer[(long) phase+2];
-		
-	} else {
-		a=sineBuffer[(long) phase-1];
-		b=sineBuffer[(long) phase];
-		c=sineBuffer[(long) phase+1];
-		d=sineBuffer[(long) phase+2];
-		
-	}
-	
-	a1 = 0.5f * (c - a);
-	a2 = a - 2.5 * b + 2.f * c - 0.5f * d;
-	a3 = 0.5f * (d - a) + 1.5f * (b - c);
-	output = double (((a3 * remainder + a2) * remainder + a1) * remainder + b);
-	return(output);
-}
-
-double maxiOsc::sinebuf(double frequency) {
-	double remainder;
- 	phase += 512./(maxiSettings::sampleRate/(frequency*chandiv));
-	if ( phase >= 511 ) phase -=512;
-	remainder = phase - floor(phase);
-	output = (double) ((1-remainder) * sineBuffer[1+ (long) phase] + remainder * sineBuffer[2+(long) phase]);
-	return(output);
-}
-
-double maxiOsc::coswave(double frequency) {
-	output=cos (phase*(TWOPI));
-	if ( phase >= 1.0 ) phase -= 1.0;
-	phase += (1./(maxiSettings::sampleRate/(frequency)));
-	return(output);
-	
-}
-
-double maxiOsc::phasor(double frequency) {
-	output=phase;
-	if ( phase >= 1.0 ) phase -= 1.0;
-	phase += (1./(maxiSettings::sampleRate/(frequency)));
-	return(output);
-} 
-
-double maxiOsc::square(double frequency) {
-	if (phase<0.5) output=-1;
-	if (phase>0.5) output=1;
-	if ( phase >= 1.0 ) phase -= 1.0;
-	phase += (1./(maxiSettings::sampleRate/(frequency)));
-	return(output);
-}
-
-double maxiOsc::pulse(double frequency, double duty) {
-	if (duty<0.) duty=0;
-	if (duty>1.) duty=1;
-	if ( phase >= 1.0 ) phase -= 1.0;
-	phase += (1./(maxiSettings::sampleRate/(frequency)));
-	if (phase<duty) output=-1.;
-	if (phase>duty) output=1.;
-	return(output);
-}
-
-double maxiOsc::phasor(double frequency, double startphase, double endphase) {
-	output=phase;
-	if (phase<startphase) {
-		phase=startphase;
-	}
-	if ( phase >= endphase ) phase = startphase;
-	phase += ((endphase-startphase)/(maxiSettings::sampleRate/(frequency)));
-	return(output);
-}
-
-
-double maxiOsc::saw(double frequency) {
-	
-	output=phase;
-	if ( phase >= 1.0 ) phase -= 2.0;
-	phase += (1./(maxiSettings::sampleRate/(frequency)));
-	return(output);
-	
-} 
-
-double maxiOsc::triangle(double frequency) {
-	if ( phase >= 1.0 ) phase -= 1.0;
-	phase += (1./(maxiSettings::sampleRate/(frequency)));
-	if (phase <= 0.5 ) {
-		output =((phase)*4)-1;
-	} else {
-		output =((0.5-phase)*4)-1;
-	}
-	return(output);
-	
-} 
-
-//I like this.
-double maxiEnvelope::line(int numberofsegments,double segments[1000]) {
-	if (isPlaying==1) {//only make a sound once you've been triggered
-		
-	period=2./(segments[valindex+1]*0.004);
-	nextval=segments[valindex+2];
-	currentval=segments[valindex];
-	if (currentval-amplitude > 0.0000001 && valindex < numberofsegments) {
-		amplitude += ((currentval-startval)/(maxiSettings::sampleRate/period));
-	} else if (currentval-amplitude < -0.0000001 && valindex < numberofsegments) {
-		amplitude -= (((currentval-startval)*(-1))/(maxiSettings::sampleRate/period));
-	} else if (valindex >numberofsegments-1) {
-		valindex=numberofsegments-2;
-	} else {
-		valindex=valindex+2;
-		startval=currentval;
-	}
-	output=amplitude;
-		
-	}
-	else {
-		output=0;
-
-	}
-	return(output);
-}
-
-//and this
-void maxiEnvelope::trigger(int index, double amp) {
-	isPlaying=1;//ok the envelope is being used now.
-	valindex=index;
-	amplitude=amp;
-	
-}
-
-//and this
-
-maxiDelayline::maxiDelayline() {
-	memset( memory, 0, 88200*sizeof (double) );	
-	
-}
-
-
-double maxiDelayline::dl(double input, int size, double feedback)  {
-	if ( phase >=size ) {
-		phase = 0;
-	}
-	output=memory[phase];
-	memory[phase]=(memory[phase]*feedback)+(input*feedback)*0.5;
-	phase+=1;
-	return(output);
-	
-}
-
-double maxiDelayline::dl(double input, int size, double feedback, int position)  {
-	if ( phase >=size ) phase = 0;
-	if ( position >=size ) position = 0;
-	output=memory[position];
-	memory[phase]=(memory[phase]*feedback)+(input*feedback)*chandiv;
-	phase+=1;
-	return(output);
-	
-}
-
-//I particularly like these. cutoff between 0 and 1
-double maxiFilter::lopass(double input, double cutoff) {
-	output=outputs[0] + cutoff*(input-outputs[0]);
-	outputs[0]=output;
-	return(output);
-}
-//as above
-double maxiFilter::hipass(double input, double cutoff) {
-	output=input-(outputs[0] + cutoff*(input-outputs[0]));
-	outputs[0]=output;
-	return(output);
-}
-//awesome. cuttof is freq in hz. res is between 1 and whatever. Watch out!
-double maxiFilter::lores(double input,double cutoff1, double resonance) {
-	cutoff=cutoff1*0.5;
-	if (cutoff<10) cutoff=10;
-	if (cutoff>(maxiSettings::sampleRate*0.5)) cutoff=(maxiSettings::sampleRate*0.5);
-	if (resonance<1.) resonance = 1.;
-	z=cos(TWOPI*cutoff/maxiSettings::sampleRate);
-	c=2-2*z;
-	double r=(sqrt(2.0)*sqrt(-pow((z-1.0),3.0))+resonance*(z-1))/(resonance*(z-1));
-	x=x+(input-y)*c;
-	y=y+x;
-	x=x*r;
-	output=y;
-	return(output);
-}
-
-//working hires filter
-double maxiFilter::hires(double input,double cutoff1, double resonance) {
-	cutoff=cutoff1*0.5;
-	if (cutoff<10) cutoff=10;
-	if (cutoff>(maxiSettings::sampleRate*0.5)) cutoff=(maxiSettings::sampleRate*0.5);
-	if (resonance<1.) resonance = 1.;
-	z=cos(TWOPI*cutoff/maxiSettings::sampleRate);
-	c=2-2*z;
-	double r=(sqrt(2.0)*sqrt(-pow((z-1.0),3.0))+resonance*(z-1))/(resonance*(z-1));
-	x=x+(input-y)*c;
-	y=y+x;
-	x=x*r;
-	output=input-y;
-	return(output);
-}
-
-//This works a bit. Needs attention.
-double maxiFilter::bandpass(double input,double cutoff1, double resonance) {
-	cutoff=cutoff1;
-	if (cutoff>(maxiSettings::sampleRate*0.5)) cutoff=(maxiSettings::sampleRate*0.5);
-	if (resonance>=1.) resonance=0.999999;
-	z=cos(TWOPI*cutoff/maxiSettings::sampleRate);
-	inputs[0] = (1-resonance)*(sqrt(resonance*(resonance-4.0*pow(z,2.0)+2.0)+1));
-	inputs[1] = 2*z*resonance;
-	inputs[2] = pow((resonance*-1),2);
-	
-	output=inputs[0]*input+inputs[1]*outputs[1]+inputs[2]*outputs[2];
-	outputs[2]=outputs[1];
-	outputs[1]=output;
-	return(output);
-}
-
-//stereo bus
-double *maxiMix::stereo(double input,double two[2],double x) {
-	if (x>1) x=1;
-	if (x<0) x=0;
-	two[0]=input*sqrt(1.0-x);
-	two[1]=input*sqrt(x);
-	return(two);
-} 
-
-//quad bus
-double *maxiMix::quad(double input,double four[4],double x,double y) {
-	if (x>1) x=1;
-	if (x<0) x=0;
-	if (y>1) y=1;
-	if (y<0) y=0;
-	four[0]=input*sqrt((1.0-x)*y);
-	four[1]=input*sqrt((1.0-x)*(1.0-y));
-	four[2]=input*sqrt(x*y);
-	four[3]=input*sqrt(x*(1.0-y));
-	return(four);
-}
-
-//ambisonic bus
-double *maxiMix::ambisonic(double input,double eight[8],double x,double y,double z) {
-	if (x>1) x=1;
-	if (x<0) x=0;
-	if (y>1) y=1;
-	if (y<0) y=0;
-	if (z>1) y=1;
-	if (z<0) y=0;
-	eight[0]=input*(sqrt((1.0-x)*y)*1.0-z);
-	eight[1]=input*(sqrt((1.0-x)*(1.0-y))*1.0-z);
-	eight[2]=input*(sqrt(x*y)*1.0-z);
-	eight[3]=input*(sqrt(x*(1.0-y))*1.0-z);
-	eight[4]=input*(sqrt((1.0-x)*y)*z);
-	eight[5]=input*(sqrt((1.0-x)*(1.0-y))*z);
-	eight[6]=input*sqrt((x*y)*z);
-	eight[7]=input*sqrt((x*(1.0-y))*z);
-	return(eight);
-}
-
-
-bool maxiSample::load(string fileName, int channel) {
-	myPath = fileName;
-	readChannel=channel;
-	return read();
-}
-
-void maxiSample::trigger() {
-	position = 0;
-}
-
-bool maxiSample::read()
-{
-	bool result;
-	ifstream inFile( myPath.c_str(), ios::in | ios::binary);
-	result = inFile;
-	if (inFile) {
-		bool datafound = false;
-		inFile.seekg(4, ios::beg);
-		inFile.read( (char*) &myChunkSize, 4 ); // read the ChunkSize
-		
-		inFile.seekg(16, ios::beg);
-		inFile.read( (char*) &mySubChunk1Size, 4 ); // read the SubChunk1Size
-		
-		//inFile.seekg(20, ios::beg);
-		inFile.read( (char*) &myFormat, sizeof(short) ); // read the file format.  This should be 1 for PCM
-		
-		//inFile.seekg(22, ios::beg);
-		inFile.read( (char*) &myChannels, sizeof(short) ); // read the # of channels (1 or 2)
-		
-		//inFile.seekg(24, ios::beg);
-		inFile.read( (char*) &mySampleRate, sizeof(int) ); // read the samplerate
-		
-		//inFile.seekg(28, ios::beg);
-		inFile.read( (char*) &myByteRate, sizeof(int) ); // read the byterate
-		
-		//inFile.seekg(32, ios::beg);
-		inFile.read( (char*) &myBlockAlign, sizeof(short) ); // read the blockalign
-		
-		//inFile.seekg(34, ios::beg);
-		inFile.read( (char*) &myBitsPerSample, sizeof(short) ); // read the bitspersample
-		
-		//ignore any extra chunks
-		char chunkID[5]="";
-		chunkID[4] = 0;
-		int filePos = 36;
-		while(!datafound && !inFile.eof()) {
-			inFile.seekg(filePos, ios::beg);
-			inFile.read((char*) &chunkID, sizeof(char) * 4);
-			inFile.seekg(filePos + 4, ios::beg);
-			inFile.read( (char*) &myDataSize, sizeof(int) ); // read the size of the data
-			filePos += 8;
-			if (strcmp(chunkID,"data") == 0) {
-				datafound = true;
-			}else{
-				filePos += myDataSize;
-			}
-		}
-		
-		// read the data chunk
-		myData = (char*) malloc(myDataSize * sizeof(char));
-		inFile.seekg(filePos, ios::beg);
-		inFile.read(myData, myDataSize);
-		length=myDataSize*(0.5/myChannels);
-		inFile.close(); // close the input file
-		
-		if (myChannels>1) {
-			int position=0;
-			int channel=readChannel*2;
-			for (int i=channel;i<myDataSize+6;i+=(myChannels*2)) {
-				myData[position]=myData[i];
-				myData[position+1]=myData[i+1];
-				position+=2;
-			}
-		}
-		
-	}else {
-		cout << "ERROR: Could not load sample: "; //<< myPath << endl;
-	}
-	
-	
-	return result; // this should probably be something more descriptive
-}
-
-
-double maxiSample::play() {
-//	long length=myDataSize*(1./myChannels);
-	double remainder;
-	short* buffer = (short *)myData;
-	position=(position+1);
-	remainder = position - (long) position;
-	if ((long) position>length) position=0;
-	output =
-	(double) ((1-remainder) * buffer[1+ (long) position] + remainder * buffer[2+(long) position])/32767;//linear interpolation
-	return(output);
-}
-
-double maxiSample::playOnce() {
-//	long length=myDataSize*(0.5/myChannels);
-	short* buffer = (short *)myData;
-	position=(position+1);
-	double remainder = position - (long) position;
-	if ((long) position<length)
-		output = (double) ((1-remainder) * buffer[1+ (long) position] + remainder * buffer[2+(long) position])/32767;//linear interpolation
-	else 
-		output=0;
-
-	return(output);
-}
-
-double maxiSample::playOnce(double speed) {
-	//long a,b;
-	//	long length=myDataSize*0.5;	
-	short* buffer = (short *)myData;
-	position=position+((speed*chandiv*myChannels)/(maxiSettings::sampleRate/mySampleRate));
-	double remainder = position - (long) position;
-	if ((long) position<length)
-		output = (double) ((1-remainder) * buffer[1+ (long) position] + remainder * buffer[2+(long) position])/32767;//linear interpolation
-	else 
-		output=0;
-	return(output);
-}
-
-double maxiSample::play(double speed) {
-	double remainder;
-	long a,b;
-//	long length=myDataSize*0.5;	
-	short* buffer = (short *)myData;
-	position=position+((speed*chandiv*myChannels)/(maxiSettings::sampleRate/mySampleRate));
-	if (speed >=0) {
-		
-		if ((long) position>=length-1) position=1;
-		remainder = position - floor(position);
-		if (position+1<length) {
-			a=position+1;
-			
-		}
-		else {
-			a=length-1;
-		}
-		if (position+2<length)
-		{
-		b=position+2;
-		}
-		else {
-		b=length-1;
-		}
-		
-		output = (double) ((1-remainder) * buffer[a] + remainder * buffer[b])/32767;//linear interpolation
-} else {
-		if ((long) position<0) position=length;
-		remainder = position - floor(position);
-		if (position-1>=0) {
-			a=position-1;
-				
-			}
-			else {
-				a=0;
-			}
-	if (position-2>=0) {
-		b=position-2;
-			}
-			else {
-				b=0;
-			}
-		output = (double) ((-1-remainder) * buffer[a] + remainder * buffer[b])/32767;//linear interpolation
-	}	
-	return(output);
-}
-
-double maxiSample::play(double frequency, double start, double end) {
-	return play(frequency, start, end, position);
-}
-
-double maxiSample::play(double frequency, double start, double end, double &pos) {
-	double remainder;
-	//	long length=myDataSize;
-
-	if (end>=length) end=length-1;
-	long a,b;
-	short* buffer = (short *)myData;
-	if (frequency >0.) {
-		if (pos<start) {
-			pos=start;
-		}
-		
-		if ( pos >= end ) pos = start;
-		pos += ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv)));
-		remainder = pos - floor(pos);
-		long posl = floor(pos);
-		if (posl+1<length) {
-			a=posl+1;
-			
-		}
-		else {
-			a=posl-1;
-		}
-		if (posl+2<length) {
-			b=posl+2;
-		}
-		else {
-			b=length-1;
-		}
-
-		output = (double) ((1-remainder) * buffer[a] +
-						   remainder * buffer[b])/32767;//linear interpolation
-	} else {
-		frequency=frequency-(frequency+frequency);
-		if ( pos <= start ) pos = end;
-		pos -= ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv)));
-		remainder = pos - floor(pos);
-		long posl = floor(pos);
-		if (posl-1>=0) {
-			a=posl-1;
-		}
-		else {
-			a=0;
-		}
-		if (posl-2>=0) {
-			b=posl-2;
-		}
-		else {
-			b=0;
-		}		
-		output = (double) ((-1-remainder) * buffer[a] +
-						   remainder * buffer[b])/32767;//linear interpolation
-		
-	}
-	
-	return(output);
-}
-
-
-//better cubic inerpolation. Cobbled together from various (pd externals, yehar, other places).
-double maxiSample::play4(double frequency, double start, double end) {
-	double remainder;
-	double a,b,c,d,a1,a2,a3;
-	short* buffer = (short*)myData;
-	if (frequency >0.) {
-		if (position<start) {
-			position=start;
-		}
-		if ( position >= end ) position = start;
-		position += ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv)));
-		remainder = position - floor(position);
-		if (position>0) {
-			a=buffer[(int)(floor(position))-1];
-
-		} else {
-			a=buffer[0];
-			
-		}
-		
-		b=buffer[(long) position];
-		if (position<end-2) {
-			c=buffer[(long) position+1];
-
-		} else {
-			c=buffer[0];
-
-		}
-		if (position<end-3) {
-			d=buffer[(long) position+2];
-
-		} else {
-			d=buffer[0];
-		}
-		a1 = 0.5f * (c - a);
-		a2 = a - 2.5 * b + 2.f * c - 0.5f * d;
-		a3 = 0.5f * (d - a) + 1.5f * (b - c);
-		output = (double) (((a3 * remainder + a2) * remainder + a1) * remainder + b) / 32767;
-		
-	} else {
-		frequency=frequency-(frequency+frequency);
-		if ( position <= start ) position = end;
-		position -= ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv)));
-		remainder = position - floor(position);
-		if (position>start && position < end-1) {
-			a=buffer[(long) position+1];
-			
-		} else {
-			a=buffer[0];
-			
-		}
-		
-		b=buffer[(long) position];
-		if (position>start) {
-			c=buffer[(long) position-1];
-			
-		} else {
-			c=buffer[0];
-			
-		}
-		if (position>start+1) {
-			d=buffer[(long) position-2];
-			
-		} else {
-			d=buffer[0];
-		}
-		a1 = 0.5f * (c - a);
-		a2 = a - 2.5 * b + 2.f * c - 0.5f * d;
-		a3 = 0.5f * (d - a) + 1.5f * (b - c);
-		output = (double) (((a3 * remainder + a2) * -remainder + a1) * -remainder + b) / 32767;
-		
-	}
-	
-	return(output);
-}
-
-double maxiSample::bufferPlay(unsigned char &bufferin,long length) {
-	double remainder;
-	short* buffer = (short *)&bufferin;
-	position=(position+1);
-	remainder = position - (long) position;
-	if ((long) position>length) position=0;
-	output = (double) ((1-remainder) * buffer[1+ (long) position] + remainder * buffer[2+(long) position])/32767;//linear interpolation
-	return(output);
-}
-
-double maxiSample::bufferPlay(unsigned char &bufferin,double speed,long length) {
-	double remainder;
-	long a,b;
-	short* buffer = (short *)&bufferin;
-	position=position+((speed*chandiv*myChannels)/(maxiSettings::sampleRate/mySampleRate));
-	if (speed >=0) {
-		
-		if ((long) position>=length-1) position=1;
-		remainder = position - floor(position);
-		if (position+1<length) {
-			a=position+1;
-			
-		}
-		else {
-			a=length-1;
-		}
-		if (position+2<length)
-		{
-			b=position+2;
-		}
-		else {
-			b=length-1;
-		}
-		
-		output = (double) ((1-remainder) * buffer[a] + remainder * buffer[b])/32767;//linear interpolation
-	} else {
-		if ((long) position<0) position=length;
-		remainder = position - floor(position);
-		if (position-1>=0) {
-			a=position-1;
-			
-		}
-		else {
-			a=0;
-		}
-		if (position-2>=0) {
-			b=position-2;
-		}
-		else {
-			b=0;
-		}
-		output = (double) ((-1-remainder) * buffer[a] + remainder * buffer[b])/32767;//linear interpolation
-	}	
-	return(output);
-}
-
-double maxiSample::bufferPlay(unsigned char &bufferin,double frequency, double start, double end) {
-	double remainder;
-	length=end;
-	long a,b;
-	short* buffer = (short *)&bufferin;
-	if (frequency >0.) {
-		if (position<start) {
-			position=start;
-		}
-		
-		if ( position >= end ) position = start;
-		position += ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv)));
-		remainder = position - floor(position);
-		long pos = floor(position);
-		if (pos+1<length) {
-			a=pos+1;
-			
-		}
-		else {
-			a=pos-1;
-		}
-		if (pos+2<length) {
-			b=pos+2;
-		}
-		else {
-			b=length-1;
-		}
-		
-		output = (double) ((1-remainder) * buffer[a] +
-						   remainder * buffer[b])/32767;//linear interpolation
-	} else {
-		frequency=frequency-(frequency+frequency);
-		if ( position <= start ) position = end;
-		position -= ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv)));
-		remainder = position - floor(position);
-		long pos = floor(position);
-		if (pos-1>=0) {
-			a=pos-1;
-		}
-		else {
-			a=0;
-		}
-		if (pos-2>=0) {
-			b=pos-2;
-		}
-		else {
-			b=0;
-		}		
-		output = (double) ((-1-remainder) * buffer[a] +
-						   remainder * buffer[b])/32767;//linear interpolation
-		
-	}
-	
-	return(output);
-}
-
-//better cubic inerpolation. Cobbled together from various (pd externals, yehar, other places).
-double maxiSample::bufferPlay4(unsigned char &bufferin,double frequency, double start, double end) {
-	double remainder;
-	double a,b,c,d,a1,a2,a3;
-	short* buffer = (short*)&bufferin;
-	if (frequency >0.) {
-		if (position<start) {
-			position=start;
-		}
-		if ( position >= end ) position = start;
-		position += ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv)));
-		remainder = position - floor(position);
-		if (position>0) {
-			a=buffer[(int)(floor(position))-1];
-			
-		} else {
-			a=buffer[0];
-			
-		}
-		
-		b=buffer[(long) position];
-		if (position<end-2) {
-			c=buffer[(long) position+1];
-			
-		} else {
-			c=buffer[0];
-			
-		}
-		if (position<end-3) {
-			d=buffer[(long) position+2];
-			
-		} else {
-			d=buffer[0];
-		}
-		a1 = 0.5f * (c - a);
-		a2 = a - 2.5 * b + 2.f * c - 0.5f * d;
-		a3 = 0.5f * (d - a) + 1.5f * (b - c);
-		output = (double) (((a3 * remainder + a2) * remainder + a1) * remainder + b) / 32767;
-		
-	} else {
-		frequency=frequency-(frequency+frequency);
-		if ( position <= start ) position = end;
-		position -= ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv)));
-		remainder = position - floor(position);
-		if (position>start && position < end-1) {
-			a=buffer[(long) position+1];
-			
-		} else {
-			a=buffer[0];
-			
-		}
-		
-		b=buffer[(long) position];
-		if (position>start) {
-			c=buffer[(long) position-1];
-			
-		} else {
-			c=buffer[0];
-			
-		}
-		if (position>start+1) {
-			d=buffer[(long) position-2];
-			
-		} else {
-			d=buffer[0];
-		}
-		a1 = 0.5f * (c - a);
-		a2 = a - 2.5 * b + 2.f * c - 0.5f * d;
-		a3 = 0.5f * (d - a) + 1.5f * (b - c);
-		output = (double) (((a3 * remainder + a2) * -remainder + a1) * -remainder + b) / 32767;
-		
-	}
-	
-	return(output);
-}
-
-
-void maxiSample::getLength() {
-	length=myDataSize*0.5;	
-}
-
-
-/* OK this compressor and gate are now ready to use. The envelopes, like all the envelopes in this recent update, use stupid algorithms for 
- incrementing - consequently a long attack is something like 0.0001 and a long release is like 0.9999.
- Annoyingly, a short attack is 0.1, and a short release is 0.99. I'll sort this out laters */
-
-double maxiDyn::gate(double input, double threshold, long holdtime, double attack, double release) {
-		
-	if (fabs(input)>threshold && attackphase!=1){ 
-		holdcount=0;
-		releasephase=0;
-		attackphase=1;
-		if(amplitude==0) amplitude=0.01;
-	}
-	
-	if (attackphase==1 && amplitude<1) {
-		amplitude*=(1+attack);
-		output=input*amplitude;
-	}
-	
-	if (amplitude>=1) {
-		attackphase=0;
-		holdphase=1;
-	}
-	
-	if (holdcount<holdtime && holdphase==1) {
-		output=input;
-		holdcount++;
-	}
-	
-	if (holdcount==holdtime) {
-		holdphase=0;
-		releasephase=1;
-	}
-	
-	if (releasephase==1 && amplitude>0.) {
-		output=input*(amplitude*=release);
-
-	}
-	
-	return output;
-}
-
-
-double maxiDyn::compressor(double input, double ratio, double threshold, double attack, double release) {
-	
-	if (fabs(input)>threshold && attackphase!=1){ 
-		holdcount=0;
-		releasephase=0;
-		attackphase=1;
-		if(currentRatio==0) currentRatio=ratio;
-	}
-	
-	if (attackphase==1 && currentRatio<ratio-1) {
-		currentRatio*=(1+attack);
-	}
-	
-	if (currentRatio>=ratio-1) {
-		attackphase=0;
-		releasephase=1;
-	}
-	
-	if (releasephase==1 && currentRatio>0.) {
-		currentRatio*=release;		
-	}
-	
-	if (input>0.) {
-		output = input/(1.+currentRatio);
-	} else {
-		output = input/(1.+currentRatio);
-	}
-	
-	return output*(1+log(ratio));
-}
-
-
-/* Lots of people struggle with the envelope generators so here's a new easy one.
- It takes mental numbers for attack and release tho. Basically, they're exponentials.
- I'll map them out later so that it's a bit more intuitive */
-double maxiEnv::ar(double input, double attack, double release, long holdtime, int trigger) {
-	
-	if (trigger==1 && attackphase!=1 && holdphase!=1){ 
-		holdcount=0;
-		releasephase=0;
-		attackphase=1;
-	}
-	
-	if (attackphase==1) {
-		amplitude+=(1*attack);
-		output=input*amplitude;
-	}
-	
-	if (amplitude>=1) {
-		amplitude=1;
-		attackphase=0;
-		holdphase=1;
-	}
-	
-	if (holdcount<holdtime && holdphase==1) {
-		output=input;
-		holdcount++;
-	}
-	
-	if (holdcount==holdtime && trigger==1) {
-		output=input;
-	}
-	
-	if (holdcount==holdtime && trigger!=1) {
-		holdphase=0;
-		releasephase=1;
-	}
-
-	if (releasephase==1 && amplitude>0.) {
-		output=input*(amplitude*=release);
-		
-	}
-	
-	return output;
-}
-
-/* and here's a new adsr. It's not bad, very simple to use*/
-
-double maxiEnv::adsr(double input, double attack, double decay, double sustain, double release, long holdtime, int trigger) {
-	
-	if (trigger==1 && attackphase!=1 && holdphase!=1 && decayphase!=1){ 
-		holdcount=0;
-		decayphase=0;
-		sustainphase=0;
-		releasephase=0;
-		attackphase=1;
-	}
-	
-	if (attackphase==1) {
-		amplitude+=(1*attack);
-		output=input*amplitude;
-	}
-	
-	if (amplitude>=1) {
-		amplitude=1;
-		attackphase=0;
-		decayphase=1;
-	}
-	
-	if (decayphase==1) {
-		output=input*(amplitude*=decay);	
-		if (amplitude<=sustain) {
-			decayphase=0;
-			holdphase=1;
-		}
-	}
-	
-	if (holdcount<holdtime && holdphase==1) {
-		output=input*amplitude;
-		holdcount++;
-	}
-	
-	if (holdcount==holdtime && trigger==1) {
-		output=input*amplitude;
-	}
-	
-	if (holdcount==holdtime && trigger!=1) {
-		holdphase=0;
-		releasephase=1;
-	}
-	
-	if (releasephase==1 && amplitude>0.) {
-		output=input*(amplitude*=release);
-		
-	}
-	
-	return output;
-}
-
-double convert::mtof(int midinote) {
-
-	return mtofarray[midinote];
-}
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/maximilian.h b/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/maximilian.h
deleted file mode 100755
index 2629390..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/maximilian.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- *  maximilian.h
- *  platform independent synthesis library using portaudio or rtaudio
- *
- *  Created by Mick Grierson on 29/12/2009.
- *  Copyright 2009 Mick Grierson & Strangeloop Limited. All rights reserved.
- *	Thanks to the Goldsmiths Creative Computing Team.
- *	Special thanks to Arturo Castro for the PortAudio implementation.
- * 
- *	Permission is hereby granted, free of charge, to any person
- *	obtaining a copy of this software and associated documentation
- *	files (the "Software"), to deal in the Software without
- *	restriction, including without limitation the rights to use,
- *	copy, modify, merge, publish, distribute, sublicense, and/or sell
- *	copies of the Software, and to permit persons to whom the
- *	Software is furnished to do so, subject to the following
- *	conditions:
- *	
- *	The above copyright notice and this permission notice shall be
- *	included in all copies or substantial portions of the Software.
- *
- *	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,	
- *	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *	HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *	WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *	OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef MAXIMILIAN_H
-#define MAXIMILIAN_H
-
-//#define MAXIMILIAN_PORTAUDIO
-#define MAXIMILIAN_RT_AUDIO
-
-//#include "ofMain.h"
-//#include "ofUtils.h"
-
-
-#include <iostream>
-#include <fstream>
-#include <string.h>
-#include <cstdlib>
-#include "math.h"
-
-using namespace std;
-#define TWOPI (3.14159*2)
-
-class maxiSettings {
-public:
-	static int sampleRate;
-	static int channels;
-	static int bufferSize;
-	static void setup(int initSampleRate, int initChannels, int initBufferSize) {
-		maxiSettings::sampleRate = initSampleRate;
-		maxiSettings::channels = initChannels;
-		maxiSettings::bufferSize = initBufferSize;
-	}
-};
-
-
-class maxiOsc {
-	
-	double frequency;
-	double phase;
-	double startphase;
-	double endphase;
-	double output;
-	double tri;
-
-	
-public:
-	maxiOsc();
-	double sinewave(double frequency);
-	double coswave(double frequency);
-	double phasor(double frequency);
-	double phasor(double frequency, double startphase, double endphase);
-	double saw(double frequency);
-	double triangle(double frequency);
-	double square(double frequency);
-	double pulse(double frequency, double duty);
-	double noise();
-	double sinebuf(double frequency);
-	double sinebuf4(double frequency);
-	void phaseReset(double phaseIn);
-	
-};
-
-
-class maxiEnvelope {
-	
-	double period;
-	double output;
-	double startval;
-	double currentval;
-	double nextval;
-	int isPlaying;
-	
-public:	
-	double line(int numberofsegments,double segments[100]);
-	void trigger(int index,double amp);
-	int valindex;
-	double amplitude;
-	
-};
-
-
-class maxiDelayline {
-	double frequency;
-	int phase;
-	double startphase;
-	double endphase;
-	double output;
-	double memory[88200];
-	
-public:
-	maxiDelayline();
-	double dl(double input, int size, double feedback);
-	double dl(double input, int size, double feedback, int position);
-
-	
-};
-
-
-class maxiFilter { 	
-	double gain;
-	double input;
-	double output;
-	double inputs[10];
-	double outputs[10];
-	double cutoff1;
-	double x;//speed
-	double y;//pos
-	double z;//pole
-	double c;//filter coefficient
-public:
-	maxiFilter():x(0.0), y(0.0), z(0.0), c(0.0){};
-	double cutoff;
-	double resonance;
-	double lores(double input,double cutoff1, double resonance);
-	double hires(double input,double cutoff1, double resonance);
-	double bandpass(double input,double cutoff1, double resonance);
-	double lopass(double input,double cutoff);
-	double hipass(double input,double cutoff);
-	
-};
-
-class maxiMix  {
-	double input;
-	double two[2];
-	double four[4];
-	double eight[8];
-public:
-	double x;
-	double y;
-	double z;
-	double *stereo(double input,double two[2],double x);
-	double *quad(double input,double four[4], double x,double y);
-	double *ambisonic(double input,double eight[8],double x,double y, double z);
-	
-};
-
-class maxiSample  {
-	
-private:
-	string 	myPath;
-	int 	myChunkSize;
-	int	mySubChunk1Size;
-	int		readChannel;
-	short 	myFormat;
-	int   	myByteRate;
-	short 	myBlockAlign;
-	short 	myBitsPerSample;
-	double position;
-	double speed;
-	double output;
-	
-public:
-	int	myDataSize;
-	short 	myChannels;
-	int   	mySampleRate;
-	long length;
-	void getLength();
-
-
-	char* 	myData;
-	
-	// get/set for the Path property
-
-	~maxiSample()
-	{
-		if (myData) delete[] myData;
-	}
-	
-	maxiSample():myData(NULL){};
-
-	bool load(string fileName, int channel=0);
-	
-	void trigger();
-	
-	// read a wav file into this class
-	bool read();
-	
-	double play();
-	
-	double playOnce();
-	
-	double playOnce(double speed);
-	
-	double play(double speed);
-	
-	double play(double frequency, double start, double end, double &pos);
-	
-	double play(double frequency, double start, double end);
-		
-	double play4(double frequency, double start, double end);
-	
-	double bufferPlay(unsigned char &bufferin,long length);
-	
-	double bufferPlay(unsigned char &bufferin,double speed,long length);
-	
-	double bufferPlay(unsigned char &bufferin,double frequency, double start, double end);
-	
-	double bufferPlay4(unsigned char &bufferin,double frequency, double start, double end);
-	
-	//int open(char *filename) {
-	//		// open the wav file
-	//		char *path = new char[50];
-	//		strcpy(path, filename);
-	//		sample *myWav = new sample(path);
-	//		return 0;
-	//	}	
-	//		// print a summary of the wav file
-	//	int info() {
-	//		char *summary = myWav->getSummary();
-	//		printf("Summary:\n%s", summary);	
-	//		return 0;
-	//	}
-	//	int savefile() {	
-	//		// write the summary back out
-	//		strcpy(path, "testout.wav");
-	//		myWav->setPath(path);
-	//		myWav->save();
-	//		return 0:
-	//	}
-	//	int close() {
-	//		// collect the garbage
-	//		delete summary;
-	//		delete path;
-	//		delete myWav;
-	//		
-	//		return 0;
-	//	}		
-	// write out the wav file
-	bool save()
-	{
-		fstream myFile (myPath.c_str(), ios::out | ios::binary);
-		
-		// write the wav file per the wav file format
-		myFile.seekp (0, ios::beg); 
-		myFile.write ("RIFF", 4);
-		myFile.write ((char*) &myChunkSize, 4);
-		myFile.write ("WAVE", 4);
-		myFile.write ("fmt ", 4);
-		myFile.write ((char*) &mySubChunk1Size, 4);
-		myFile.write ((char*) &myFormat, 2);
-		myFile.write ((char*) &myChannels, 2);
-		myFile.write ((char*) &mySampleRate, 4);
-		myFile.write ((char*) &myByteRate, 4);
-		myFile.write ((char*) &myBlockAlign, 2);
-		myFile.write ((char*) &myBitsPerSample, 2);
-		myFile.write ("data", 4);
-		myFile.write ((char*) &myDataSize, 4);
-		myFile.write (myData, myDataSize);
-		
-		return true;
-	}
-	
-	// return a printable summary of the wav file
-	char *getSummary()
-	{
-		char *summary = new char[250];
-		sprintf(summary, " Format: %d\n Channels: %d\n SampleRate: %d\n ByteRate: %d\n BlockAlign: %d\n BitsPerSample: %d\n DataSize: %d\n", myFormat, myChannels, mySampleRate, myByteRate, myBlockAlign, myBitsPerSample, myDataSize);
-		std::cout << myDataSize;
-		return summary;
-	}
-};
-
-
-class maxiMap {
-public:
-	static double inline linlin(double val, double inMin, double inMax, double outMin, double outMax) {
-		return ((val - inMin) / (inMax - inMin) * (outMax - outMin)) + outMin;
-	}
-	
-	static double inline linexp(double val, double inMin, double inMax, double outMin, double outMax) {
-		//clipping
-		val = max(min(val, inMax), inMin);
-		return pow((outMax / outMin), (val - inMin) / (inMax - inMin)) * outMin;
-	}
-
-	static double inline explin(double val, double inMin, double inMax, double outMin, double outMax) {
-		//clipping
-		val = max(min(val, inMax), inMin);
-		return (log(val/inMin) / log(inMax/inMin) * (outMax - outMin)) + outMin;
-	}
-	
-};
-
-
-class maxiDyn {
-
-	
-public:
-	double gate(double input, double threshold=0.9, long holdtime=1, double attack=1, double release=0.9995);
-	double compressor(double input, double ratio, double threshold=0.9, double attack=1, double release=0.9995);
-	double input;
-	double ratio;
-	double currentRatio;
-	double threshold;
-	double output;
-	double attack;
-	double release;
-	double amplitude;
-	long holdtime;
-	long holdcount;
-	int attackphase,holdphase,releasephase;
-};
-
-class maxiEnv {
-	
-	
-public:
-	double ar(double input, double attack=1, double release=0.9, long holdtime=1, int trigger=0);
-	double adsr(double input, double attack=1, double decay=0.99, double sustain=0.125, double release=0.9, long holdtime=1, int trigger=0);
-	double input;
-	double output;
-	double attack;
-	double decay;
-	double sustain;
-	double release;
-	double amplitude;
-	int trigger;
-	long holdtime;
-	long holdcount;
-	int attackphase,decayphase,sustainphase,holdphase,releasephase;
-};
-
-class convert {
-	public:
-	double mtof(int midinote);
-};
-
-#endif
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.cpp b/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.cpp
deleted file mode 100755
index bfef498..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-#include "testApp.h"
-#include "maximilian.h"
-
-//--------------------------------------------------------------
-void testApp::setup(){
-
-	ofBackground(34, 34, 34);
-
-	// 2 output channels,
-	// 0 input channels
-	// 22050 samples per second
-	// 512 samples per buffer
-	// 4 num buffers (latency)
-	
-	int bufferSize		= 512;
-	sampleRate 			= 44100;
-
-	lAudio.assign(bufferSize, 0.0);
-	rAudio.assign(bufferSize, 0.0);
-	
-	//soundStream.listDevices();
-	
-	//if you want to set the device id to be different than the default
-	//soundStream.setDeviceID(1); 	//note some devices are input only and some are output only 
-
-	soundStream.setup(this, 2, 0, sampleRate, bufferSize, 4);
-
-	ofSetFrameRate(60);
-}
-
-
-//--------------------------------------------------------------
-void testApp::update(){
-
-}
-
-//--------------------------------------------------------------
-void testApp::draw(){
-
-	ofSetColor(225);
-	ofDrawBitmapString("AUDIO OUTPUT EXAMPLE", 32, 32);
-	ofDrawBitmapString("press 's' to unpause the audio\npress 'e' to pause the audio", 31, 92);
-	
-	ofNoFill();
-	
-	// draw the left channel:
-	ofPushStyle();
-		ofPushMatrix();
-		ofTranslate(32, 150, 0);
-			
-		ofSetColor(225);
-		ofDrawBitmapString("Left Channel", 4, 18);
-		
-		ofSetLineWidth(1);	
-		ofRect(0, 0, 900, 200);
-
-		ofSetColor(245, 58, 135);
-		ofSetLineWidth(3);
-					
-			ofBeginShape();
-			for (int i = 0; i < lAudio.size(); i++){
-				float x =  ofMap(i, 0, lAudio.size(), 0, 900, true);
-				ofVertex(x, 100 -lAudio[i]*180.0f);
-			}
-			ofEndShape(false);
-			
-		ofPopMatrix();
-	ofPopStyle();
-
-	// draw the right channel:
-	ofPushStyle();
-		ofPushMatrix();
-		ofTranslate(32, 350, 0);
-			
-		ofSetColor(225);
-		ofDrawBitmapString("Right Channel", 4, 18);
-		
-		ofSetLineWidth(1);	
-		ofRect(0, 0, 900, 200);
-
-		ofSetColor(245, 58, 135);
-		ofSetLineWidth(3);
-					
-			ofBeginShape();
-			for (int i = 0; i < rAudio.size(); i++){
-				float x =  ofMap(i, 0, rAudio.size(), 0, 900, true);
-				ofVertex(x, 100 -rAudio[i]*180.0f);
-			}
-			ofEndShape(false);
-			
-		ofPopMatrix();
-	ofPopStyle();
-
-}
-
-
-//--------------------------------------------------------------
-void testApp::keyPressed  (int key){
-
-}
-
-//--------------------------------------------------------------
-void testApp::keyReleased  (int key){
-
-}
-
-//--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
-
-}
-
-//--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
-
-}
-
-//--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
-	
-}
-
-
-//--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
-	
-}
-
-//--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
-
-}
-
-//--------------------------------------------------------------
-void testApp::audioOut(float * output, int bufferSize, int nChannels){
-
-
-		for (int i = 0; i < bufferSize; i++){
-	
-			sample=test1.sinewave(440);
-
-			lAudio[i] = output[i*nChannels    ] = sample;
-			rAudio[i] = output[i*nChannels + 1] = sample;
-
-		}
-
-}
-
-//--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
-
-}
-
-//--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
-
-}
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.h b/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.h
deleted file mode 100755
index f0eb9d8..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _TEST_APP
-#define _TEST_APP
-
-
-#include "ofMain.h"
-#include "maximilian.h"
-
-class testApp : public ofBaseApp{
-
-	public:
-
-		void setup();
-		void update();
-		void draw();
-
-		void keyPressed  (int key);
-		void keyReleased(int key);
-		void mouseMoved(int x, int y );
-		void mouseDragged(int x, int y, int button);
-		void mousePressed(int x, int y, int button);
-		void mouseReleased(int x, int y, int button);
-		void windowResized(int w, int h);
-		void dragEvent(ofDragInfo dragInfo);
-		void gotMessage(ofMessage msg);
-		
-		void audioOut(float * input, int bufferSize, int nChannels);
-		
-		
-		ofSoundStream soundStream;
-
-		int		sampleRate;
-
-		vector <float> lAudio;
-		vector <float> rAudio;
-		
-		//------------------- for the simple sine wave synthesis
-
-		maxiOsc test1;
-		double sample;
-};
-
-#endif