Version 1.0.1 git commit

ErikMcClure · Jun 11, 2014 · 84d36b8 · 84d36b8
1 parent 5fe27fa
commit 84d36b8
Show file tree

Hide file tree

Showing 241 changed files with 27,869 additions and 27,702 deletions.
diff --git a/TinyOAL.sln b/TinyOAL.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30110.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TinyOAL", "TinyOAL\TinyOAL.vcxproj", "{0894447C-C38C-4119-84E4-695144584082}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02OggFile", "examples\02OggFile\02OggFile.vcxproj", "{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}"
@@ -26,128 +28,86 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "00Testbed", "examples\00Tes
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0894447C-C38C-4119-84E4-695144584082}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0894447C-C38C-4119-84E4-695144584082}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{0894447C-C38C-4119-84E4-695144584082}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0894447C-C38C-4119-84E4-695144584082}.Debug|Win32.Build.0 = Debug|Win32
 		{0894447C-C38C-4119-84E4-695144584082}.Debug|x64.ActiveCfg = Debug|x64
 		{0894447C-C38C-4119-84E4-695144584082}.Debug|x64.Build.0 = Debug|x64
-		{0894447C-C38C-4119-84E4-695144584082}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0894447C-C38C-4119-84E4-695144584082}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{0894447C-C38C-4119-84E4-695144584082}.Release|Win32.ActiveCfg = Release|Win32
 		{0894447C-C38C-4119-84E4-695144584082}.Release|Win32.Build.0 = Release|Win32
 		{0894447C-C38C-4119-84E4-695144584082}.Release|x64.ActiveCfg = Release|x64
 		{0894447C-C38C-4119-84E4-695144584082}.Release|x64.Build.0 = Release|x64
-		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Debug|Win32.Build.0 = Debug|Win32
 		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Debug|x64.ActiveCfg = Debug|x64
 		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Debug|x64.Build.0 = Debug|x64
-		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Release|Win32.ActiveCfg = Release|Win32
 		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Release|Win32.Build.0 = Release|Win32
 		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Release|x64.ActiveCfg = Release|x64
 		{BE37B60D-A4A5-4C98-8A4C-FD313C8FFFE2}.Release|x64.Build.0 = Release|x64
-		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Debug|Win32.Build.0 = Debug|Win32
 		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Debug|x64.ActiveCfg = Debug|x64
 		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Debug|x64.Build.0 = Debug|x64
-		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Release|Win32.ActiveCfg = Release|Win32
 		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Release|Win32.Build.0 = Release|Win32
 		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Release|x64.ActiveCfg = Release|x64
 		{2DC8A03F-1C93-43C8-AD0A-DED48922A864}.Release|x64.Build.0 = Release|x64
