Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update VoiceCallback

This commit is contained in:
Nomango 2018-09-01 23:39:16 +08:00
parent cc2dff2afd
commit c40ac00ed9
3 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/Custom/VoiceCallback.cpp
View File

@ -2,8 +2,7 @@
#include "..\e2dbase.h" #include "..\e2dbase.h"
#include "..\e2dtool.h" #include "..\e2dtool.h"
e2d::VoiceCallback::VoiceCallback(Music * music) e2d::VoiceCallback::VoiceCallback()
: _music(music)
{ {
} }
@ -21,11 +20,6 @@ void e2d::VoiceCallback::OnLoopEnd(void * pBufferContext)
void e2d::VoiceCallback::OnStreamEnd() void e2d::VoiceCallback::OnStreamEnd()
{ {
if (_music)
{
_music->_playing = false;
}
if (_streamEndFunc) if (_streamEndFunc)
{ {
_streamEndFunc(); _streamEndFunc();
@ -38,31 +32,6 @@ void e2d::VoiceCallback::OnBufferEnd(void * pBufferContext)
{ {
_loopEndFunc(); _loopEndFunc();
} }
if (_music)
{
_music->release();
}
}
void e2d::VoiceCallback::OnBufferStart(void * pBufferContext)
{
if (_music)
{
_music->retain();
}
}
void e2d::VoiceCallback::OnVoiceProcessingPassEnd()
{
}
void e2d::VoiceCallback::OnVoiceProcessingPassStart(UINT32 SamplesRequired)
{
}
void e2d::VoiceCallback::OnVoiceError(void * pBufferContext, HRESULT Error)
{
} }
void e2d::VoiceCallback::SetFuncOnStreamEnd(const Function & func) void e2d::VoiceCallback::SetFuncOnStreamEnd(const Function & func)

6
core/Tool/Music.cpp
View File

@ -69,7 +69,7 @@ e2d::Music::Music()
, _waveData(nullptr) , _waveData(nullptr)
, _dwSize(0) , _dwSize(0)
, _voice(nullptr) , _voice(nullptr)
, _voiceCallback(this) , _voiceCallback()
{ {
auto xAudio2 = XAudio2Tool::getInstance()->getXAudio2(); auto xAudio2 = XAudio2Tool::getInstance()->getXAudio2();
xAudio2->AddRef(); xAudio2->AddRef();
@ -84,7 +84,7 @@ e2d::Music::Music(const e2d::String & filePath)
, _waveData(nullptr) , _waveData(nullptr)
, _dwSize(0) , _dwSize(0)
, _voice(nullptr) , _voice(nullptr)
, _voiceCallback(this) , _voiceCallback()
{ {
auto xAudio2 = XAudio2Tool::getInstance()->getXAudio2(); auto xAudio2 = XAudio2Tool::getInstance()->getXAudio2();
xAudio2->AddRef(); xAudio2->AddRef();
@ -101,7 +101,7 @@ e2d::Music::Music(const Resource& res)
, _waveData(nullptr) , _waveData(nullptr)
, _dwSize(0) , _dwSize(0)
, _voice(nullptr) , _voice(nullptr)
, _voiceCallback(this) , _voiceCallback()
{ {
auto xAudio2 = XAudio2Tool::getInstance()->getXAudio2(); auto xAudio2 = XAudio2Tool::getInstance()->getXAudio2();
xAudio2->AddRef(); xAudio2->AddRef();

30
core/e2dcustom.h
View File

@ -13,36 +13,23 @@ class VoiceCallback
: public IXAudio2VoiceCallback : public IXAudio2VoiceCallback
{ {
public: public:
explicit VoiceCallback( VoiceCallback();
Music * music
);
~VoiceCallback(); ~VoiceCallback();
void __stdcall OnStreamEnd(); STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) {}
void __stdcall OnBufferEnd( STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS) {}
void * pBufferContext
);
void __stdcall OnBufferStart( STDMETHOD_(void, OnStreamEnd) (THIS);
void * pBufferContext
);
void __stdcall OnLoopEnd( STDMETHOD_(void, OnBufferStart) (THIS_ void* pBufferContext) {}
void * pBufferContext
);
void __stdcall OnVoiceProcessingPassEnd(); STDMETHOD_(void, OnBufferEnd) (THIS_ void* pBufferContext);
void __stdcall OnVoiceProcessingPassStart( STDMETHOD_(void, OnLoopEnd) (THIS_ void* pBufferContext);
UINT32 SamplesRequired
);
void __stdcall OnVoiceError( STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) {}
void * pBufferContext,
HRESULT Error
);
void SetFuncOnStreamEnd( void SetFuncOnStreamEnd(
const Function& func const Function& func
@ -53,7 +40,6 @@ public:
); );
protected: protected:
Music * _music;
Function _loopEndFunc; Function _loopEndFunc;
Function _streamEndFunc; Function _streamEndFunc;
}; };