Wrapped fopen/close/read/write functions inside a simple "IOFile" class. Reading, writing, and error checking became simpler in most cases. It should be near impossible to forget to close a file now that the destructor takes care of it. (I hope this fixes Issue 3635) I have tested the functionality of most things, but it is possible I broke something. :p

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7328 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 14 insertions, 17 deletions

diff --git a/Source/Core/AudioCommon/Src/WaveFile.cpp b/Source/Core/AudioCommon/Src/WaveFile.cpp
index a7ec387454..db1f273bfb 100644
--- a/Source/Core/AudioCommon/Src/WaveFile.cpp
+++ b/Source/Core/AudioCommon/Src/WaveFile.cpp
@@ -23,7 +23,6 @@ enum {BUF_SIZE = 32*1024};
 
 WaveFileWriter::WaveFileWriter()
 {
-	file = NULL;
 	conv_buffer = 0;
 	skip_silence = false;
 }
@@ -46,7 +45,7 @@ bool WaveFileWriter::Start(const char *filename, unsigned int HLESampleRate)
 		return false;
 	}
 
-	file = fopen(filename, "wb");
+	file.Open(filename, "wb");
 	if (!file)
 	{
 		PanicAlertT("The file %s could not be opened for writing. Please check if it's already opened by another program.", filename);
@@ -73,36 +72,32 @@ bool WaveFileWriter::Start(const char *filename, unsigned int HLESampleRate)
 	Write(100 * 1000 * 1000 - 32);
 
 	// We are now at offset 44
-	if (ftello(file) != 44)
-		PanicAlert("wrong offset: %lld", (long long)ftello(file));
+	if (file.Tell() != 44)
+		PanicAlert("wrong offset: %lld", (long long)file.Tell());
 
 	return true;
 }
 
 void WaveFileWriter::Stop()
 {
-	if (!file)
-		return;
-        
 	// u32 file_size = (u32)ftello(file);
-	fseeko(file, 4, SEEK_SET);
+	file.Seek(4, SEEK_SET);
 	Write(audio_size + 36);
 
-	fseeko(file, 40, SEEK_SET);
+	file.Seek(40, SEEK_SET);
 	Write(audio_size);
 
-	fclose(file);
-	file = 0;
+	file.Close();
 }
 
 void WaveFileWriter::Write(u32 value)
 {
-	fwrite(&value, 4, 1, file);
+	file.WriteArray(&value, 1);
 }
 
 void WaveFileWriter::Write4(const char *ptr)
 {
-	fwrite(ptr, 4, 1, file);
+	file.WriteBytes(ptr, 4);
 }
 
 void WaveFileWriter::AddStereoSamples(const short *sample_data, int count)
@@ -115,7 +110,7 @@ void WaveFileWriter::AddStereoSamples(const short *sample_data, int count)
 			if (sample_data[i]) all_zero = false;
 		if (all_zero) return;
 	}
-	fwrite(sample_data, count * 4, 1, file);
+	file.WriteBytes(sample_data, count * 4);
 	audio_size += count * 4;
 }
 
@@ -140,6 +135,6 @@ void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, int count)
 	for (int i = 0; i < count * 2; i++)
 		conv_buffer[i] = Common::swap16((u16)sample_data[i]);
 
-	fwrite(conv_buffer, count * 4, 1, file);
+	file.WriteBytes(conv_buffer, count * 4);
 	audio_size += count * 4;
 }
diff --git a/Source/Core/AudioCommon/Src/WaveFile.h b/Source/Core/AudioCommon/Src/WaveFile.h
index 6176998d3b..72a090814b 100644
--- a/Source/Core/AudioCommon/Src/WaveFile.h
+++ b/Source/Core/AudioCommon/Src/WaveFile.h
@@ -28,17 +28,19 @@
 #ifndef _WAVEFILE_H_
 #define _WAVEFILE_H_
 
-#include <stdio.h>
+#include "FileUtil.h"
 
 class WaveFileWriter
 {
-	FILE *file;
+	File::IOFile file;
 	bool skip_silence;
 	u32 audio_size;
 	short *conv_buffer;
 	void Write(u32 value);
 	void Write4(const char *ptr);
 
+	WaveFileWriter& operator=(const WaveFileWriter&)/* = delete*/;
+
 public:
 	WaveFileWriter();
 	~WaveFileWriter();