diff options
| author | skidau <skidau@gmail.com> | 2014-10-12 14:04:45 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-12 14:04:45 +1100 |
| commit | a00ad6871c92aa74b26cf8e88f5d94bfe1193503 (patch) | |
| tree | ee6900b3a71eb604ddc24b628408397b817b0a28 /Source/Core/AudioCommon/Mixer.cpp | |
| parent | 7443a07f6e80b3bb5a74780fb2226795738014b0 (diff) | |
| parent | fc4125cdd15c6119d75f6667cd44dcbd4df4a8b3 (diff) | |
Merge pull request #1220 from RisingFog/avsync
Proper Audio/Video Dumping
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index a7984579ca..60203b2f37 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -122,8 +122,6 @@ unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider m_dma_mixer.Mix(samples, num_samples, consider_framelimit); m_streaming_mixer.Mix(samples, num_samples, consider_framelimit); m_wiimote_speaker_mixer.Mix(samples, num_samples, consider_framelimit); - if (m_logAudio) - g_wave_writer.AddStereoSamples(samples, num_samples); return num_samples; } @@ -161,11 +159,15 @@ void CMixer::MixerFifo::PushSamples(const short *samples, unsigned int num_sampl void CMixer::PushSamples(const short *samples, unsigned int num_samples) { m_dma_mixer.PushSamples(samples, num_samples); + if (m_log_dsp_audio) + g_wave_writer_dsp.AddStereoSamplesBE(samples, num_samples); } void CMixer::PushStreamingSamples(const short *samples, unsigned int num_samples) { m_streaming_mixer.PushSamples(samples, num_samples); + if (m_log_dtk_audio) + g_wave_writer_dtk.AddStereoSamplesBE(samples, num_samples); } void CMixer::PushWiimoteSpeakerSamples(const short *samples, unsigned int num_samples, unsigned int sample_rate) |
