Browse Source

Change appearance of UruLiveIntro (Yeesha) movie to post-avatar setup

Also small whitespace cleanup
rarified/movieplayer
rarified 4 years ago
parent
commit
14e3118aaa
  1. 6
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
  2. 3
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
  3. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32VideoSound.cpp

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp

@ -870,6 +870,9 @@ hsBool plClient::MsgReceive(plMessage* msg)
//============================================================================
hsBool plClient::IHandleMovieMsg(plMovieMsg* mov)
{
if (mov != nullptr)
hsStatusMessageF("MovieMsg received 0x%x", mov->GetCmd());
if( !(mov->GetFileName() && *mov->GetFileName()) )
return true;
@ -1517,6 +1520,8 @@ hsBool plClient::StartInit()
plgDispatch::Dispatch()->RegisterForExactType(plEvalMsg::Index(), pLMod->GetKey());
plgDispatch::Dispatch()->RegisterForExactType(plAudioSysMsg::Index(), pLMod->GetKey());
// Init the movie player handler
plgDispatch::Dispatch()->RegisterForExactType(plMovieMsg::Index(), GetKey());
//
@ -1549,7 +1554,6 @@ hsBool plClient::StartInit()
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);
plSynchedObject::PushSynchDisabled(false); // enable dirty tracking

3
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp

@ -349,6 +349,7 @@ bool plMoviePlayer::Start()
if (!IOpenMovie())
return false;
hsAssert(fVideoTrack.get(), "nil video track -- expect bad things to happen!");
plStatusLog::AddLineS("movie.log", "%s: Start movie playback", fMoviePath);
hsStatusMessageF("Opened movie %s\n", fMoviePath);
// Initialize VPX
@ -376,7 +377,7 @@ bool plMoviePlayer::Start()
fAudioSound->Play();
fPlaying = true;
hsStatusMessage("... plMoviePlayer::Start() returns\n");
hsStatusMessage("... movie start success\n");
return true;
#else
return false;

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32VideoSound.cpp

@ -59,7 +59,7 @@ plWin32VideoSound::plWin32VideoSound(const plWAVHeader& header) : plWin32Sound()
uniqueID++;
char keyName[32];
StrPrintf(keyName, arrsize(keyName), "VoiceSound_%d", uniqueID);
StrPrintf(keyName, arrsize(keyName), "VideoSound_%d", uniqueID);
hsgResMgr::ResMgr()->NewKey(keyName, this, plLocation::kGlobalFixedLoc);
}

Loading…
Cancel
Save