OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 12:19:10 +00:00
Code Releases Activity

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

Browse Source 
Also small whitespace cleanup
This commit is contained in:
rarified
2020-08-11 21:21:03 -06:00
parent f7bc877285
commit 14e3118aaa
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
View File

@ -177,7 +177,7 @@ plMoviePlayer::plMoviePlayer()
fPosition(hsPoint2()),
fPlaying(false),
fPaused(false),
fMoviePath(nullptr)
fMoviePath(nullptr)
{
fScale.Set(1.0f, 1.0f);
}
@ -193,7 +193,7 @@ plMoviePlayer::~plMoviePlayer()
delete fReader;
}
#endif
delete[] fMoviePath;
delete[] fMoviePath;
}
bool plMoviePlayer::IOpenMovie()
@ -247,9 +247,9 @@ bool plMoviePlayer::ILoadAudio()
#ifdef PLASMA_USE_WEBM
// Fetch audio track information
if (!fAudioTrack.get()) {
hsStatusMessage("Movie ILoadAudio fAudioTrack NIL\n");
hsStatusMessage("Movie ILoadAudio fAudioTrack NIL\n");
return false;
}
}
const mkvparser::AudioTrack* audio = static_cast<const mkvparser::AudioTrack*>(fAudioTrack->GetTrack());
plWAVHeader header;
header.fFormatTag = plWAVHeader::kPCMFormatTag;
@ -312,9 +312,9 @@ void plMoviePlayer::IProcessVideoFrame(const std::vector<blkbuf_t>& frames)
vpx_image_t* img = nullptr;
// We have to decode all the frames, but we only want to display the most recent one to the user.
for (std::vector<blkbuf_t>::const_iterator frame = frames.begin(); frame != frames.end(); frame++) {
for (std::vector<blkbuf_t>::const_iterator frame = frames.begin(); frame != frames.end(); frame++) {
const std::auto_ptr<UInt8>& buf = frame->first;
UInt32 size = static_cast<UInt32>(frame->second);
UInt32 size = static_cast<UInt32>(frame->second);
img = fVpx->Decode(buf.get(), size);
}
@ -329,7 +329,7 @@ void plMoviePlayer::IProcessVideoFrame(const std::vector<blkbuf_t>& frames)
break;
default:
hsAssert(false, "image format");
hsAssert(false, "image format");
}
// Flush new data to the device
@ -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
@ -365,8 +366,8 @@ bool plMoviePlayer::Start()
return false;
// Decode the audio track and load it into a sound buffer
if (!ILoadAudio()) {
hsStatusMessage("... movie audio track load failed\n");
if (!ILoadAudio()) {
hsStatusMessage("... movie audio track load failed\n");
return false;
}
hsStatusMessage("... movie audio track buffered\n");
@ -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;

8
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.h
View File

@ -103,10 +103,10 @@ public:
const char *GetFileName() const { return fMoviePath; }
void SetFileName(const char* filename)
{
delete[] fMoviePath;
fMoviePath = hsStrcpy(filename);
}
{
delete[] fMoviePath;
fMoviePath = hsStrcpy(filename);
}
void SetColor(const hsColorRGBA& c) { }
const hsColorRGBA GetColor() const { return hsColorRGBA(); }