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

apps/openmw/mwrender/videoplayer.cpp

@@ -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");

apps/openmw/mwsound/audiere_decoder.hpp

@@ -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);

apps/openmw/mwsound/mpgsnd_decoder.hpp

@@ -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);

apps/openmw/mwsound/openal_output.hpp

@@ -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
 }