replace WinAudio with sfml SoundStream

Main.cpp

@@ -1,12 +1,13 @@
 #define _USE_MATH_DEFINES
 #define _CRT_SECURE_NO_WARNINGS
-#include "WinAudio.h"
 #include <SFML/Graphics.hpp>
 #include <SFML/OpenGL.hpp>
+#include <SFML/Audio.hpp>
 #include <iostream>
 #include <complex>
 #include <math.h>
 #include <fstream>
+#include <cstring>
 
 //Constants
 static const int target_fps = 60;
@@ -125,9 +126,10 @@ static const Fractal all_fractals[] = {
   chirikov,
 };
 
-//Synthesizer class to inherit Windows Audio.
-class Synth : public WinAudio {
+//Synthesizer class to inherit SoundStream.
+class Synth : public sf::SoundStream {
 public:
+  static const int AUDIO_BUFF_SIZE = 4096;
   bool audio_reset;
   bool audio_pause;
   double volume;
@@ -136,7 +138,7 @@ class Synth : public WinAudio {
   double play_nx, play_ny;
   double play_px, play_py;
 
-  Synth(HWND hwnd) : WinAudio(hwnd, sample_rate) {
+  Synth(unsigned long int /*unused*/) {
     audio_reset = true;
     audio_pause = false;
     volume = 8000.0;
@@ -148,6 +150,9 @@ class Synth : public WinAudio {
     play_ny = 0.0;
     play_px = 0.0;
     play_py = 0.0;
+
+    initialize(2, sample_rate);
+    setLoop(true);
   }
 
   void SetPoint(double x, double y) {
@@ -157,6 +162,8 @@ class Synth : public WinAudio {
     audio_pause = false;
   }
 
+  virtual void onSeek(sf::Time /*unused*/) override {}
+
   virtual bool onGetData(Chunk& data) override {
     //Setup the chunk info
     data.samples = m_samples;

MandelbrotMusic.vcxproj

@@ -88,7 +88,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>C:\Program Files\SFML\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>sfml-graphics-s-d.lib;sfml-system-s-d.lib;sfml-window-s-d.lib;opengl32.lib;winmm.lib;gdi32.lib;glu32.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sfml-graphics-s-d.lib;sfml-audio-d.lib;sfml-system-s-d.lib;sfml-window-s-d.lib;opengl32.lib;winmm.lib;gdi32.lib;glu32.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -120,20 +120,16 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>C:\Program Files\SFML\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>sfml-graphics-s.lib;sfml-system-s.lib;sfml-window-s.lib;opengl32.lib;winmm.lib;gdi32.lib;glu32.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sfml-graphics-s.lib;sfml-audio-d.lib;sfml-system-s.lib;sfml-window-s.lib;opengl32.lib;winmm.lib;gdi32.lib;glu32.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
-    <ClCompile Include="WinAudio.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="frag.glsl" />
     <None Include="vert.glsl" />
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="WinAudio.h" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

MandelbrotMusic.vcxproj.filters

@@ -18,9 +18,6 @@
     <ClCompile Include="Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="WinAudio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="frag.glsl">
@@ -30,9 +27,4 @@
       <Filter>Header Files</Filter>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="WinAudio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
 </Project>