-		{565E11A9-7842-4028-9E12-D0390277D19C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{565E11A9-7842-4028-9E12-D0390277D19C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{565E11A9-7842-4028-9E12-D0390277D19C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{565E11A9-7842-4028-9E12-D0390277D19C}.Debug|Win32.Build.0 = Debug|Win32
 		{565E11A9-7842-4028-9E12-D0390277D19C}.Debug|x64.ActiveCfg = Debug|x64
 		{565E11A9-7842-4028-9E12-D0390277D19C}.Debug|x64.Build.0 = Debug|x64
-		{565E11A9-7842-4028-9E12-D0390277D19C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{565E11A9-7842-4028-9E12-D0390277D19C}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{565E11A9-7842-4028-9E12-D0390277D19C}.Release|Win32.ActiveCfg = Release|Win32
 		{565E11A9-7842-4028-9E12-D0390277D19C}.Release|Win32.Build.0 = Release|Win32
 		{565E11A9-7842-4028-9E12-D0390277D19C}.Release|x64.ActiveCfg = Release|x64
 		{565E11A9-7842-4028-9E12-D0390277D19C}.Release|x64.Build.0 = Release|x64
-		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Debug|Win32.Build.0 = Debug|Win32
 		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Debug|x64.ActiveCfg = Debug|x64
 		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Debug|x64.Build.0 = Debug|x64
-		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Release|Win32.ActiveCfg = Release|Win32
 		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Release|Win32.Build.0 = Release|Win32
 		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Release|x64.ActiveCfg = Release|x64
 		{D1EFDE3F-3336-494F-9732-47A0F84BE22F}.Release|x64.Build.0 = Release|x64
-		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Debug|Win32.Build.0 = Debug|Win32
 		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Debug|x64.ActiveCfg = Debug|x64
 		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Debug|x64.Build.0 = Debug|x64
-		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Release|Win32.ActiveCfg = Release|Win32
 		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Release|Win32.Build.0 = Release|Win32
 		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Release|x64.ActiveCfg = Release|x64
 		{A1F7C22D-9491-4614-8EDB-609784C8EC5F}.Release|x64.Build.0 = Release|x64
-		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Debug|Win32.Build.0 = Debug|Win32
 		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Debug|x64.ActiveCfg = Debug|x64
 		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Debug|x64.Build.0 = Debug|x64
-		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Release|Win32.ActiveCfg = Release|Win32
 		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Release|Win32.Build.0 = Release|Win32
 		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Release|x64.ActiveCfg = Release|x64
 		{EC996101-E15D-4744-BCD3-2370A0BDD21A}.Release|x64.Build.0 = Release|x64
-		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|Win32.Build.0 = Debug|Any CPU
-		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|x64.Build.0 = Debug|Any CPU
-		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|Win32.ActiveCfg = Debug|x86
+		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|Win32.Build.0 = Debug|x86
+		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|x64.ActiveCfg = Debug|x64
+		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Debug|x64.Build.0 = Debug|x64
 		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Release|Win32.ActiveCfg = Release|Any CPU
 		{15D93BEF-2F4E-4CAB-92B0-373E70072681}.Release|x64.ActiveCfg = Release|Any CPU
-		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Debug|Win32.Build.0 = Debug|Win32
 		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Debug|x64.ActiveCfg = Debug|x64
 		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Debug|x64.Build.0 = Debug|x64
-		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Release|Win32.ActiveCfg = Release|Win32
 		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Release|Win32.Build.0 = Release|Win32
 		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Release|x64.ActiveCfg = Release|x64
 		{6AA96158-470B-4EF2-B397-A7BB1F98783C}.Release|x64.Build.0 = Release|x64
-		{09F48454-B32E-42E5-8000-ACD70237B72A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{09F48454-B32E-42E5-8000-ACD70237B72A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{09F48454-B32E-42E5-8000-ACD70237B72A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{09F48454-B32E-42E5-8000-ACD70237B72A}.Debug|Win32.Build.0 = Debug|Win32
 		{09F48454-B32E-42E5-8000-ACD70237B72A}.Debug|x64.ActiveCfg = Debug|x64
 		{09F48454-B32E-42E5-8000-ACD70237B72A}.Debug|x64.Build.0 = Debug|x64
-		{09F48454-B32E-42E5-8000-ACD70237B72A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{09F48454-B32E-42E5-8000-ACD70237B72A}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{09F48454-B32E-42E5-8000-ACD70237B72A}.Release|Win32.ActiveCfg = Release|Win32
 		{09F48454-B32E-42E5-8000-ACD70237B72A}.Release|Win32.Build.0 = Release|Win32
 		{09F48454-B32E-42E5-8000-ACD70237B72A}.Release|x64.ActiveCfg = Release|x64

diff --git a/TinyOAL/LoadOAL.cpp b/TinyOAL/LoadOAL.cpp
@@ -29,7 +29,7 @@
 void* g_hOpenALDLL = NULL;
 
 #ifdef BSS_PLATFORM_WIN32
-#include "bss_util/bss_win32_includes.h"
+#include "bss-util/bss_win32_includes.h"
 
 #ifdef BSS_CPU_x86
 #define DEFAULT_OAL_DLLPATH "soft_oal.dll"

diff --git a/TinyOAL/TinyOAL.rc b/TinyOAL/TinyOAL.rc
diff --git a/TinyOAL/cAudio.cpp b/TinyOAL/cAudio.cpp
@@ -1,4 +1,4 @@
-// Copyright ©2013 Black Sphere Studios
+// Copyright ©2014 Black Sphere Studios
 // This file is part of TinyOAL - An OpenAL Audio engine
 // For conditions of distribution and use, see copyright notice in TinyOAL.h
 
@@ -171,7 +171,7 @@ void cAudio::Pause()
 bool cAudio::SkipSeconds(double seconds)
 {
   if(!_source) return false;
-  return Skip(_source->ToSample(seconds));
+  return Skip(_source->ToSamples(seconds));
 }
 bool cAudio::Skip(unsigned __int64 sample)
 {
@@ -202,7 +202,7 @@ unsigned __int64 cAudio::IsWhere() const
 void cAudio::SetLoopPointSeconds(double seconds)
 {
   if(_source!=0)
-    _looptime = _source->ToSample(seconds);
+    _looptime = _source->ToSamples(seconds);
 }
 
 void cAudio::SetLoopPoint(unsigned __int64 samples)

diff --git a/TinyOAL/cAudioResource.cpp b/TinyOAL/cAudioResource.cpp
@@ -1,4 +1,4 @@
-// Copyright ©2013 Black Sphere Studios
+// Copyright ©2014 Black Sphere Studios
 // This file is part of TinyOAL - An OpenAL Audio engine
 // For conditions of distribution and use, see copyright notice in TinyOAL.h
 
@@ -9,13 +9,13 @@
 #include "cTinyOAL.h"
 
 using namespace TinyOAL;
-bss_util::cKhash_StringIns<cAudioResource*> cAudioResource::_audiohash;
+bss_util::cHash<const char*, cAudioResource*, true, true> cAudioResource::_audiohash;
 bss_util::cFixedAlloc<cAudio> cAudioResource::_allocaudio(5);
 
 cAudioResource::cAudioResource(const cAudioResource& copy) { assert(false); }
 cAudioResource::cAudioResource(void* data, unsigned int len, TINYOAL_FLAG flags, unsigned __int64 loop) : _data(data), _datalength(len),
   _flags(flags), _loop(loop), _freq(0), _channels(0), _format(0), _bufsize(0), _activelist(0), _activelistend(0), _numactive(0),
-  _inactivelist(0), _maxactive(0)
+  _inactivelist(0), _maxactive(0), _total(0)
 {
   bss_util::LLAdd<cAudioResource>(this,cTinyOAL::Instance()->_reslist);
 }