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

Remove some unused sound manager fields and constructor parameters

Browse source
This commit is contained in:
Chris Robinson 2012-03-24 00:22:54 -07:00
parent 1ccddefe28
commit fa70a72b75
3 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/engine.cpp
View file

@ -333,10 +333,7 @@ void OMW::Engine::go()
mExtensions, mFpsLevel, mNewGame, mOgre, mCfgMgr.getLogPath().string() + std::string("/")); mExtensions, mFpsLevel, mNewGame, mOgre, mCfgMgr.getLogPath().string() + std::string("/"));
// Create sound system // Create sound system
mEnvironment.mSoundManager = new MWSound::SoundManager(mOgre->getRoot(), mEnvironment.mSoundManager = new MWSound::SoundManager(mUseSound, mEnvironment);
mOgre->getCamera(),
mDataDirs,
mUseSound, mFSStrict, mEnvironment);
// Create script system // Create script system
mScriptContext = new MWScript::CompilerContext (MWScript::CompilerContext::Type_Full, mScriptContext = new MWScript::CompilerContext (MWScript::CompilerContext::Type_Full,

12
apps/openmw/mwsound/soundmanager.cpp
View file

@ -38,10 +38,8 @@
namespace MWSound namespace MWSound
{ {
SoundManager::SoundManager(Ogre::Root *root, Ogre::Camera *camera, SoundManager::SoundManager(bool useSound, MWWorld::Environment& environment)
const Files::PathContainer& dataDirs, : mResourceMgr(Ogre::ResourceGroupManager::getSingleton())
bool useSound, bool fsstrict, MWWorld::Environment& environment)
: mFSStrict(fsstrict)
, mEnvironment(environment) , mEnvironment(environment)
{ {
if(!useSound) if(!useSound)
@ -67,8 +65,6 @@ namespace MWSound
mOutput.reset(); mOutput.reset();
return; return;
} }
mResourceMgr = Ogre::ResourceGroupManager::getSingletonPtr();
} }
SoundManager::~SoundManager() SoundManager::~SoundManager()
@ -161,8 +157,8 @@ namespace MWSound
void SoundManager::startRandomTitle() void SoundManager::startRandomTitle()
{ {
Ogre::StringVectorPtr filelist; Ogre::StringVectorPtr filelist;
filelist = mResourceMgr->findResourceNames(Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, filelist = mResourceMgr.findResourceNames(Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
"Music/"+mCurrentPlaylist+"/*"); "Music/"+mCurrentPlaylist+"/*");
if(!filelist->size()) if(!filelist->size())
return; return;

12
apps/openmw/mwsound/soundmanager.hpp
View file

@ -31,13 +31,7 @@ namespace MWSound
class SoundManager class SoundManager
{ {
Ogre::ResourceGroupManager *mResourceMgr; Ogre::ResourceGroupManager& mResourceMgr;
// This is used for case insensitive and slash-type agnostic file
// finding. It takes DOS paths (any case, \\ slashes or / slashes)
// relative to the sound dir, and translates them into full paths
// of existing files in the filesystem, if they exist.
bool mFSStrict;
MWWorld::Environment& mEnvironment; MWWorld::Environment& mEnvironment;
@ -64,9 +58,7 @@ namespace MWSound
friend class OpenAL_Output; friend class OpenAL_Output;
public: public:
SoundManager(Ogre::Root*, Ogre::Camera*, SoundManager(bool useSound, MWWorld::Environment& environment);
const Files::PathContainer& dataDir, bool useSound, bool fsstrict,
MWWorld::Environment& environment);
~SoundManager(); ~SoundManager();
void stopMusic(); void stopMusic();