ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3317 from lioncash/null 

NullSound: Minor changes
This commit is contained in:
Markus Wick 2015-12-15 17:38:37 +01:00
parent 2b60eb0e22 0917db7fc0
commit 164e045123
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/AudioCommon/NullSoundStream.cpp
View File

@ -2,9 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <cstring>
#include "AudioCommon/NullSoundStream.h"
#include "Common/CommonTypes.h"
#include "Core/HW/AudioInterface.h"
#include "Core/HW/SystemTimers.h"
@ -24,13 +23,13 @@ void NullSound::SetVolume(int volume)
void NullSound::Update()
{
// num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD.
const u32 stereo_16_bit_size = 4;
const u32 dma_length = 32;
constexpr u32 stereo_16_bit_size = 4;
constexpr u32 dma_length = 32;
const u64 audio_dma_period = SystemTimers::GetTicksPerSecond() / (AudioInterface::GetAIDSampleRate() * stereo_16_bit_size / dma_length);
const u64 ais_samples_per_second = 48000 * stereo_16_bit_size;
const u64 num_samples_to_render = (audio_dma_period * ais_samples_per_second) / SystemTimers::GetTicksPerSecond();
m_mixer->Mix(realtimeBuffer, (unsigned int)num_samples_to_render);
m_mixer->Mix(m_realtime_buffer.data(), (unsigned int)num_samples_to_render);
}
void NullSound::Clear(bool mute)

13
Source/Core/AudioCommon/NullSoundStream.h
View File

@ -4,16 +4,11 @@
#pragma once
#include <cstdlib>
#include <array>
#include "AudioCommon/SoundStream.h"
#define BUF_SIZE (48000 * 4 / 32)
class NullSound final : public SoundStream
{
// playback position
short realtimeBuffer[BUF_SIZE / sizeof(short)];
public:
bool Start() override;
void SoundLoop() override;
@ -23,4 +18,10 @@ public:
void Update() override;
static bool isValid() { return true; }
private:
static constexpr size_t BUFFER_SIZE = 48000 * 4 / 32;
// Playback position
std::array<short, BUFFER_SIZE / sizeof(short)> m_realtime_buffer;
};