From f3c0a81b0b54b17b9bd0b213860fecd25ea42815 Mon Sep 17 00:00:00 2001 From: rarified Date: Wed, 12 Aug 2020 16:28:42 -0600 Subject: [PATCH] VS2003: changes for older compiler - nullptr not defined, use nil - remove unused VCXPROJ with wrong name plMoviePlayer - std::begin, std::end not defined, conditionally include code for plLocalization::GetLanguageCodes() on _MSC_VER >= 1800 - add PLASMA_USE_WEBM to appropriate VS projects - fix library references to opus, vpx and speex --- .hgignore | 32 +-- .../Plasma/Apps/plClient/plClient.vcxproj | 12 +- .../pfMoviePlayer/pfMoviePlayer.vcxproj | 4 +- .../pfMoviePlayer/plMoviePlayer.vcxproj | 205 ------------------ .../plMoviePlayer.vcxproj.filters | 71 ------ .../Sources/Plasma/Apps/plClient/plClient.cpp | 2 +- .../pfMoviePlayer/plMoviePlayer.cpp | 26 +-- .../FeatureLib/pfMoviePlayer/plMoviePlayer.h | 2 +- .../Plasma/PubUtilLib/plAudio/plWin32Sound.h | 2 +- 9 files changed, 32 insertions(+), 324 deletions(-) delete mode 100644 MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj delete mode 100644 MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj.filters diff --git a/.hgignore b/.hgignore index e6239bb1..a257be46 100644 --- a/.hgignore +++ b/.hgignore @@ -1,34 +1,18 @@ 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 +*.ncb *.opensdf *.pyc -Release*/ -Debug*/ -ipch/ +*.sdf +*.suo +*.user syntax: regexp +Debug*/ +Release*/ +^MOULOpenSourceClientPlugin/Plasma20/Doxy/ ^MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/external/render/ ^MOULOpenSourceClientPlugin/Plasma20/test/ ^MOULOpenSourceClientPlugin/Plasma20/tools/ -^MOULOpenSourceClientPlugin/Plasma20/Doxy/ ^MOULOpenSourceClientPlugin/StaticSDKs/ ^patch/ +ipch/ diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj index e2c3a621..f09565af 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj +++ b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj @@ -88,7 +88,7 @@ Disabled ../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;../../../../SDKs/XPlatform/Cypython-2.3.3/Include;../../../../SDKs/XPlatform/Cypython-2.3.3/PC;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static;../../../../../StaticSDKs/Win32/DX9.0c/include;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include;../../../../../StaticSDKs/Win32/OpenSSL/include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;PLASMA_USE_WEBM;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -143,7 +143,7 @@ Disabled ../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;../../../../SDKs/XPlatform/Cypython-2.3.3/Include;../../../../SDKs/XPlatform/Cypython-2.3.3/PC;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static;../../../../../StaticSDKs/Win32/DX9.0c/include;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include;../../../../../StaticSDKs/Win32/OpenSSL/include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;PLASMA_EXTERNAL_RELEASE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;PLASMA_USE_WEBM;PLASMA_EXTERNAL_RELEASE;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -258,7 +258,7 @@ Full OnlyExplicitInline ../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;../../../../SDKs/XPlatform/Cypython-2.3.3/Include;../../../../SDKs/XPlatform/Cypython-2.3.3/PC;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static;../../../../../StaticSDKs/Win32/DX9.0c/include;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include;../../../../../StaticSDKs/Win32/OpenSSL/include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;PLASMA_EXTERNAL_RELEASE;PLASMA_USE_WEBM;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;PLASMA_EXTERNAL_RELEASE;PLASMA_USE_WEBM;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -280,10 +280,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;vpxmd.lib;opus.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.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\opus\opus-1.3.1-build-win32-vs2010\win32\VS2010\Win32\Release;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\win32\libspeex\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 @@ -798,4 +798,4 @@ - \ No newline at end of file + diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/pfMoviePlayer.vcxproj b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/pfMoviePlayer.vcxproj index 38b645f8..958296a7 100755 --- a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/pfMoviePlayer.vcxproj +++ b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/pfMoviePlayer.vcxproj @@ -126,7 +126,7 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;PLASMA_EXTERNAL_RELEASE;PLASMA_USE_WEBM;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;NDEBUG;PLASMA_EXTERNAL_RELEASE;PLASMA_USE_WEBM;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) ../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include;../../../../../StaticSDKs/Win32/opus/opus-1.3.1/include;../../../../../StaticSDKs/Win32/webm/libvpx;%(AdditionalIncludeDirectories) true false @@ -161,4 +161,4 @@ - \ No newline at end of file + diff --git a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj b/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj deleted file mode 100644 index beda2b99..00000000 --- a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - 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 deleted file mode 100644 index 4ebe46b3..00000000 --- a/MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {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/Sources/Plasma/Apps/plClient/plClient.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp index 27ca0df6..30e7c751 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp @@ -870,7 +870,7 @@ hsBool plClient::MsgReceive(plMessage* msg) //============================================================================ hsBool plClient::IHandleMovieMsg(plMovieMsg* mov) { - if (mov != nullptr) + if (mov != nil) hsStatusMessageF("MovieMsg received 0x%x", mov->GetCmd()); if( !(mov->GetFileName() && *mov->GetFileName()) ) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp index fbcb6fcf..38ecaea4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp @@ -98,23 +98,23 @@ public: static VPX* Create() { VPX* instance = new VPX; - if (vpx_codec_dec_init(&instance->codec, iface, nullptr, 0)) { + if (vpx_codec_dec_init(&instance->codec, iface, nil, 0)) { hsAssert(false, vpx_codec_error_detail(&instance->codec)); delete instance; - return nullptr; + return nil; } return instance; } vpx_image_t* Decode(UInt8* buf, UInt32 size) { - if (vpx_codec_decode(&codec, buf, size, nullptr, 0) != VPX_CODEC_OK) { + if (vpx_codec_decode(&codec, buf, size, nil, 0) != VPX_CODEC_OK) { const char* detail = vpx_codec_error_detail(&codec); hsAssert(false, detail ? detail : "unspecified decode error"); - return nullptr; + return nil; } - vpx_codec_iter_t iter = nullptr; + vpx_codec_iter_t iter = nil; // ASSUMPTION: only one image per frame // if this proves false, move decoder function into IProcessVideoFrame return vpx_codec_get_frame(&codec, &iter); @@ -132,7 +132,7 @@ protected: Int32 fStatus; public: - TrackMgr(const mkvparser::Track* track) : fTrack(track), fCurrentBlock(nullptr), fStatus(0) { } + TrackMgr(const mkvparser::Track* track) : fTrack(track), fCurrentBlock(nil), fStatus(0) { } const mkvparser::Track* GetTrack() { return fTrack; } @@ -169,15 +169,15 @@ public: // ===================================================== plMoviePlayer::plMoviePlayer() - : fPlate(nullptr), - fTexture(nullptr), - fReader(nullptr), + : fPlate(nil), + fTexture(nil), + fReader(nil), fMovieTime(0), fLastFrameTime(0), fPosition(hsPoint2()), fPlaying(false), fPaused(false), - fMoviePath(nullptr) + fMoviePath(nil) { fScale.Set(1.0f, 1.0f); } @@ -309,7 +309,7 @@ bool plMoviePlayer::ICheckLanguage(const mkvparser::Track* track) void plMoviePlayer::IProcessVideoFrame(const std::vector& frames) { #ifdef PLASMA_USE_WEBM - vpx_image_t* img = nullptr; + vpx_image_t* img = nil; // We have to decode all the frames, but we only want to display the most recent one to the user. for (std::vector::const_iterator frame = frames.begin(); frame != frames.end(); frame++) { @@ -417,7 +417,7 @@ bool plMoviePlayer::NextFrame() fMovieTime += frameTimeDelta; std::vector video; - if (fVideoTrack.get() == nullptr || !fVideoTrack->GetFrames(fReader, fMovieTime * 1000000, video)) { + if (fVideoTrack.get() == nil || !fVideoTrack->GetFrames(fReader, fMovieTime * 1000000, video)) { Stop(); return false; } @@ -452,7 +452,7 @@ bool plMoviePlayer::Pause(bool on) bool plMoviePlayer::Stop() { fPlaying = false; - if (fAudioSound.get() != nullptr) + if (fAudioSound.get() != nil) fAudioSound->Stop(); if (fPlate) fPlate->SetVisible(false); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.h index 8455f276..31d04dd3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.h @@ -99,7 +99,7 @@ public: void AddCallback(plMessage* msg) { hsRefCnt_SafeRef(msg); fCallbacks.push_back(msg); } UInt32 GetNumCallbacks() const { return 0; } - plMessage* GetCallback(int i) const { return nullptr; } + plMessage* GetCallback(int i) const { return nil; } const char *GetFileName() const { return fMoviePath; } void SetFileName(const char* filename) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.h index 06eea513..75126750 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.h @@ -111,7 +111,7 @@ protected: hsTArray fSoundEvents; - virtual void ISetActualVolume(const float v); + virtual void ISetActualVolume(float v); virtual void IActuallyStop( void ); virtual hsBool IActuallyPlaying( void ) { return fReallyPlaying; } virtual void IActuallyPlay( void );