1 files changed, 48 insertions, 81 deletions

diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index d546acf2..6c25cf79 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -39,6 +39,7 @@
 #ifdef MULTITHREADED_AUDIO
 #include <mutex>
 #include <queue>
+#include <condition_variable>
 #endif
 #include "oal/stream.h"
 
@@ -521,14 +522,10 @@ _FindMP3s(void)
 						continue;
 					}
 				}
-				aStream[0] = new CStream(filepath, ALStreamSources[0], ALStreamBuffers[0]);
-
-				if (aStream[0] && aStream[0]->IsOpened())
+				if (aStream[0] && aStream[0]->Open(filepath))
 				{
 					total_ms = aStream[0]->GetLengthMS();
 					aStream[0]->Close();
-					aStream[0] = NULL;
-
 					OutputDebugString(fd.cFileName);
 
 					_pMP3List = new tMP3Entry;
@@ -579,13 +576,10 @@ _FindMP3s(void)
 				else
 					bShortcut = FALSE;
 				
-				aStream[0] = new CStream(filepath, ALStreamSources[0], ALStreamBuffers[0]);
-
-				if (aStream[0] && aStream[0]->IsOpened())
+				if (aStream[0] && aStream[0]->Open(filepath))
 				{
 					total_ms = aStream[0]->GetLengthMS();
 					aStream[0]->Close();
-					aStream[0] = NULL;
 
 					pList->pNext = new tMP3Entry;
 					
@@ -739,6 +733,9 @@ cSampleManager::Initialise(void)
 
 	EFXInit();
 
+	for(int i = 0; i < MAX_STREAMS; i++)
+		aStream[i] = new CStream(ALStreamSources[i], ALStreamBuffers[i]);
+
 	CStream::Initialise();
 
 	{
@@ -892,14 +889,12 @@ cSampleManager::Initialise(void)
 		debug("Cannot load audio cache\n");
 #endif
 
-		for(int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++) {
-			aStream[0] = new CStream(StreamedNameTable[i], ALStreamSources[0], ALStreamBuffers[0], IsThisTrackAt16KHz(i) ? 16000 : 32000);
-
-			if(aStream[0] && aStream[0]->IsOpened()) {
+		for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
+		{	
+			if ( aStream[0] && aStream[0]->Open(StreamedNameTable[i], IsThisTrackAt16KHz(i) ? 16000 : 32000) )
+			{
 				uint32 tatalms = aStream[0]->GetLengthMS();
 				aStream[0]->Close();
-				aStream[0] = NULL;
-
 				nStreamLength[i] = tatalms;
 			} else
 				USERERROR("Can't open '%s'\n", StreamedNameTable[i]);
@@ -941,7 +936,8 @@ cSampleManager::Initialise(void)
 	{
 		for ( int32 i = 0; i < MAX_STREAMS; i++ )
 		{
-			aStream[i]       = NULL;
+			aStream[i]->Close();
+
 			nStreamVolume[i] = 100;
 			nStreamPan[i]    = 63;
 		}
@@ -1028,15 +1024,8 @@ void
 cSampleManager::Terminate(void)
 {
 	for (int32 i = 0; i < MAX_STREAMS; i++)
-	{
-		CStream *stream = aStream[i];
-		if (stream)
-		{
-			stream->Close();
-			aStream[i] = NULL;
-		}
-	}
-	
+		aStream[i]->Close();
+
 	for ( int32 i = 0; i < NUM_CHANNELS; i++ )
 		aChannel[i].Term();
 	
@@ -1086,6 +1075,9 @@ cSampleManager::Terminate(void)
 
 	CStream::Terminate();
 
+	for(int32 i = 0; i < MAX_STREAMS; i++)
+		delete aStream[i];
+
 	if ( nSampleBankMemoryStartAddress[SFX_BANK_0] != 0 )
 	{
 		free((void *)nSampleBankMemoryStartAddress[SFX_BANK_0]);
@@ -1612,22 +1604,16 @@ cSampleManager::PreloadStreamedFile(uint8 nFile, uint8 nStream)
 
 	if ( nFile < TOTAL_STREAMED_SOUNDS )
 	{
-		if ( aStream[nStream] )
-		{
-			aStream[nStream]->Close();
-			aStream[nStream] = NULL;
-		}
-		
+		CStream *stream = aStream[nStream];
+
+		stream->Close();
+
 		strcpy(filename, StreamedNameTable[nFile]);
 		
-		CStream *stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
-		ASSERT(stream != NULL);
-		
-		aStream[nStream] = stream;
+		stream->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 		if ( !stream->Setup() )
 		{
 			stream->Close();
-			aStream[nStream] = NULL;
 		}
 	}
 }
@@ -1639,7 +1625,7 @@ cSampleManager::PauseStream(bool8 nPauseFlag, uint8 nStream)
 	
 	CStream *stream = aStream[nStream];
 	
-	if ( stream )
+	if ( stream->IsOpened() )
 	{
 		stream->SetPause(nPauseFlag != FALSE);
 	}
@@ -1652,12 +1638,9 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream)
 	
 	CStream *stream = aStream[nStream];
 	
-	if ( stream )
+	if ( stream->IsOpened() )
 	{
-		if ( stream->IsOpened() )
-		{
-			stream->Start();
-		}
+		stream->Start();
 	}
 }
 
@@ -1671,11 +1654,8 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 	if ( nFile >= TOTAL_STREAMED_SOUNDS )
 		return FALSE;
 
-	if ( aStream[nStream] )
-	{
-		aStream[nStream]->Close();
-		aStream[nStream] = NULL;
-	}
+	aStream[nStream]->Close();
+
 	if ( nFile == STREAMED_SOUND_RADIO_MP3_PLAYER )
 	{
 		do
@@ -1691,12 +1671,10 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 				if(!_GetMP3PosFromStreamPos(&position, &e) && !e) {
 					nFile = 0;
 					strcpy(filename, StreamedNameTable[nFile]);
-					
-					CStream* stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 
-					aStream[nStream] = stream;
-
-					if (stream->Setup()) {
+					CStream *stream = aStream[nStream];
+					stream->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+					if ( stream->Setup() ) {
 						if (position != 0)
 							stream->SetPosMS(position);
 
@@ -1705,18 +1683,17 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 						return TRUE;
 					} else {
 						stream->Close();
-						aStream[nStream] = NULL;
 					}
 					return FALSE;
 
 				} else {
-					if ( e->pLinkPath != NULL )
-						aStream[nStream] = new CStream(e->pLinkPath, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+					if (e->pLinkPath != NULL)
+						aStream[nStream]->Open(e->pLinkPath, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 					else {
 						strcpy(filename, _mp3DirectoryPath);
 						strcat(filename, e->aFilename);
-					
-						aStream[nStream] = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream]);
+
+						aStream[nStream]->Open(filename);
 					}
 					
 					if (aStream[nStream]->Setup()) {
@@ -1729,7 +1706,6 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 						return TRUE;
 					} else {
 						aStream[nStream]->Close();
-						aStream[nStream] = NULL;
 					}
 					// fall through, start playing from another song
 				}
@@ -1748,9 +1724,8 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 						_bIsMp3Active = 0;
 						strcpy(filename, StreamedNameTable[nFile]);
 
-						CStream* stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
-
-						aStream[nStream] = stream;
+						CStream* stream = aStream[nStream];
+						stream->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 
 						if (stream->Setup()) {
 							if (position != 0)
@@ -1761,18 +1736,16 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 							return TRUE;
 						} else {
 							stream->Close();
-							aStream[nStream] = NULL;
 						}
 						return FALSE;
 					}
 				}
-				if(mp3->pLinkPath != NULL)
-					aStream[nStream] = new CStream(mp3->pLinkPath, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+				if (mp3->pLinkPath != NULL)
+					aStream[nStream]->Open(mp3->pLinkPath, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 				else {
 					strcpy(filename, _mp3DirectoryPath);
 					strcat(filename, mp3->aFilename);
-
-					aStream[nStream] = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream]);
+					aStream[nStream]->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 				}
 
 				if (aStream[nStream]->Setup()) {
@@ -1783,7 +1756,6 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 					return TRUE;
 				} else {
 					aStream[nStream]->Close();
-					aStream[nStream] = NULL;
 				}
 
 			}
@@ -1795,9 +1767,9 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 	}
 	strcpy(filename, StreamedNameTable[nFile]);
 	
-	CStream *stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+	CStream *stream = aStream[nStream];
 
-	aStream[nStream] = stream;
+	aStream[nStream]->Open(filename, IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 	
 	if ( stream->Setup() ) {
 		if (position != 0)
@@ -1808,7 +1780,6 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 		return TRUE;
 	} else {
 		stream->Close();
-		aStream[nStream] = NULL;
 	}
 	return FALSE;
 }
@@ -1820,14 +1791,10 @@ cSampleManager::StopStreamedFile(uint8 nStream)
 
 	CStream *stream = aStream[nStream];
 	
-	if ( stream )
-	{
-		stream->Close();
-		aStream[nStream] = NULL;
+	stream->Close();
 
-		if ( nStream == 0 )
-			_bIsMp3Active = FALSE;
-	}
+	if ( nStream == 0 )
+		_bIsMp3Active = FALSE;
 }
 
 int32
@@ -1837,7 +1804,7 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
 	
 	CStream *stream = aStream[nStream];
 	
-	if ( stream )
+	if ( stream->IsOpened() )
 	{
 		if ( _bIsMp3Active )
 		{
@@ -1875,7 +1842,7 @@ cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffect
 	
 	CStream *stream = aStream[nStream];
 	
-	if ( stream )
+	if ( stream->IsOpened() )
 	{
 		if ( nEffectFlag )
 			stream->SetVolume(m_nEffectsFadeVolume*nVolume*m_nEffectsVolume >> 14);
@@ -1901,7 +1868,7 @@ cSampleManager::IsStreamPlaying(uint8 nStream)
 	
 	CStream *stream = aStream[nStream];
 	
-	if ( stream )
+	if ( stream->IsOpened() )
 	{
 		if ( stream->IsPlaying() )
 			return TRUE;
@@ -1917,7 +1884,7 @@ cSampleManager::Service(void)
 	{
 		CStream *stream = aStream[i];
 		
-		if ( stream )
+		if ( stream->IsOpened() )
 			stream->Update();
 	}
 	int refCount = CChannel::channelsThatNeedService;