From c30f7a40e072265994ba72d5950a500a6954a5cc Mon Sep 17 00:00:00 2001 From: stwf Date: Thu, 25 Apr 2013 10:48:34 +0000 Subject: [PATCH] no need to check errors after destroying context, clean up some OpenAL interface calls This was SVN commit r13371. --- source/soundmanager/SoundManager.cpp | 2 -- source/soundmanager/items/CBufferItem.cpp | 2 +- source/soundmanager/items/CSoundBase.cpp | 4 ++-- source/soundmanager/items/CStreamItem.cpp | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/soundmanager/SoundManager.cpp b/source/soundmanager/SoundManager.cpp index 5cc67794c2..ceaf448d0f 100644 --- a/source/soundmanager/SoundManager.cpp +++ b/source/soundmanager/SoundManager.cpp @@ -317,8 +317,6 @@ CSoundManager::~CSoundManager() if ( m_Context ) alcDestroyContext(m_Context); - AL_CHECK - if ( m_Device ) alcCloseDevice(m_Device); } diff --git a/source/soundmanager/items/CBufferItem.cpp b/source/soundmanager/items/CBufferItem.cpp index 6bb303629e..0cad25dec5 100644 --- a/source/soundmanager/items/CBufferItem.cpp +++ b/source/soundmanager/items/CBufferItem.cpp @@ -74,7 +74,7 @@ bool CBufferItem::IdleTask() { CScopeLock lock(m_ItemMutex); int proc_state; - alGetSourceiv(m_ALSource, AL_SOURCE_STATE, &proc_state); + alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state); AL_CHECK m_ShouldBePlaying = (proc_state != AL_STOPPED); return (proc_state != AL_STOPPED); diff --git a/source/soundmanager/items/CSoundBase.cpp b/source/soundmanager/items/CSoundBase.cpp index 5b7247768b..c54287f93a 100644 --- a/source/soundmanager/items/CSoundBase.cpp +++ b/source/soundmanager/items/CSoundBase.cpp @@ -191,7 +191,7 @@ bool CSoundBase::IsPlaying() { CScopeLock lock(m_ItemMutex); int proc_state; - alGetSourceiv(m_ALSource, AL_SOURCE_STATE, &proc_state); + alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state); AL_CHECK return (proc_state == AL_PLAYING); @@ -334,7 +334,7 @@ void CSoundBase::FadeToIn(ALfloat newVolume, double fadeDuration) if (m_ALSource != 0) { ALenum proc_state; - alGetSourceiv(m_ALSource, AL_SOURCE_STATE, &proc_state); + alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state); if (proc_state == AL_PLAYING) { m_StartFadeTime = timer_Time(); diff --git a/source/soundmanager/items/CStreamItem.cpp b/source/soundmanager/items/CStreamItem.cpp index 418ceea0a0..1e68a29f1c 100644 --- a/source/soundmanager/items/CStreamItem.cpp +++ b/source/soundmanager/items/CStreamItem.cpp @@ -70,7 +70,7 @@ bool CStreamItem::IdleTask() if (m_ALSource != 0) { int proc_state; - alGetSourceiv(m_ALSource, AL_SOURCE_STATE, &proc_state); + alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state); AL_CHECK if (proc_state == AL_STOPPED)