From 7da2f8e6320fb5b3e1dbb4d1052ef283e1fc8886 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Sat, 10 Sep 2016 15:21:24 -1000
Subject: [PATCH] Minor Windows include tweaks

---
 include/boo/System.hpp  | 16 ++++++++--------
 lib/audiodev/WASAPI.cpp |  4 ++--
 logvisor                |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/boo/System.hpp b/include/boo/System.hpp
index a9073d9..f62c42f 100644
--- a/include/boo/System.hpp
+++ b/include/boo/System.hpp
@@ -1,6 +1,14 @@
 #ifndef BOO_SYSTEM_HPP
 #define BOO_SYSTEM_HPP
 
+#ifdef _WIN32
+#include <windows.h>
+#include <D3Dcommon.h>
+#include <wrl/client.h>
+template <class T>
+using ComPtr = Microsoft::WRL::ComPtr<T>;
+#endif
+
 #include <string>
 
 #ifndef ENABLE_BITWISE_ENUM
@@ -53,12 +61,4 @@ namespace boo
 
 }
 
-#ifdef _WIN32
-#include <windows.h>
-#include <D3Dcommon.h>
-#include <wrl/client.h>
-template <class T>
-using ComPtr = Microsoft::WRL::ComPtr<T>;
-#endif
-
 #endif
diff --git a/lib/audiodev/WASAPI.cpp b/lib/audiodev/WASAPI.cpp
index 81a57b3..77de820 100644
--- a/lib/audiodev/WASAPI.cpp
+++ b/lib/audiodev/WASAPI.cpp
@@ -609,8 +609,8 @@ struct WASAPIAudioVoiceEngine : BaseAudioVoiceEngine
 
         size_t send(const void* buf, size_t len) const
         {
-            memcpy(const_cast<MIDIOut*>(this)->m_buf, buf, std::min(len, size_t(512)));
-            const_cast<MIDIOut*>(this)->m_hdr.dwBytesRecorded = len;
+            memcpy(const_cast<uint8_t*>(m_buf), buf, std::min(len, size_t(512)));
+            const_cast<MIDIHDR&>(m_hdr).dwBytesRecorded = len;
             midiStreamOut(m_strm, LPMIDIHDR(&m_hdr), sizeof(m_hdr));
             return len;
         }
diff --git a/logvisor b/logvisor
index a190c5c..c839ce7 160000
--- a/logvisor
+++ b/logvisor
@@ -1 +1 @@
-Subproject commit a190c5cfb66e770487189f34874aa057ab75c5fb
+Subproject commit c839ce774c10644db03fc4c51fc9eeeaaaff117e