Fixed: Make build_soundbank tool work with latest changes

--HG--
branch : sound_dev

code/nel/src/sound/audio_mixer_user.cpp

@@ -468,7 +468,7 @@ void CAudioMixerUser::initDevice(const std::string &deviceName, const CInitInfo
 			nlwarning("AM: OptionSoftwareBuffer not available, forceSoftwareBuffer = false");
 			forceSoftware = false; // not really needed, but set anyway in case this is still used later in this function
 		}
-		if (manualRolloff && !_SoundDriver->getOption(ISoundDriver::OptionLocalBufferCopy))
+		if (manualRolloff && !_SoundDriver->getOption(ISoundDriver::OptionManualRolloff))
 		{
 			nlwarning("AM: OptionManualRolloff not available, manualRolloff = false");
 			manualRolloff = false; // not really needed, but set anyway in case this is still used later in this function
@@ -971,10 +971,14 @@ void CAudioMixerUser::buildSampleBankList()
 /// Build the sound bank packed sheets file from georges sound sheet files with .sound extension in the search path, and return the path to the written file.
 std::string UAudioMixer::buildSoundBank(const std::string &packedSheetDir)
 {
+	CGroupControllerRoot *tempRoot = NULL;
+	if (!CGroupControllerRoot::isInitialized())
+		tempRoot = new CGroupControllerRoot();
 	std::string dir = CPath::standardizePath(packedSheetDir, true);
 	CSoundBank *soundBank = new CSoundBank();
 	soundBank->load(dir, true);
 	delete soundBank;
+	delete tempRoot;
 	return dir + "sounds.packed_sheets";
 }
 

code/nel/src/sound/group_controller_root.cpp

@@ -43,7 +43,7 @@ using namespace std;
 
 namespace NLSOUND {
 
-CGroupControllerRoot::CGroupControllerRoot() : CGroupController(NULL)
+CGroupControllerRoot::CGroupControllerRoot() : CGroupController(NULL), NLMISC::CManualSingleton<CGroupControllerRoot>()
 {
 	
 }

code/nel/src/sound/sound.cpp

@@ -136,15 +136,15 @@ void	CSound::serial(NLMISC::IStream &s)
 
 	_Name.serialString(s, "sound");
 
-	nlassert(CGroupControllerRoot::getInstance()); // not sure
+	nlassert(CGroupControllerRoot::isInitialized()); // not sure
 #if NLSOUND_SHEET_VERSION_BUILT < 2
-	if (s.isReading()) _GroupController = static_cast<CGroupController *>(CAudioMixerUser::instance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER));
+	if (s.isReading()) _GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER);
 #else
 	if (s.isReading())
 	{
 		std::string groupControllerPath;
 		s.serial(groupControllerPath);
-		_GroupController = static_cast<CGroupController *>(CAudioMixerUser::instance()->getGroupController(groupControllerPath));
+		_GroupController = CGroupControllerRoot::getInstance()->getGroupController(groupControllerPath);
 	}
 	else
 	{
@@ -245,7 +245,7 @@ void				CSound::importForm(const std::string& filename, NLGEORGES::UFormElm& roo
 		_Priority = MidPri;
 	}
 
-	nlassert(CGroupControllerRoot::getInstance()); // not sure
+	nlassert(CGroupControllerRoot::isInitialized()); // not sure
 #if NLSOUND_SHEET_VERSION_BUILT < 2
 	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER);
 #else

code/nel/src/sound/sound_bank.cpp

@@ -124,6 +124,7 @@ CSoundBank::~CSoundBank()
 void CSoundBank::addSound(CSound *sound)
 {
 	// nlassert(_Sounds.size() > sound->getName().getShortId());
+	// nldebug("SOUNDBANK: Add %s", sound->getName().toString().c_str());
 	if (_Sounds.size() <= sound->getName().getShortId())
 		_Sounds.resize(sound->getName().getShortId() + 1);
 	_Sounds[sound->getName().getShortId()] = sound;

code/nel/tools/sound/build_soundbank/build_soundbank.cpp

@@ -29,6 +29,7 @@
 #include <nel/misc/log.h>
 #include <nel/misc/path.h>
 #include <nel/sound/u_audio_mixer.h>
+#include <nel/misc/sheet_id.h>
 
 // Project includes
 // ...
@@ -75,6 +76,9 @@ int main(int nNbArg, char **ppArgs)
 	// add search paths
 	CPath::addSearchPath(leveldesignDir, true, false);
 	CPath::addSearchPath(dfnDir, true, false);
+	
+	// init sheet_id.bin
+	NLMISC::CSheetId::init(false);
 
 	// build the sound bank
 	UAudioMixer::buildSoundBank(exportDir);