summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/Src/WaveFile.cpp
diff options
context:
space:
mode:
authorNeoBrainX <NeoBrainX@googlemail.com>2013-03-01 01:07:34 +0100
committerNeoBrainX <NeoBrainX@googlemail.com>2013-03-01 01:07:34 +0100
commit7682ed22c6d584bd276c1049c9b5068b1610da61 (patch)
treeea65d89f5b4b172bc1bbbd437ebc28752f336332 /Source/Core/AudioCommon/Src/WaveFile.cpp
parent0f617183a8a74f066d1d01a3ed50042cc9824bf8 (diff)
parentbc15919e2ebefe327ce6330f7abdaccaa2fd2004 (diff)
Merge branch 'master' into perfqueries.
Conflicts: Source/Core/VideoCommon/Src/VideoConfig.h Source/Core/VideoCommon/VideoCommon.vcxproj.filters Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
Diffstat (limited to 'Source/Core/AudioCommon/Src/WaveFile.cpp')
-rw-r--r--Source/Core/AudioCommon/Src/WaveFile.cpp31
1 files changed, 22 insertions, 9 deletions
diff --git a/Source/Core/AudioCommon/Src/WaveFile.cpp b/Source/Core/AudioCommon/Src/WaveFile.cpp
index 802f3f7417..d98348b8bf 100644
--- a/Source/Core/AudioCommon/Src/WaveFile.cpp
+++ b/Source/Core/AudioCommon/Src/WaveFile.cpp
@@ -100,39 +100,52 @@ void WaveFileWriter::Write4(const char *ptr)
file.WriteBytes(ptr, 4);
}
-void WaveFileWriter::AddStereoSamples(const short *sample_data, int count)
+void WaveFileWriter::AddStereoSamples(const short *sample_data, u32 count)
{
if (!file)
PanicAlertT("WaveFileWriter - file not open.");
- if (skip_silence) {
+
+ if (skip_silence)
+ {
bool all_zero = true;
- for (int i = 0; i < count * 2; i++)
- if (sample_data[i]) all_zero = false;
- if (all_zero) return;
+
+ for (u32 i = 0; i < count * 2; i++)
+ {
+ if (sample_data[i])
+ all_zero = false;
+ }
+
+ if (all_zero)
+ return;
}
+
file.WriteBytes(sample_data, count * 4);
audio_size += count * 4;
}
-void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, int count)
+void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, u32 count)
{
if (!file)
PanicAlertT("WaveFileWriter - file not open.");
if (count > BUF_SIZE * 2)
- PanicAlert("WaveFileWriter - buffer too small (count = %i).", count);
+ PanicAlert("WaveFileWriter - buffer too small (count = %u).", count);
if (skip_silence)
{
bool all_zero = true;
- for (int i = 0; i < count * 2; i++)
+
+ for (u32 i = 0; i < count * 2; i++)
+ {
if (sample_data[i])
all_zero = false;
+ }
+
if (all_zero)
return;
}
- for (int i = 0; i < count * 2; i++)
+ for (u32 i = 0; i < count * 2; i++)
conv_buffer[i] = Common::swap16((u16)sample_data[i]);
file.WriteBytes(conv_buffer, count * 4);