Index: ps/trunk/source/soundmanager/items/CBufferItem.cpp
===================================================================
--- ps/trunk/source/soundmanager/items/CBufferItem.cpp	(revision 24761)
+++ ps/trunk/source/soundmanager/items/CBufferItem.cpp	(revision 24762)
@@ -1,131 +1,131 @@
-/* Copyright (C) 2019 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "CBufferItem.h"
 
 #if CONFIG2_AUDIO
 
 #include "soundmanager/SoundManager.h"
 #include "soundmanager/data/SoundData.h"
 
 #include <mutex>
 
 CBufferItem::CBufferItem(CSoundData* sndData)
 {
 	ResetVars();
 	if (InitOpenAL())
 		Attach(sndData);
 }
 
 
 CBufferItem::~CBufferItem()
 {
 	Stop();
 	ReleaseOpenALBuffer();
 }
 
 
 void CBufferItem::ReleaseOpenALBuffer()
 {
 	if ( m_ALSource == 0 )
 		return;
 
 	int num_processed;
 	AL_CHECK;
 	alGetSourcei(m_ALSource, AL_BUFFERS_PROCESSED, &num_processed);
 	AL_CHECK;
 
 	if (num_processed > 0)
 	{
 		ALuint* al_buf = new ALuint[num_processed];
 		alSourceUnqueueBuffers(m_ALSource, num_processed, al_buf);
 
 		AL_CHECK;
 		delete[] al_buf;
 	}
 	alSourcei(m_ALSource, AL_BUFFER, 0);
 	((CSoundManager*)g_SoundManager)->ReleaseALSource(m_ALSource);
 	AL_CHECK;
 
 	m_ALSource = 0;
 }
 
 bool CBufferItem::IdleTask()
 {
 	if ( m_ALSource == 0 )
 		return false;
 
 	HandleFade();
 
 	if (m_LastPlay)
 	{
 		std::lock_guard<std::mutex> lock(m_ItemMutex);
 		int proc_state;
 		alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state);
 		AL_CHECK;
-		m_ShouldBePlaying = (proc_state != AL_STOPPED);
-		return (proc_state != AL_STOPPED);
+		m_ShouldBePlaying = (proc_state != AL_STOPPED && proc_state != AL_INITIAL && proc_state != AL_PAUSED);
+		return m_ShouldBePlaying;
 	}
 
 	if (GetLooping())
 	{
 		int num_processed;
 		AL_CHECK;
 		alGetSourcei(m_ALSource, AL_BUFFERS_PROCESSED, &num_processed);
 
 		AL_CHECK;
 		for (int i = 0; i < num_processed; i++)
 		{
 			ALuint al_buf;
 			alSourceUnqueueBuffers(m_ALSource, 1, &al_buf);
 			AL_CHECK;
 			alSourceQueueBuffers(m_ALSource, 1, &al_buf);
 			AL_CHECK;
 		}
 	}
 
 	return true;
 }
 
 void CBufferItem::Attach(CSoundData* itemData)
 {
 	if ( m_ALSource == 0 )
 		return;
 
 	AL_CHECK;
 	if (m_SoundData != NULL)
 	{
 		CSoundData::ReleaseSoundData(m_SoundData);
 		m_SoundData = 0;
 	}
 	AL_CHECK;
 	if (itemData != NULL)
 	{
 		m_SoundData = itemData->IncrementCount();
 		alSourceQueueBuffers(m_ALSource, m_SoundData->GetBufferCount(),(const ALuint *) m_SoundData->GetBufferPtr());
 		AL_CHECK;
 	}
 }
 
 void CBufferItem::SetLooping(bool loops)
 {
 	m_Looping = loops;
 }
 
 #endif // CONFIG2_AUDIO
Index: ps/trunk/source/soundmanager/items/CSoundItem.cpp
===================================================================
--- ps/trunk/source/soundmanager/items/CSoundItem.cpp	(revision 24761)
+++ ps/trunk/source/soundmanager/items/CSoundItem.cpp	(revision 24762)
@@ -1,86 +1,86 @@
-/* Copyright (C) 2019 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "CSoundItem.h"
 
 #if CONFIG2_AUDIO
 
 #include "soundmanager/SoundManager.h"
 #include "soundmanager/data/SoundData.h"
 
 #include <mutex>
 
 CSoundItem::CSoundItem()
 {
 	ResetVars();
 }
 
 CSoundItem::CSoundItem(CSoundData* sndData)
 {
 	ResetVars();
 	if (InitOpenAL())
 		Attach(sndData);
 }
 
 CSoundItem::~CSoundItem()
 {
 	Stop();
 	ReleaseOpenAL();
 }
 
 bool CSoundItem::IdleTask()
 {
 	if ( m_ALSource == 0 )
 		return false;
 
 	HandleFade();
 
 	if (m_LastPlay && m_ALSource)
 	{
 		std::lock_guard<std::mutex> lock(m_ItemMutex);
 		int proc_state;
 		alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state);
 		AL_CHECK;
-		m_ShouldBePlaying = (proc_state != AL_STOPPED);
-		return (proc_state != AL_STOPPED);
+		m_ShouldBePlaying = (proc_state != AL_STOPPED && proc_state != AL_INITIAL && proc_state != AL_PAUSED);
+		return m_ShouldBePlaying;
 	}
 	return true;
 }
 
 void CSoundItem::Attach(CSoundData* itemData)
 {
 	if (m_SoundData != NULL)
 	{
 		CSoundData::ReleaseSoundData(m_SoundData);
 		m_SoundData = 0;
 	}
 
 	if (itemData != NULL)
 	{
 		AL_CHECK;
 		alSourcei(m_ALSource, AL_BUFFER, 0);
 		AL_CHECK;
 		m_SoundData = itemData->IncrementCount();
 		alSourcei(m_ALSource, AL_BUFFER, m_SoundData->GetBuffer());
 
 		AL_CHECK;
 	}
 }
 
 #endif // CONFIG2_AUDIO
Index: ps/trunk/source/soundmanager/items/CStreamItem.cpp
===================================================================
--- ps/trunk/source/soundmanager/items/CStreamItem.cpp	(revision 24761)
+++ ps/trunk/source/soundmanager/items/CStreamItem.cpp	(revision 24762)
@@ -1,139 +1,137 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "CStreamItem.h"
 
 #if CONFIG2_AUDIO
 
 #include "soundmanager/SoundManager.h"
 #include "soundmanager/data/OggData.h"
 
 CStreamItem::CStreamItem(CSoundData* sndData)
 {
 	ResetVars();
 	if (InitOpenAL())
 		Attach(sndData);
 }
 
 CStreamItem::~CStreamItem()
 {
 	Stop();
 	ReleaseOpenALStream();
 }
 
 void CStreamItem::ReleaseOpenALStream()
 {
 	if (m_ALSource != 0)
 	{
 		int num_processed;
 		AL_CHECK;
 		alGetSourcei(m_ALSource, AL_BUFFERS_PROCESSED, &num_processed);
 		AL_CHECK;
 
 		if (num_processed > 0)
 		{
 			ALuint* al_buf = new ALuint[num_processed];
 			alSourceUnqueueBuffers(m_ALSource, num_processed, al_buf);
 			AL_CHECK;
 			delete[] al_buf;
 		}
 		alSourcei(m_ALSource, AL_BUFFER, 0);
 		AL_CHECK;
 		((CSoundManager*)g_SoundManager)->ReleaseALSource(m_ALSource);
 		AL_CHECK;
 		m_ALSource = 0;
 	}
 }
 
 bool CStreamItem::IdleTask()
 {
 	AL_CHECK;
 	HandleFade();
 	AL_CHECK;
 
-	if (m_ALSource != 0)
+	if (m_ALSource == 0)
+		return true;
+
+	int proc_state;
+	alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state);
+	AL_CHECK;
+
+	if (proc_state == AL_STOPPED || proc_state == AL_PAUSED)
+		return !m_LastPlay;
+
+	if (m_SoundData == nullptr)
+		return true;
+
+	COggData* theData = (COggData*)m_SoundData;
+
+	if (!theData->IsFileFinished())
 	{
-		int proc_state;
-		alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state);
+		int num_processed;
+		alGetSourcei(m_ALSource, AL_BUFFERS_PROCESSED, &num_processed);
 		AL_CHECK;
 
-		if (proc_state == AL_STOPPED)
-		{
-			if (m_LastPlay)
-				return (proc_state != AL_STOPPED);
-		}
-		else if (m_SoundData != NULL)
+		if (num_processed > 0)
 		{
-			COggData* theData = (COggData*)m_SoundData;
-
-			if (! theData->IsFileFinished())
-			{
-				int num_processed;
-				alGetSourcei(m_ALSource, AL_BUFFERS_PROCESSED, &num_processed);
-				AL_CHECK;
-
-				if (num_processed > 0)
-				{
-					ALuint* al_buf = new ALuint[num_processed];
-					alSourceUnqueueBuffers(m_ALSource, num_processed, al_buf);
-					AL_CHECK;
-					int didWrite = theData->FetchDataIntoBuffer(num_processed, al_buf);
-					alSourceQueueBuffers(m_ALSource, didWrite, al_buf);
-					AL_CHECK;
-					delete[] al_buf;
-				}
-			}
-			else if (GetLooping())
-			{
-				theData->ResetFile();
-			}
-			else
-			{
-				int num_processed;
-				alGetSourcei(m_ALSource, AL_BUFFERS_QUEUED, &num_processed);
-				m_ShouldBePlaying = ( num_processed == 0 );
-			}
+			ALuint* al_buf = new ALuint[num_processed];
+			alSourceUnqueueBuffers(m_ALSource, num_processed, al_buf);
+			AL_CHECK;
+			int didWrite = theData->FetchDataIntoBuffer(num_processed, al_buf);
+			alSourceQueueBuffers(m_ALSource, didWrite, al_buf);
+			AL_CHECK;
+			delete[] al_buf;
 		}
 	}
+	else if (GetLooping())
+	{
+		theData->ResetFile();
+	}
+	else
+	{
+		int num_processed;
+		alGetSourcei(m_ALSource, AL_BUFFERS_QUEUED, &num_processed);
+		m_ShouldBePlaying = ( num_processed == 0 );
+	}
 	AL_CHECK;
 	return true;
 }
 
 void CStreamItem::Attach(CSoundData* itemData)
 {
 	if (m_SoundData != NULL)
 	{
 		CSoundData::ReleaseSoundData(m_SoundData);
 		m_SoundData = 0;
 	}
 
 	if (itemData != NULL)
 	{
 		m_SoundData = itemData->IncrementCount();
 		alSourceQueueBuffers(m_ALSource, m_SoundData->GetBufferCount(), (const ALuint *)m_SoundData->GetBufferPtr());
 		AL_CHECK;
 	}
 }
 
 void CStreamItem::SetLooping(bool loops)
 {
 	m_Looping = loops;
 }
 
 #endif // CONFIG2_AUDIO