AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor Windows include tweaks

This commit is contained in:
Jack Andersen 2016-09-10 15:21:24 -10:00
parent c33f8d5d3c
commit 7da2f8e632
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/boo/System.hpp
View File

@ -1,6 +1,14 @@
#ifndef BOO_SYSTEM_HPP #ifndef BOO_SYSTEM_HPP
#define 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> #include <string>
#ifndef ENABLE_BITWISE_ENUM #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 #endif

4
lib/audiodev/WASAPI.cpp
View File

@ -609,8 +609,8 @@ struct WASAPIAudioVoiceEngine : BaseAudioVoiceEngine
size_t send(const void* buf, size_t len) const size_t send(const void* buf, size_t len) const
{ {
memcpy(const_cast<MIDIOut*>(this)->m_buf, buf, std::min(len, size_t(512))); memcpy(const_cast<uint8_t*>(m_buf), buf, std::min(len, size_t(512)));
const_cast<MIDIOut*>(this)->m_hdr.dwBytesRecorded = len; const_cast<MIDIHDR&>(m_hdr).dwBytesRecorded = len;
midiStreamOut(m_strm, LPMIDIHDR(&m_hdr), sizeof(m_hdr)); midiStreamOut(m_strm, LPMIDIHDR(&m_hdr), sizeof(m_hdr));
return len; return len;
} }

2
logvisor

@ -1 +1 @@
Subproject commit a190c5cfb66e770487189f34874aa057ab75c5fb Subproject commit c839ce774c10644db03fc4c51fc9eeeaaaff117e