teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback

Browse source
This commit is contained in:
scrawl 2013-01-07 13:20:50 +01:00
commit c2b75e28e9
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwrender/videoplayer.cpp
View file

@ -1020,7 +1020,8 @@ VideoPlayer::VideoPlayer(Ogre::SceneManager* sceneMgr)
mVideoMaterial->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false);
mVideoMaterial->getTechnique(0)->getPass(0)->setLightingEnabled(false);
mVideoMaterial->getTechnique(0)->getPass(0)->createTextureUnitState();
}
mVideoMaterial->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureAddressingMode(Ogre::TextureUnitState::TAM_CLAMP);
}
mVideoMaterial->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName("black.png");
Ogre::MaterialPtr blackMaterial = Ogre::MaterialManager::getSingleton().getByName("BlackBarsMaterial", "General");

1
apps/openmw/mwsound/audiere_decoder.hpp
View file

@ -21,6 +21,7 @@ namespace MWSound
virtual void open(const std::string &fname);
virtual void close();
virtual std::string getName();
virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
virtual size_t read(char *buffer, size_t bytes);

1
apps/openmw/mwsound/mpgsnd_decoder.hpp
View file

@ -34,6 +34,7 @@ namespace MWSound
virtual void open(const std::string &fname);
virtual void close();
virtual std::string getName();
virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
virtual size_t read(char *buffer, size_t bytes);

2
apps/openmw/mwsound/openal_output.hpp
View file

@ -70,7 +70,7 @@ namespace MWSound
friend class SoundManager;
};
#ifndef DEFAULT_OUTPUT
#define DEFAULT_OUTPUT (::MWSound::OpenAL_Output)
#define DEFAULT_OUTPUT(x) ::MWSound::OpenAL_Output((x))
#endif
}