Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-11 01:01:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor fix and clean up.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2018-04-21 19:43:19 -03:00
parent 45be2df196
commit 8c0d51da47
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/eepp/audio/soundfilereaderogg.cpp
View File

@@ -54,10 +54,10 @@ bool SoundFileReaderOgg::check(IOStream& stream) {
}
SoundFileReaderOgg::SoundFileReaderOgg() :
m_vorbis (),
m_channelCount(0)
mVorbis (),
mChannelCount(0)
{
m_vorbis.datasource = NULL;
mVorbis.datasource = NULL;
}
SoundFileReaderOgg::~SoundFileReaderOgg() {
@@ -66,7 +66,7 @@ SoundFileReaderOgg::~SoundFileReaderOgg() {
bool SoundFileReaderOgg::open(IOStream& stream, Info& info) {
// Open the Vorbis stream
int status = ov_open_callbacks(&stream, &m_vorbis, NULL, 0, callbacks);
int status = ov_open_callbacks(&stream, &mVorbis, NULL, 0, callbacks);
if (status < 0) {
eePRINTL( "Failed to open Vorbis file for reading" );
@@ -74,32 +74,32 @@ bool SoundFileReaderOgg::open(IOStream& stream, Info& info) {
}
// Retrieve the music attributes
vorbis_info* vorbisInfo = ov_info(&m_vorbis, -1);
vorbis_info* vorbisInfo = ov_info(&mVorbis, -1);
info.channelCount = vorbisInfo->channels;
info.sampleRate = vorbisInfo->rate;
info.sampleCount = static_cast<std::size_t>(ov_pcm_total(&m_vorbis, -1) * vorbisInfo->channels);
info.sampleCount = static_cast<std::size_t>(ov_pcm_total(&mVorbis, -1) * vorbisInfo->channels);
// We must keep the channel count for the seek function
m_channelCount = info.channelCount;
mChannelCount = info.channelCount;
return true;
}
void SoundFileReaderOgg::seek(Uint64 sampleOffset) {
assert(m_vorbis.datasource);
assert(mVorbis.datasource);
ov_pcm_seek(&m_vorbis, sampleOffset / m_channelCount);
ov_pcm_seek(&mVorbis, sampleOffset / mChannelCount);
}
Uint64 SoundFileReaderOgg::read(Int16* samples, Uint64 maxCount)
{
assert(m_vorbis.datasource);
assert(mVorbis.datasource);
// Try to read the requested number of samples, stop only on error or end of file
Uint64 count = 0;
while (count < maxCount) {
int bytesToRead = static_cast<int>(maxCount - count) * sizeof(Int16);
long bytesRead = ov_read(&m_vorbis, reinterpret_cast<char*>(samples), bytesToRead, 0, 2, 1, NULL);
long bytesRead = ov_read(&mVorbis, reinterpret_cast<char*>(samples), bytesToRead, 0, 2, 1, NULL);
if (bytesRead > 0) {
long samplesRead = bytesRead / sizeof(Int16);
@@ -115,10 +115,10 @@ Uint64 SoundFileReaderOgg::read(Int16* samples, Uint64 maxCount)
}
void SoundFileReaderOgg::close() {
if (m_vorbis.datasource) {
ov_clear(&m_vorbis);
m_vorbis.datasource = NULL;
m_channelCount = 0;
if (mVorbis.datasource) {
ov_clear(&mVorbis);
mVorbis.datasource = NULL;
mChannelCount = 0;
}
}

4
src/eepp/audio/soundfilereaderogg.hpp
View File

@@ -66,8 +66,8 @@ class SoundFileReaderOgg : public SoundFileReader {
private:
void close();
OggVorbis_File m_vorbis; // ogg/vorbis file handle
unsigned int m_channelCount; // number of channels of the open sound file
OggVorbis_File mVorbis; // ogg/vorbis file handle
unsigned int mChannelCount; // number of channels of the open sound file
};
}}}

4
src/eepp/system/iostreamfile.cpp
View File

@@ -17,10 +17,10 @@ IOStreamFile::~IOStreamFile() {
ios_size IOStreamFile::read( char * data, ios_size size ) {
if ( isOpen() ) {
std::fread(data, 1, static_cast<std::size_t>(size), mFS);
return std::fread(data, 1, static_cast<std::size_t>(size), mFS);
}
return size;
return 0;
}
ios_size IOStreamFile::write( const char * data, ios_size size ) {