Merge branch 'master' of https://github.com/GTAmodding/re3

src/audio/oal/stream.cpp

@@ -155,13 +155,13 @@ public:
 	void Seek(uint32 milliseconds)
 	{
 		if ( !IsOpened() ) return;
-		mpg123_seek(m_pMH, ms2samples(milliseconds)*GetSampleSize(), SEEK_SET);
+		mpg123_seek(m_pMH, ms2samples(milliseconds), SEEK_SET);
 	}
 	
 	uint32 Tell()
 	{
 		if ( !IsOpened() ) return 0;
-		return samples2ms(mpg123_tell(m_pMH)/GetSampleSize());
+		return samples2ms(mpg123_tell(m_pMH));
 	}
 	
 	uint32 Decode(void *buffer)
@@ -247,13 +247,13 @@ public:
 	void Seek(uint32 milliseconds)
 	{
 		if ( !IsOpened() ) return;
-		op_pcm_seek(m_FileH, ms2samples(milliseconds) * GetSampleSize());
+		op_pcm_seek(m_FileH, ms2samples(milliseconds) / GetChannels());
 	}
 	
 	uint32 Tell()
 	{
 		if ( !IsOpened() ) return 0;
-		return samples2ms(op_pcm_tell(m_FileH)/GetSampleSize());
+		return samples2ms(op_pcm_tell(m_FileH) * GetChannels());
 	}
 	
 	uint32 Decode(void *buffer)
@@ -461,8 +461,8 @@ uint32 CStream::GetPosMS()
 	alGetSourcei(m_alSource, AL_BYTE_OFFSET, &offset);
 
 	return m_pSoundFile->Tell()
-		- m_pSoundFile->samples2ms(m_pSoundFile->GetBufferSamples() * (NUM_STREAMBUFFERS-1))
+		- m_pSoundFile->samples2ms(m_pSoundFile->GetBufferSamples() * (NUM_STREAMBUFFERS-1)) / m_pSoundFile->GetChannels()
-		+ m_pSoundFile->samples2ms(offset/m_pSoundFile->GetSampleSize());
+		+ m_pSoundFile->samples2ms(offset/m_pSoundFile->GetSampleSize()) / m_pSoundFile->GetChannels();
 }
 
 uint32 CStream::GetLengthMS()

src/audio/oal/stream.h

@@ -24,12 +24,12 @@ public:
 	
 	uint32 ms2samples(uint32 ms)
 	{
-		return float(ms) / 1000.0f * float(GetChannels()) * float(GetSampleRate());
+		return float(ms) / 1000.0f * float(GetSampleRate());
 	}
 	
 	uint32 samples2ms(uint32 sm)
 	{
-		return float(sm) * 1000.0f / float(GetChannels()) / float(GetSampleRate());
+		return float(sm) * 1000.0f / float(GetSampleRate());
 	}
 	
 	uint32 GetBufferSamples()
@@ -108,4 +108,4 @@ public:
 	void ProviderTerm();
 };
 
-#endif
+#endif

src/audio/sampman_oal.cpp

@@ -27,6 +27,7 @@
 #include "MusicManager.h"
 #include "Frontend.h"
 #include "Timer.h"
+#include "crossplatform.h"
 #ifdef AUDIO_OPUS
 #include <opusfile.h>
 #endif
@@ -1423,11 +1424,11 @@ cSampleManager::InitialiseSampleBanks(void)
 {
 	int32 nBank = SFX_BANK_0;
 	
-	fpSampleDescHandle = fopen(SampleBankDescFilename, "rb");
+	fpSampleDescHandle = fcaseopen(SampleBankDescFilename, "rb");
 	if ( fpSampleDescHandle == NULL )
 		return false;
 #ifndef AUDIO_OPUS
-	fpSampleDataHandle = fopen(SampleBankDataFilename, "rb");
+	fpSampleDataHandle = fcaseopen(SampleBankDataFilename, "rb");
 	if ( fpSampleDataHandle == NULL )
 	{
 		fclose(fpSampleDescHandle);

src/core/Streaming.cpp

@@ -2556,12 +2556,17 @@ CStreaming::DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem)
 void
 CStreaming::MakeSpaceFor(int32 size)
 {
-	// BUG: ms_memoryAvailable can be uninitialized
+#ifdef FIX_BUGS
-	// the code still happens to work in that case because ms_memoryAvailable is unsigned
+#define MB (1024 * 1024)
-	// but it's not nice....
+	if(ms_memoryAvailable == 0) {
-
+		extern size_t _dwMemAvailPhys;
+		ms_memoryAvailable = (_dwMemAvailPhys - 10 * MB) / 2;
+		if(ms_memoryAvailable < 50 * MB) ms_memoryAvailable = 50 * MB;
+	}
+#undef MB
+#endif
 	while(ms_memoryUsed >= ms_memoryAvailable - size)
-		if(!RemoveLeastUsedModel()){
+		if(!RemoveLeastUsedModel()) {
 			DeleteRwObjectsBehindCamera(ms_memoryAvailable - size);
 			return;
 		}