fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replacing includes of windows headers with base/platform.h.

Browse Source
This commit is contained in:
Ben Vanik
2015-07-01 09:02:04 -07:00
parent 88d01e8375
commit dec0d12cc9
23 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/xenia/apu/xaudio2/xaudio2_audio_driver.cc
View File

@@ -9,6 +9,8 @@
#include "xenia/apu/xaudio2/xaudio2_audio_driver.h"
#include <xaudio2.h>
#include "xenia/apu/apu_flags.h"
#include "xenia/base/clock.h"
#include "xenia/base/logging.h"
@@ -39,13 +41,16 @@ class XAudio2AudioDriver::VoiceCallback : public IXAudio2VoiceCallback {
};
XAudio2AudioDriver::XAudio2AudioDriver(Emulator* emulator, HANDLE semaphore)
: audio_(nullptr),
: AudioDriver(emulator),
audio_(nullptr),
mastering_voice_(nullptr),
pcm_voice_(nullptr),
semaphore_(semaphore),
voice_callback_(nullptr),
current_frame_(0),
AudioDriver(emulator) {}
current_frame_(0) {
static_assert(frame_count_ == XAUDIO2_MAX_QUEUED_BUFFERS,
"xaudio header differs");
}
XAudio2AudioDriver::~XAudio2AudioDriver() = default;

8
src/xenia/apu/xaudio2/xaudio2_audio_driver.h
View File

@@ -10,10 +10,12 @@
#ifndef XENIA_APU_XAUDIO2_XAUDIO2_AUDIO_DRIVER_H_
#define XENIA_APU_XAUDIO2_XAUDIO2_AUDIO_DRIVER_H_
#include <xaudio2.h>
#include "xenia/apu/audio_driver.h"
struct IXAudio2;
struct IXAudio2MasteringVoice;
struct IXAudio2SourceVoice;
namespace xe {
namespace apu {
namespace xaudio2 {
@@ -36,7 +38,7 @@ class XAudio2AudioDriver : public AudioDriver {
class VoiceCallback;
VoiceCallback* voice_callback_;
static const uint32_t frame_count_ = XAUDIO2_MAX_QUEUED_BUFFERS;
static const uint32_t frame_count_ = 64;
static const uint32_t frame_channels_ = 6;
static const uint32_t channel_samples_ = 256;
static const uint32_t frame_samples_ = frame_channels_ * channel_samples_;