diff --git a/.hgignore b/.hgignore
index ca1d897e..e6239bb1 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,22 @@
syntax: glob
*.ncb
*.suo
+Release/
+Debug/
+syntax: regexp
+^MOULOpenSourceClientPlugin/Plasma20/test/
+^MOULOpenSourceClientPlugin/StaticSDKs/
+syntax: glob
+*.ncb
+*.suo
+Release/
+Debug/
+syntax: regexp
+^MOULOpenSourceClientPlugin/Plasma20/test/
+^MOULOpenSourceClientPlugin/StaticSDKs/
+syntax: glob
+*.ncb
+*.suo
*.aps
*.user
*.sdf
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.opensdf b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.opensdf
new file mode 100755
index 00000000..4e4bac72
Binary files /dev/null and b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.opensdf differ
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.sdf b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.sdf
new file mode 100755
index 00000000..a9595f35
Binary files /dev/null and b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.sdf differ
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.sln b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.sln
index c7d7eb2c..7343819d 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.sln
+++ b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.sln
@@ -223,6 +223,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plPythonPack", "..\plPython
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pfMoviePlayer", "..\..\FeatureLib\pfMoviePlayer\pfMoviePlayer.vcxproj", "{90045C91-576B-4639-8C2F-A6B5B70EC6A1}"
+ ProjectSection(ProjectDependencies) = postProject
+ {0FB2CA48-5F85-E7F0-D67D-ACA515650FD8} = {0FB2CA48-5F85-E7F0-D67D-ACA515650FD8}
+ {B2270EDB-6E92-332F-60C8-255E8AF2CFFC} = {B2270EDB-6E92-332F-60C8-255E8AF2CFFC}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.suo b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.suo
new file mode 100755
index 00000000..68b54051
Binary files /dev/null and b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/AllClient/AllClient.suo differ
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj
index 9a218b20..03670c68 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj
@@ -220,10 +220,10 @@
true
- winhttp.lib;ws2_32.lib;strmiids.lib;vfw32.lib;version.lib;Rpcrt4.lib;d3dx9.lib;dinput8.lib;dxerr.lib;dxguid.lib;dsound.lib;OpenAL32.lib;libeay32.lib;NxCharacter.lib;PhysXLoader.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;libspeex.lib;libjpeg.lib;zlib.lib;libpng.lib;NxCooking.lib;%(AdditionalDependencies)
+ winhttp.lib;ws2_32.lib;strmiids.lib;vfw32.lib;version.lib;Rpcrt4.lib;d3dx9.lib;dinput8.lib;dxerr.lib;dxguid.lib;dsound.lib;OpenAL32.lib;libeay32.lib;NxCharacter.lib;PhysXLoader.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opus.lib;vpxmd.lib;libspeex.lib;libjpeg.lib;zlib.lib;libpng.lib;NxCooking.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName)$(TargetExt)
true
- ..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;..\..\..\..\..\StaticSDKs\Win32\opus\opus-1.3.1\win32\VS2015\Win32\Release\opus;D:\Users\richards\Desktop\Minkata-build-VS2010\CWE-ou-minkata\MOULOpenSourceClientPlugin\StaticSDKs\Win32\webm\libvpx_build_win32_vs14;..\..\..\..\..\StaticSDKs\Win32\xiph\lib\Release;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32;..\..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;..\..\..\..\..\StaticSDKs\XPlatform\png\lib;%(AdditionalLibraryDirectories)
+ ..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\win32\libspeex\Release;..\..\..\..\..\StaticSDKs\Win32\opus\opus-1.3.1-build-win32-VS2010\win32\VS2010\Win32\Release;..\..\..\..\..\StaticSDKs\Win32\webm\libvpx_build_win32_vs10\Win32\Release;..\..\..\..\..\StaticSDKs\Win32\xiph\lib\Release;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32;..\..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;..\..\..\..\..\StaticSDKs\XPlatform\png\lib;%(AdditionalLibraryDirectories)
libc.lib;libci.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)
true
false
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj
new file mode 100644
index 00000000..beda2b99
--- /dev/null
+++ b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj
@@ -0,0 +1,205 @@
+
+
+
+
+ Debug_Internal
+ Win32
+
+
+ Debug
+ Win32
+
+
+ Release_Internal
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {B90D0FAD-1D1F-E8AD-F7C6-B86DB0FE49DE}
+ Win32Proj
+
+
+
+
+
+ StaticLibrary
+ false
+ MultiByte
+
+
+ StaticLibrary
+ false
+ MultiByte
+
+
+ StaticLibrary
+ false
+ MultiByte
+ false
+
+
+ StaticLibrary
+ false
+ MultiByte
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+
+
+
+ Full
+ OnlyExplicitInline
+ ../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../SDKs/XPlatform/Cypython-2.3.3/Include;../../../../SDKs/XPlatform/Cypython-2.3.3/PC;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include;../../../../../StaticSDKs/Win32/OpenSSL/include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+
+
+ true
+
+
+ $(IntDir)
+ $(IntDir)
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
+ Level3
+ true
+
+
+ Default
+ true
+ 4800
+ true
+
+
+ $(OutDir)$(TargetName)$(TargetExt)
+ true
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+
+
+ Full
+ OnlyExplicitInline
+ ../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../SDKs/XPlatform/Cypython-2.3.3/Include;../../../../SDKs/XPlatform/Cypython-2.3.3/PC;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include;../../../../../StaticSDKs/Win32/OpenSSL/include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;PLASMA_EXTERNAL_RELEASE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+
+
+ true
+
+
+ $(IntDir)
+ $(IntDir)
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
+ Level3
+ true
+
+
+ Default
+ true
+ 4800
+ true
+
+
+ $(OutDir)$(TargetName)$(TargetExt)
+ true
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+
+
+ Disabled
+ ../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../SDKs/XPlatform/Cypython-2.3.3/Include;../../../../SDKs/XPlatform/Cypython-2.3.3/PC;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include;../../../../../StaticSDKs/Win32/OpenSSL/include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ true
+ .\Debug/pfMoviePlayer.pch
+ $(IntDir)
+ $(IntDir)
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
+ Level3
+ true
+ ProgramDatabase
+ Default
+ 4800
+ true
+
+
+ $(OutDir)$(TargetName)$(TargetExt)
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+
+
+ Disabled
+ ../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../SDKs/XPlatform/Cypython-2.3.3/Include;../../../../SDKs/XPlatform/Cypython-2.3.3/PC;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include;../../../../../StaticSDKs/Win32/OpenSSL/include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;PLASMA_EXTERNAL_RELEASE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ true
+ .\Debug/pfMoviePlayer.pch
+ $(IntDir)
+ $(IntDir)
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
+ Level3
+ true
+ ProgramDatabase
+ Default
+ 4800
+ true
+
+
+ $(OutDir)$(TargetName)$(TargetExt)
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+
+
+
+
+
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj.filters b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj.filters
new file mode 100644
index 00000000..4ebe46b3
--- /dev/null
+++ b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj.filters
@@ -0,0 +1,71 @@
+
+
+
+
+ {2b609579-ab16-4eeb-9048-55e07a30937d}
+ cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
+
+
+ {ef84026e-3348-4ab2-9200-025b196df6fd}
+ h;hpp;hxx;hm;inl
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAudio/plAudio.vcxproj b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAudio/plAudio.vcxproj
index bc862450..5cd89395 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAudio/plAudio.vcxproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAudio/plAudio.vcxproj
@@ -390,6 +390,7 @@
%(PreprocessorDefinitions)
%(PreprocessorDefinitions)
+
Disabled
Disabled
@@ -422,6 +423,7 @@
+
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAudio/plAudio.vcxproj.filters b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAudio/plAudio.vcxproj.filters
index 3022c154..1a726125 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAudio/plAudio.vcxproj.filters
+++ b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAudio/plAudio.vcxproj.filters
@@ -53,6 +53,9 @@
Source Files
+
+ Source Files
+
@@ -100,5 +103,8 @@
Header Files
+
+ Header Files
+
\ No newline at end of file
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
index 4367ad07..ec1f18ee 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
@@ -1510,13 +1510,20 @@ hsBool plClient::StartInit()
fGameGUIMgr->Init();
plgAudioSys::Activate(true);
+
+ // create the listener for the audio system:
+ plListener* pLMod = TRACKED_NEW plListener;
+ pLMod->RegisterAs(kListenerMod_KEY );
- plConst(hsScalar) delay(2.f);
- IPlayIntroMovie("avi/intro1.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
- IPlayIntroMovie("avi/URULiveIntro.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
-
+ plgDispatch::Dispatch()->RegisterForExactType(plEvalMsg::Index(), pLMod->GetKey());
+ plgDispatch::Dispatch()->RegisterForExactType(plAudioSysMsg::Index(), pLMod->GetKey());
plgDispatch::Dispatch()->RegisterForExactType(plMovieMsg::Index(), GetKey());
+ plConst(hsScalar) delay(2.f);
+ IPlayIntroMovie("avi/intro1.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
+ IPlayIntroMovie("avi/EventIntro.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
+ IPlayIntroMovie("avi/URULiveIntro.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
+
//
// Init Net before loading things
//
@@ -1545,13 +1552,6 @@ hsBool plClient::StartInit()
plMouseDevice::Instance()->SetDisplayResolution((float)fPipeline->Width(), (float)fPipeline->Height());
plInputManager::SetRecenterMouse(false);
- // create the listener for the audio system:
- plListener* pLMod = TRACKED_NEW plListener;
- pLMod->RegisterAs(kListenerMod_KEY );
-
- plgDispatch::Dispatch()->RegisterForExactType(plEvalMsg::Index(), pLMod->GetKey());
- plgDispatch::Dispatch()->RegisterForExactType(plAudioSysMsg::Index(), pLMod->GetKey());
-
plSynchedObject::PushSynchDisabled(false); // enable dirty tracking
if (StrCmp(NetCommGetStartupAge()->ageDatasetName, "StartUp") == 0)
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
index e528719b..e092abee 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
@@ -245,8 +245,10 @@ bool plMoviePlayer::ILoadAudio()
{
#ifdef PLASMA_USE_WEBM
// Fetch audio track information
- if (!fAudioTrack.get())
+ if (!fAudioTrack.get()) {
+ hsStatusMessage("Movie ILoadAudio fAudioTrack NIL\n");
return false;
+ }
const mkvparser::AudioTrack* audio = static_cast(fAudioTrack->GetTrack());
plWAVHeader header;
header.fFormatTag = plWAVHeader::kPCMFormatTag;
@@ -346,6 +348,7 @@ bool plMoviePlayer::Start()
if (!IOpenMovie())
return false;
hsAssert(fVideoTrack, "nil video track -- expect bad things to happen!");
+ hsStatusMessageF("Opened movie %s\n", fMoviePath);
// Initialize VPX
const mkvparser::VideoTrack* video = static_cast(fVideoTrack->GetTrack());
@@ -353,19 +356,26 @@ bool plMoviePlayer::Start()
plStatusLog::AddLineS("movie.log", "%s: Not a VP9 video track!", fMoviePath);
return false;
}
+ hsStatusMessageF("... movie track selected, codec: %s\n", video->GetCodecId());
+
if (VPX* vpx = VPX::Create())
fVpx.reset(vpx);
else
return false;
// Decode the audio track and load it into a sound buffer
- if (!ILoadAudio())
+ if (!ILoadAudio()) {
+ hsStatusMessage("... movie audio track load failed\n");
return false;
+ }
+ hsStatusMessage("... movie audio track buffered\n");
+
fLastFrameTime = static_cast(hsTimer::GetMilliSeconds());
fAudioSound->Play();
fPlaying = true;
+ hsStatusMessage("... plMoviePlayer::Start() returns\n");
return true;
#else
return false;