piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7328 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2011-03-11 10:21:46 +00:00
parent 4f69672b2b
commit 59fd1008ca
68 changed files with 1112 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/AudioCommon/Src/WaveFile.cpp
View File

@ -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;
}