Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/sound/audio_decoder_mp3.cpp

@@ -92,7 +92,10 @@ CAudioDecoderMP3::CAudioDecoderMP3(NLMISC::IStream *stream, bool loop)
 
 CAudioDecoderMP3::~CAudioDecoderMP3()
 {
-	drmp3_uninit(&_Decoder);
+	if (_IsSupported)
+	{
+		drmp3_uninit(&_Decoder);
+	}
 }
 
 bool CAudioDecoderMP3::isFormatSupported() const

code/nel/src/sound/complex_source.cpp

@@ -704,7 +704,9 @@ void CComplexSource::checkup()
 	for (; first != last; ++first)
 	{
 		USource *source = *first;
-		if (source != NULL && source->getSound()->getLooping() && !source->isPlaying())
+		if (source == NULL)
+			continue;
+		if (source->getSound()->getLooping() && !source->isPlaying())
 			source->play();
 		if (source->getSound()->getSoundType() != CSound::SOUND_SIMPLE)
 			static_cast<CSourceCommon*>(source)->checkup();

code/nel/src/sound/driver/openal/source_al.cpp

@@ -121,6 +121,11 @@ void CSourceAL::setStreaming(bool streaming)
 	alTestError();
 	_Buffer = NULL;
 	_IsStreaming = streaming;
+	if (_IsStreaming)
+	{
+		// make sure looping is disabled on OpenAL side
+		setLooping(false);
+	}
 }
 
 /* Set the buffer that will be played (no streaming)
@@ -194,6 +199,10 @@ uint CSourceAL::countStreamingBuffers() const
 	// a bit ugly here, but makes a much easier/simpler implementation on both drivers
 	ALint buffersProcessed;
 	alGetSourcei(_Source, AL_BUFFERS_PROCESSED, &buffersProcessed);
+	if (buffersProcessed && _QueuedBuffers.empty())
+	{
+		nlwarning("AL: QueuedBuffers is empty, but OpenAL buffers processed > 0");
+	}
 	while (buffersProcessed && !_QueuedBuffers.empty())
 	{
 		ALuint bufferName = _QueuedBuffers.front()->bufferName();

code/nel/src/sound/sample_bank_manager.cpp

@@ -82,13 +82,14 @@ void CSampleBankManager::init(NLGEORGES::UFormElm *mixerConfig)
 					TFilteredBank fb;
 					std::string	bankName;
 					NLGEORGES::UFormElm	*realBank = NULL;
-					realBank->getArrayNode(&realBank, j);
+					realBanks->getArrayNode(&realBank, j);
-
+					if (realBank != 0)
-					realBank->getValueByName(bankName, ".SampleBank");
+					{
-					fb.BankName = CStringMapper::map(bankName);
+						realBank->getValueByName(bankName, ".SampleBank");
-					realBank->getValueByName(fb.Filter, ".Filter");
+						fb.BankName = CStringMapper::map(bankName);
-
+						realBank->getValueByName(fb.Filter, ".Filter");
-					vfb.push_back(fb);
+						vfb.push_back(fb);
+					}
 				}
 			}
 

code/nel/src/sound/stream_source.cpp

@@ -92,7 +92,7 @@ void CStreamSource::releasePhysicalSource()
 		// free the track
 		pSource->stop();
 		pSource->setStreaming(false);
-		mixer->freeTrack(m_Track);
+		if (mixer) mixer->freeTrack(m_Track);
 		m_Track = NULL;
 	}
 }