summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/flac.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-03-06 18:02:37 +1100
committer Vas Crabb <vas@vastheman.com>2016-03-06 21:49:56 +1100
commit73b44c94291c4d086477167a76fd7db239936c3b (patch)
tree9af214e443878f4b1e6452d63393ca9f9f8a0884 /src/lib/util/flac.cpp
parent00941faaab99d937a32bce4d225ec56951d21020 (diff)
Turn core_file into a proper class that gets cleaned up safely using unique_ptr
Subverted somewhat by chd_file class
Diffstat (limited to 'src/lib/util/flac.cpp')
-rw-r--r--src/lib/util/flac.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/util/flac.cpp b/src/lib/util/flac.cpp
index f70ae709978..c66cc281931 100644
--- a/src/lib/util/flac.cpp
+++ b/src/lib/util/flac.cpp
@@ -35,7 +35,7 @@ flac_encoder::flac_encoder(void *buffer, UINT32 buflength)
}
-flac_encoder::flac_encoder(core_file &file)
+flac_encoder::flac_encoder(util::core_file &file)
{
init_common();
reset(file);
@@ -100,7 +100,7 @@ bool flac_encoder::reset(void *buffer, UINT32 buflength)
// reset - reset state with new file parameters
//-------------------------------------------------
-bool flac_encoder::reset(core_file &file)
+bool flac_encoder::reset(util::core_file &file)
{
// configure the output
m_compressed_start = nullptr;
@@ -185,7 +185,7 @@ UINT32 flac_encoder::finish()
{
// process the data and return the amount written
FLAC__stream_encoder_finish(m_encoder);
- return (m_file != nullptr) ? core_ftell(m_file) : m_compressed_offset;
+ return (m_file != nullptr) ? m_file->tell() : m_compressed_offset;
}
@@ -252,7 +252,7 @@ FLAC__StreamEncoderWriteStatus flac_encoder::write_callback(const FLAC__byte buf
{
int count = bytes - offset;
if (m_file != nullptr)
- core_fwrite(m_file, buffer, count);
+ m_file->write(buffer, count);
else
{
if (m_compressed_offset + count <= m_compressed_length)
@@ -308,7 +308,7 @@ flac_decoder::flac_decoder(const void *buffer, UINT32 length, const void *buffer
// flac_decoder - constructor
//-------------------------------------------------
-flac_decoder::flac_decoder(core_file &file)
+flac_decoder::flac_decoder(util::core_file &file)
: m_decoder(FLAC__stream_decoder_new()),
m_file(&file),
m_compressed_offset(0),
@@ -414,7 +414,7 @@ bool flac_decoder::reset(UINT32 sample_rate, UINT8 num_channels, UINT32 block_si
// reset - reset state with new file parameter
//-------------------------------------------------
-bool flac_decoder::reset(core_file &file)
+bool flac_decoder::reset(util::core_file &file)
{
m_file = &file;
m_compressed_start = nullptr;
@@ -511,7 +511,7 @@ FLAC__StreamDecoderReadStatus flac_decoder::read_callback(FLAC__byte buffer[], s
// if a file, just read
if (m_file != nullptr)
- *bytes = core_fread(m_file, buffer, expected);
+ *bytes = m_file->read(buffer, expected);
// otherwise, copy from memory
else