mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Videoplayer: only pause previous sounds if there is an audio stream

Browse Source
This commit is contained in:
scrawl 2014-03-26 21:36:57 +01:00
parent 5562c78ac4
commit 23f4bbc5b0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwrender/videoplayer.cpp
View File

@ -994,6 +994,9 @@ void VideoState::init(const std::string& resourceName)
audio_index = i; audio_index = i;
} }
if (audio_index != -1)
MWBase::Environment::get().getSoundManager()->pauseSounds();
this->external_clock_base = av_gettime(); this->external_clock_base = av_gettime();
if(audio_index >= 0) if(audio_index >= 0)
this->stream_open(audio_index, this->format_ctx); this->stream_open(audio_index, this->format_ctx);
@ -1164,8 +1167,6 @@ void VideoPlayer::playVideo(const std::string &resourceName, bool allowSkipping)
} }
mSceneMgr->setSpecialCaseRenderQueueMode(Ogre::SceneManager::SCRQM_EXCLUDE); mSceneMgr->setSpecialCaseRenderQueueMode(Ogre::SceneManager::SCRQM_EXCLUDE);
MWBase::Environment::get().getSoundManager()->pauseSounds();
try { try {
mState = new VideoState; mState = new VideoState;
mState->init(resourceName); mState->init(resourceName);