diff options
Diffstat (limited to 'engines/sword25/fmv/oggtheora/vorbisstate.cpp')
| -rw-r--r-- | engines/sword25/fmv/oggtheora/vorbisstate.cpp | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/engines/sword25/fmv/oggtheora/vorbisstate.cpp b/engines/sword25/fmv/oggtheora/vorbisstate.cpp index e9f6b7dc4f..53085a9832 100644 --- a/engines/sword25/fmv/oggtheora/vorbisstate.cpp +++ b/engines/sword25/fmv/oggtheora/vorbisstate.cpp @@ -38,20 +38,20 @@ #include "sword25/fmv/oggtheora/vorbisstate.h" +namespace Sword25 { + // ----------------------------------------------------------------------------- -BS_VorbisState::BS_VorbisState() : - m_DSPStateInitialized(false), - m_BlockInitialized(false) -{ +VorbisState::VorbisState() : + m_DSPStateInitialized(false), + m_BlockInitialized(false) { vorbis_info_init(&m_Info); vorbis_comment_init(&m_Comment); } // ----------------------------------------------------------------------------- -BS_VorbisState::~BS_VorbisState() -{ +VorbisState::~VorbisState() { if (m_BlockInitialized) vorbis_block_clear(&m_Block); if (m_DSPStateInitialized) vorbis_dsp_clear(&m_DSPState); vorbis_comment_clear(&m_Comment); @@ -60,15 +60,13 @@ BS_VorbisState::~BS_VorbisState() // ----------------------------------------------------------------------------- -int BS_VorbisState::SynthesisHeaderIn(ogg_packet * OggPacketPtr) -{ +int VorbisState::SynthesisHeaderIn(ogg_packet *OggPacketPtr) { return vorbis_synthesis_headerin(&m_Info, &m_Comment, OggPacketPtr); } // ----------------------------------------------------------------------------- -int BS_VorbisState::SynthesisInit() -{ +int VorbisState::SynthesisInit() { int Result = vorbis_synthesis_init(&m_DSPState, &m_Info); m_DSPStateInitialized = (Result == 0); return Result; @@ -76,8 +74,7 @@ int BS_VorbisState::SynthesisInit() // ----------------------------------------------------------------------------- -int BS_VorbisState::BlockInit() -{ +int VorbisState::BlockInit() { int Result = vorbis_block_init(&m_DSPState, &m_Block); m_BlockInitialized = (Result == 0); return Result; @@ -85,28 +82,26 @@ int BS_VorbisState::BlockInit() // ----------------------------------------------------------------------------- -int BS_VorbisState::SynthesisPCMout(float *** PCM) -{ +int VorbisState::SynthesisPCMout(float ***PCM) { return vorbis_synthesis_pcmout(&m_DSPState, PCM); } // ----------------------------------------------------------------------------- -int BS_VorbisState::SynthesisRead(int Samples) -{ +int VorbisState::SynthesisRead(int Samples) { return vorbis_synthesis_read(&m_DSPState, Samples); } // ----------------------------------------------------------------------------- -int BS_VorbisState::Synthesis(ogg_packet * OggPacketPtr) -{ +int VorbisState::Synthesis(ogg_packet *OggPacketPtr) { return vorbis_synthesis(&m_Block, OggPacketPtr); } // ----------------------------------------------------------------------------- -int BS_VorbisState::SynthesisBlockIn() -{ +int VorbisState::SynthesisBlockIn() { return vorbis_synthesis_blockin(&m_DSPState, &m_Block); } + +} // End of namespace Sword25 |