Reformat all the things. Have fun with merge conflicts.

1 files changed, 13 insertions, 10 deletions

diff --git a/Source/Core/AudioCommon/NullSoundStream.cpp b/Source/Core/AudioCommon/NullSoundStream.cpp
index 049ce2b269..d55c61bbc3 100644
--- a/Source/Core/AudioCommon/NullSoundStream.cpp
+++ b/Source/Core/AudioCommon/NullSoundStream.cpp
@@ -13,7 +13,7 @@ void NullSound::SoundLoop()
 
 bool NullSound::Start()
 {
-	return true;
+  return true;
 }
 
 void NullSound::SetVolume(int volume)
@@ -22,19 +22,22 @@ void NullSound::SetVolume(int volume)
 
 void NullSound::Update()
 {
-	// num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD.
-	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(m_realtime_buffer.data(), (unsigned int)num_samples_to_render);
+  // num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD.
+  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(m_realtime_buffer.data(), (unsigned int)num_samples_to_render);
 }
 
 void NullSound::Clear(bool mute)
 {
-	m_muted = mute;
+  m_muted = mute;
 }
 
 void NullSound::Stop()