Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Revert unused change from TStringId to CSheetId for sounds

Browse Source
feature/opengl3
kaetemi 5 years ago
parent a24c758d95
commit 67bba962d7
49 changed files with 230 additions and 261 deletions
Show Stats Download Patch File Download Diff File

7
code/nel/include/nel/3d/ps_sound.h
Unescape Escape View File

@ -21,7 +21,6 @@
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/3d/ps_located.h" #include "nel/3d/ps_located.h"
#include "nel/3d/ps_attrib.h" #include "nel/3d/ps_attrib.h"
#include "nel/misc/sheet_id.h"
@ -64,13 +63,13 @@ public:
virtual void step(TPSProcessPass pass); virtual void step(TPSProcessPass pass);
/// set the name of the sound /// set the name of the sound
void setSoundName(const NLMISC::CSheetId &soundName) void setSoundName(const NLMISC::TStringId &soundName)
{ {
_SoundName = soundName; _SoundName = soundName;
} }
/// get the name of the sound /// get the name of the sound
const NLMISC::CSheetId &getSoundName(void) const const NLMISC::TStringId &getSoundName(void) const
{ {
return _SoundName; return _SoundName;
} }
@ -162,7 +161,7 @@ protected:
void removeAllSources(); void removeAllSources();
CPSAttrib<UPSSoundInstance *> _Sounds; CPSAttrib<UPSSoundInstance *> _Sounds;
NLMISC::CSheetId _SoundName; NLMISC::TStringId _SoundName;
float _Gain; float _Gain;
CPSAttribMaker<float> * _GainScheme; CPSAttribMaker<float> * _GainScheme;
float _Pitch; float _Pitch;

2
code/nel/include/nel/3d/u_ps_sound_impl.h
Unescape Escape View File

@ -162,7 +162,7 @@ public:
/// inherited from IPSSoundServer /// inherited from IPSSoundServer
UPSSoundInstance *createSound(const NLMISC::CSheetId &soundName, bool spawned = true) UPSSoundInstance *createSound(const NLMISC::TStringId &soundName, bool spawned = true)
{ {
if (!_AudioMixer) if (!_AudioMixer)
return NULL; return NULL;

3
code/nel/include/nel/3d/u_ps_sound_interface.h
Unescape Escape View File

@ -19,7 +19,6 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/misc/sheet_id.h"
#include <string> #include <string>
namespace NLMISC namespace NLMISC
@ -51,7 +50,7 @@ struct UPSSoundServer
* \param spawn true if the sound must be spawned e.g it continues after this interface is removed * \param spawn true if the sound must be spawned e.g it continues after this interface is removed
* \param cb useful only for spawned sound, it tells when a spawned sound has been removed * \param cb useful only for spawned sound, it tells when a spawned sound has been removed
*/ */
virtual UPSSoundInstance *createSound(const NLMISC::CSheetId &soundName, bool spawn = false) = 0; virtual UPSSoundInstance *createSound(const NLMISC::TStringId &soundName, bool spawn = false) = 0;
}; };

9
code/nel/include/nel/sound/audio_mixer_user.h
Unescape Escape View File

@ -25,7 +25,6 @@
#include <nel/misc/time_nl.h> #include <nel/misc/time_nl.h>
#include <nel/misc/stream.h> #include <nel/misc/stream.h>
#include <nel/misc/singleton.h> #include <nel/misc/singleton.h>
#include <nel/misc/sheet_id.h>
#include <nel/sound/u_audio_mixer.h> #include <nel/sound/u_audio_mixer.h>
#include <nel/georges/u_form.h> #include <nel/georges/u_form.h>
@ -181,7 +180,7 @@ public:
// Load environment sounds ; treeRoot can be null if you don't want an access to the envsounds // Load environment sounds ; treeRoot can be null if you don't want an access to the envsounds
// virtual void loadEnvSounds( const char *filename, UEnvSound **treeRoot=NULL ); // virtual void loadEnvSounds( const char *filename, UEnvSound **treeRoot=NULL );
/// Get a TSoundId from a name (returns NULL if not found) /// Get a TSoundId from a name (returns NULL if not found)
virtual TSoundId getSoundId( const NLMISC::CSheetId &name ); virtual TSoundId getSoundId( const NLMISC::TStringId &name );
/// Gets the group controller for the given group tree path with separator '/', if it doesn't exist yet it will be created. /// Gets the group controller for the given group tree path with separator '/', if it doesn't exist yet it will be created.
/// Examples: "music", "effects", "dialog", "music/background", "music/loading", "music/player", etcetera /// Examples: "music", "effects", "dialog", "music/background", "music/loading", "music/player", etcetera
@ -193,7 +192,7 @@ public:
* pass a callback function that will be called (if not NULL) just before deleting the spawned * pass a callback function that will be called (if not NULL) just before deleting the spawned
* source. * source.
*/ */
virtual USource *createSource( const NLMISC::CSheetId &name, bool spawn=false, TSpawnEndCallback cb=NULL, void *cbUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL); virtual USource *createSource( const NLMISC::TStringId &name, bool spawn=false, TSpawnEndCallback cb=NULL, void *cbUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL);
/// Add a logical sound source (by sound id). To remove a source, just delete it. See createSource(const char*) /// Add a logical sound source (by sound id). To remove a source, just delete it. See createSource(const char*)
virtual USource *createSource( TSoundId id, bool spawn=false, TSpawnEndCallback cb=NULL, void *cbUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL); virtual USource *createSource( TSoundId id, bool spawn=false, TSpawnEndCallback cb=NULL, void *cbUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL);
/// Add a source which was created by an EnvSound /// Add a source which was created by an EnvSound
@ -224,7 +223,7 @@ public:
/// Return the names of the sounds (call this method after loadSounds()) /// Return the names of the sounds (call this method after loadSounds())
virtual void getSoundNames( std::vector<NLMISC::CSheetId> &names ) const; virtual void getSoundNames( std::vector<NLMISC::TStringId> &names ) const;
/// Return the number of mixing tracks (voices) /// Return the number of mixing tracks (voices)
virtual uint getPolyphony() const { return (uint)_Tracks.size(); } virtual uint getPolyphony() const { return (uint)_Tracks.size(); }
/// Return the number of sources instance. /// Return the number of sources instance.
@ -445,7 +444,7 @@ private:
/// Witch parameter to control /// Witch parameter to control
TControledParamId ParamId; TControledParamId ParamId;
/// The controled sounds names. /// The controled sounds names.
std::vector<NLMISC::CSheetId> SoundNames; std::vector<NLMISC::TStringId> SoundNames;
/// Current parameter value /// Current parameter value
float Value; float Value;
/// All the sources controled by this variable /// All the sources controled by this variable

14
code/nel/include/nel/sound/background_sound.h
Unescape Escape View File

@ -64,12 +64,22 @@ public:
/// Associtation clas for storage of sound / filter. /// Associtation clas for storage of sound / filter.
struct TSoundInfo struct TSoundInfo
{ {
NLMISC::CSheetId SoundName; NLMISC::TStringId SoundName;
UAudioMixer::TBackgroundFlags Filter; UAudioMixer::TBackgroundFlags Filter;
void serial(NLMISC::IStream &s) void serial(NLMISC::IStream &s)
{ {
SoundName.serialString(s, "sound"); std::string soundName;
if (s.isReading())
{
s.serial(soundName);
SoundName = NLMISC::CStringMapper::map(soundName);
}
else
{
soundName = NLMISC::CStringMapper::unmap(SoundName);
s.serial(soundName);
}
s.serial(Filter); s.serial(Filter);
} }
}; };

2
code/nel/include/nel/sound/background_sound_manager.h
Unescape Escape View File

@ -229,7 +229,7 @@ private:
struct TSoundData struct TSoundData
{ {
/// The name of the sound. /// The name of the sound.
NLMISC::CSheetId SoundName; NLMISC::TStringId SoundName;
/// The reference to the sound. /// The reference to the sound.
CSound *Sound; CSound *Sound;
/// A source instance of the sound (may be NULL). /// A source instance of the sound (may be NULL).

5
code/nel/include/nel/sound/clustered_sound.h
Unescape Escape View File

@ -19,7 +19,6 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/misc/sheet_id.h"
#include <vector> #include <vector>
#include <map> #include <map>
@ -254,9 +253,9 @@ private:
/// The current cluster playing source indexed with sound group id /// The current cluster playing source indexed with sound group id
TClusterSoundCont _Sources; TClusterSoundCont _Sources;
typedef CHashMap<NLMISC::TStringId, NLMISC::CSheetId, NLMISC::CStringIdHashMapTraits> TStringSheetMap; typedef CHashMap<NLMISC::TStringId, NLMISC::TStringId, NLMISC::CStringIdHashMapTraits> TStringStringMap;
/// The sound_group to sound assoc /// The sound_group to sound assoc
TStringSheetMap _SoundGroupToSound; TStringStringMap _SoundGroupToSound;
}; };
} // NLSOUND } // NLSOUND

6
code/nel/include/nel/sound/complex_sound.h
Unescape Escape View File

@ -52,8 +52,8 @@ public:
const std::vector<uint32> &getSoundSeq() const { return _SoundSeq;} const std::vector<uint32> &getSoundSeq() const { return _SoundSeq;}
const std::vector<uint32> &getDelaySeq() const { return _DelaySeq;} const std::vector<uint32> &getDelaySeq() const { return _DelaySeq;}
NLMISC::CSheetId getSound(uint index) const { return !_Sounds.empty() ? _Sounds[index%_Sounds.size()]:NLMISC::CSheetId::Unknown;} NLMISC::TStringId getSound(uint index) const { return !_Sounds.empty() ? _Sounds[index%_Sounds.size()]:0;}
const std::vector<NLMISC::CSheetId> &getSounds() const { return _Sounds;} const std::vector<NLMISC::TStringId> &getSounds() const { return _Sounds;}
uint32 getFadeLength() const { return _XFadeLength;} uint32 getFadeLength() const { return _XFadeLength;}
@ -87,7 +87,7 @@ private:
virtual float getMaxDistance() const; virtual float getMaxDistance() const;
TPATTERN_MODE _PatternMode; TPATTERN_MODE _PatternMode;
std::vector<NLMISC::CSheetId> _Sounds; std::vector<NLMISC::TStringId> _Sounds;
float _TicksPerSeconds; float _TicksPerSeconds;
std::vector<uint32> _SoundSeq; std::vector<uint32> _SoundSeq;
/// Sequence of delay in millisec. /// Sequence of delay in millisec.

16
code/nel/include/nel/sound/context_sound.h
Unescape Escape View File

@ -144,7 +144,7 @@ class CContextSoundContainer : public IContextSoundContainer
virtual void addSound(CSound *sound, const std::string &baseName) virtual void addSound(CSound *sound, const std::string &baseName)
{ {
const std::string &patternName = sound->getName().toString(); /*NLMISC::CStringMapper::unmap(sound->getName())*/; const std::string &patternName = NLMISC::CStringMapper::unmap(sound->getName());
nlassert(patternName.size() >= baseName.size()); nlassert(patternName.size() >= baseName.size());
std::string arg; std::string arg;
@ -183,7 +183,7 @@ class CContextSoundContainer : public IContextSoundContainer
if (i != NbJoker) if (i != NbJoker)
return; return;
nlassertex(i==NbJoker, ("Error while adding sound '%s' into context sound container", sound->getName().toString().c_str()/*NLMISC::CStringMapper::unmap(sound->getName()).c_str()*/)); nlassertex(i==NbJoker, ("Error while adding sound '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str()));
sint randomValue = 0; sint randomValue = 0;
if (UseRandom) if (UseRandom)
@ -198,7 +198,7 @@ class CContextSoundContainer : public IContextSoundContainer
} }
else if (!arg.empty()) else if (!arg.empty())
{ {
nlassertex (!ok, ("Error while adding sound '%s' into context sound container", sound->getName().toString().c_str()/*NLMISC::CStringMapper::unmap(sound->getName()).c_str()*/)); nlassertex (!ok, ("Error while adding sound '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str()));
// end of the argument. // end of the argument.
NLMISC::fromString(arg, randomValue); NLMISC::fromString(arg, randomValue);
arg.clear(); arg.clear();
@ -210,13 +210,13 @@ class CContextSoundContainer : public IContextSoundContainer
// read the potential last arg. // read the potential last arg.
if (!arg.empty()) if (!arg.empty())
{ {
nlassertex (!ok, ("Error while adding sound '%s' into context sound container", sound->getName().toString().c_str()/*NLMISC::CStringMapper::unmap(sound->getName()).c_str()*/)); nlassertex (!ok, ("Error while adding sound '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str()));
// end of the argument. // end of the argument.
NLMISC::fromString(arg, randomValue); NLMISC::fromString(arg, randomValue);
arg.clear(); arg.clear();
ok = true; ok = true;
} }
nlassertex (ok, ("Error while adding sound '%s' into context sound container", sound->getName().toString().c_str()/*NLMISC::CStringMapper::unmap(sound->getName()).c_str()*/)); nlassertex (ok, ("Error while adding sound '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str()));
} }
else else
@ -232,9 +232,9 @@ class CContextSoundContainer : public IContextSoundContainer
if (!ret.second) if (!ret.second)
{ {
typename THashContextSound::iterator it = _ContextSounds.find(cm); typename THashContextSound::iterator it = _ContextSounds.find(cm);
nlassertex(it != _ContextSounds.end(), ("Error wile adding soudn '%s' into context sound container", sound->getName().toString().c_str()/*NLMISC::CStringMapper::unmap(sound->getName()).c_str()*/)); nlassertex(it != _ContextSounds.end(), ("Error wile adding soudn '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str()));
nlwarning("Sound %s has the same context matcher as the sound %s", sound->getName().toString().c_str()/*NLMISC::CStringMapper::unmap(sound->getName()).c_str()*/, it->second->getName().toString().c_str() /*NLMISC::CStringMapper::unmap(it->second->getName()).c_str()*/); nlwarning("Sound %s has the same context matcher as the sound %s", NLMISC::CStringMapper::unmap(sound->getName()).c_str(), NLMISC::CStringMapper::unmap(it->second->getName()).c_str());
} }
} }
@ -260,7 +260,7 @@ class CContextSoundContainer : public IContextSoundContainer
typename THashContextSound::const_iterator first(_ContextSounds.begin()), last(_ContextSounds.end()); typename THashContextSound::const_iterator first(_ContextSounds.begin()), last(_ContextSounds.end());
for (; first != last; ++first) for (; first != last; ++first)
{ {
subsounds.push_back(std::make_pair(first->second->getName().toString()/*NLMISC::CStringMapper::unmap(first->second->getName())*/, first->second)); subsounds.push_back(std::make_pair(NLMISC::CStringMapper::unmap(first->second->getName()), first->second));
} }
} }

12
code/nel/include/nel/sound/sound.h
Unescape Escape View File

@ -22,7 +22,6 @@
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/sound/u_source.h" #include "nel/sound/u_source.h"
#include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_elm.h"
#include "nel/misc/sheet_id.h"
#include <string> #include <string>
namespace NLSOUND { namespace NLSOUND {
@ -36,7 +35,7 @@ class CGroupController;
/// Sound names hash map /// Sound names hash map
//typedef std::hash_map<std::string, CSound*> TSoundMap; //typedef std::hash_map<std::string, CSound*> TSoundMap;
typedef CHashMap<NLMISC::CSheetId, CSound*, NLMISC::CStringIdHashMapTraits> TSoundMap; typedef CHashMap<NLMISC::TStringId, CSound*, NLMISC::CStringIdHashMapTraits> TSoundMap;
/// Sound names set (for ambiant sounds) /// Sound names set (for ambiant sounds)
typedef std::set<CSound*> TSoundSet; typedef std::set<CSound*> TSoundSet;
@ -54,7 +53,7 @@ class CSound
friend class CAudioMixerUser; friend class CAudioMixerUser;
public: public:
/// Factory for specialized sound. /// Factory for specialized sound.
static CSound *createSound(const std::string &name, NLGEORGES::UFormElm& formRoot); static CSound *createSound(const std::string &filename, NLGEORGES::UFormElm& formRoot);
enum TSOUND_TYPE enum TSOUND_TYPE
{ {
@ -100,7 +99,7 @@ public:
/// Return the length of the sound in ms /// Return the length of the sound in ms
virtual uint32 getDuration() = 0; virtual uint32 getDuration() = 0;
/// Return the name (must be unique) /// Return the name (must be unique)
const NLMISC::CSheetId& getName() const { return _Name; } const NLMISC::TStringId& getName() const { return _Name; }
/// Return the min distance (if detailed()) (default 1.0f if not implemented by sound type) /// Return the min distance (if detailed()) (default 1.0f if not implemented by sound type)
virtual float getMinDistance() const { return _MinDist; } virtual float getMinDistance() const { return _MinDist; }
@ -122,8 +121,7 @@ public:
bool operator<( const CSound& otherSound ) const bool operator<( const CSound& otherSound ) const
{ {
//return NLMISC::CStringMapper::unmap(_Name) < NLMISC::CStringMapper::unmap(otherSound._Name); return NLMISC::CStringMapper::unmap(_Name) < NLMISC::CStringMapper::unmap(otherSound._Name);
return _Name.toString() < otherSound._Name.toString();
} }
protected: protected:
@ -144,7 +142,7 @@ protected:
float _MaxDist; float _MaxDist;
// Sound name. // Sound name.
NLMISC::CSheetId _Name; NLMISC::TStringId _Name;
/// An optional user var controler. /// An optional user var controler.
NLMISC::TStringId _UserVarControler; NLMISC::TStringId _UserVarControler;

9
code/nel/include/nel/sound/sound_anim_marker.h
Unescape Escape View File

@ -20,7 +20,6 @@
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/3d/cluster.h" #include "nel/3d/cluster.h"
#include "nel/sound/u_source.h" #include "nel/sound/u_source.h"
#include "nel/misc/sheet_id.h"
namespace NLMISC namespace NLMISC
@ -32,7 +31,7 @@ namespace NLMISC
namespace NLSOUND { namespace NLSOUND {
typedef std::set<NLMISC::CSheetId> TMarkerSoundSet; typedef std::set<NLMISC::TStringId> TMarkerSoundSet;
class UAudioMixer; class UAudioMixer;
@ -51,13 +50,13 @@ public:
virtual float getTime() const { return _Time; } virtual float getTime() const { return _Time; }
/** Add a new sound in the set of to-be-played sounds for this marker */ /** Add a new sound in the set of to-be-played sounds for this marker */
virtual void addSound(const NLMISC::CSheetId &soundName); virtual void addSound(const NLMISC::TStringId &soundName);
/** Remove a sound */ /** Remove a sound */
virtual void removeSound(const NLMISC::CSheetId &soundName); virtual void removeSound(const NLMISC::TStringId &soundName);
/** Return the set of sounds of this marker */ /** Return the set of sounds of this marker */
virtual void getSounds(std::vector<NLMISC::CSheetId> &sounds); virtual void getSounds(std::vector<NLMISC::TStringId> &sounds);
/** Play all the sounds of this marker */ /** Play all the sounds of this marker */
virtual void play(UAudioMixer* mixer, NL3D::CCluster *cluster, CSoundContext &context); virtual void play(UAudioMixer* mixer, NL3D::CCluster *cluster, CSoundContext &context);

10
code/nel/include/nel/sound/sound_bank.h
Unescape Escape View File

@ -20,7 +20,6 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/sound/audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include "nel/misc/sheet_id.h"
#include <string> #include <string>
namespace NLSOUND { namespace NLSOUND {
@ -68,16 +67,16 @@ public:
bool isLoaded(); bool isLoaded();
/// Return a sound corresponding to a name. /// Return a sound corresponding to a name.
CSound *getSound(const NLMISC::CSheetId &sheetId); CSound *getSound(const NLMISC::TStringId &name);
/// Return the names of the sounds /// Return the names of the sounds
void getNames( std::vector<NLMISC::CSheetId> &sheetIds ); void getNames( std::vector<NLMISC::TStringId> &names );
/// Return the number of sounds in this bank. /// Return the number of sounds in this bank.
uint countSounds(); uint countSounds();
void addSound(CSound *sound); void addSound(CSound *sound);
void removeSound(const NLMISC::CSheetId &sheetId); void removeSound(const NLMISC::TStringId &name);
private: private:
@ -89,8 +88,7 @@ private:
typedef CHashMap<NLMISC::TStringId, TSimpleSoundContainer, NLMISC::CStringIdHashMapTraits> TBufferAssocContainer; typedef CHashMap<NLMISC::TStringId, TSimpleSoundContainer, NLMISC::CStringIdHashMapTraits> TBufferAssocContainer;
/// Sound names hash map /// Sound names hash map
// typedef std::hash_map<std::string, CSound*> TSoundTable; // typedef std::hash_map<std::string, CSound*> TSoundTable;
// typedef CHashMap<NLMISC::CSheetId, CSound*, NLMISC::CSheetIdHashMapTraits> TSoundTable; typedef CHashMap<NLMISC::TStringId, CSound*, NLMISC::CStringIdHashMapTraits> TSoundTable;
typedef std::vector<CSound *> TSoundTable; // list the sheets by shortId of the sheetId
/// Assoc from buffer to sound. Used for sound unloading. /// Assoc from buffer to sound. Used for sound unloading.
TBufferAssocContainer _BufferAssoc; TBufferAssocContainer _BufferAssoc;

1
code/nel/include/nel/sound/source_common.h
Unescape Escape View File

@ -23,7 +23,6 @@
#include "nel/3d/cluster.h" #include "nel/3d/cluster.h"
#include "nel/sound/sound.h" #include "nel/sound/sound.h"
#include "nel/sound/group_controller.h" #include "nel/sound/group_controller.h"
#include "nel/misc/sheet_id.h"
namespace NLSOUND { namespace NLSOUND {

7
code/nel/include/nel/sound/u_audio_mixer.h
Unescape Escape View File

@ -19,7 +19,6 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/misc/sheet_id.h"
#include "nel/sound/u_source.h" #include "nel/sound/u_source.h"
#include "nel/sound/u_group_controller.h" #include "nel/sound/u_group_controller.h"
#include "nel/ligo/primitive.h" #include "nel/ligo/primitive.h"
@ -285,7 +284,7 @@ public:
//@} //@}
/// Get a TSoundId from a name (returns NULL if not found) /// Get a TSoundId from a name (returns NULL if not found)
virtual TSoundId getSoundId( const NLMISC::CSheetId &name ) = 0; virtual TSoundId getSoundId( const NLMISC::TStringId &name ) = 0;
/// Gets the group controller for the given group tree path with separator '/', if it doesn't exist yet it will be created. /// Gets the group controller for the given group tree path with separator '/', if it doesn't exist yet it will be created.
/// Examples: "music", "effects", "dialog", "music/background", "music/loading", "music/player", etcetera /// Examples: "music", "effects", "dialog", "music/background", "music/loading", "music/player", etcetera
@ -297,7 +296,7 @@ public:
* pass a callback function that will be called (if not NULL) just before deleting the spawned * pass a callback function that will be called (if not NULL) just before deleting the spawned
* source. * source.
*/ */
virtual USource *createSource(const NLMISC::CSheetId &name, bool spawn=false, TSpawnEndCallback cb=NULL, void *callbackUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL) = 0; virtual USource *createSource(const NLMISC::TStringId &name, bool spawn=false, TSpawnEndCallback cb=NULL, void *callbackUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL) = 0;
/// Add a logical sound source (by sound id). To remove a source, just delete it. See createSource(const char*) /// Add a logical sound source (by sound id). To remove a source, just delete it. See createSource(const char*)
virtual USource *createSource(TSoundId id, bool spawn=false, TSpawnEndCallback cb=NULL, void *callbackUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL) = 0; virtual USource *createSource(TSoundId id, bool spawn=false, TSpawnEndCallback cb=NULL, void *callbackUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL) = 0;
@ -321,7 +320,7 @@ public:
//@{ //@{
//@name Statistic and utility methods //@name Statistic and utility methods
/// Fill a vector with the names of all loaded sounds. /// Fill a vector with the names of all loaded sounds.
virtual void getSoundNames( std::vector<NLMISC::CSheetId> &names ) const = 0; virtual void getSoundNames( std::vector<NLMISC::TStringId> &names ) const = 0;
/// Return the number of mixing tracks (voices) /// Return the number of mixing tracks (voices)
virtual uint getPolyphony() const = 0; virtual uint getPolyphony() const = 0;
/// Return the number of sources /// Return the number of sources

3
code/nel/samples/sound/sound_sources/main.cpp
Unescape Escape View File

@ -49,7 +49,6 @@ void Init()
{ {
try try
{ {
CSheetId::initWithoutSheet();
CPath::addSearchPath(NL_SOUND_DATA"/data", true, false); CPath::addSearchPath(NL_SOUND_DATA"/data", true, false);
@ -101,7 +100,7 @@ USource *OnAddSource( const char *name, float x, float y, float z )
/* /*
* Create a source with sound 'name', and set some of its initial properties, if successful * Create a source with sound 'name', and set some of its initial properties, if successful
*/ */
USource *source = AudioMixer->createSource(CSheetId(name, "sound")); USource *source = AudioMixer->createSource( CStringMapper::map(name) );
if ( source != NULL ) if ( source != NULL )
{ {
source->setPos( CVector(x,y,z) ); source->setPos( CVector(x,y,z) );

3
code/nel/samples/sound/stream_file/stream_file.cpp
Unescape Escape View File

@ -62,7 +62,6 @@ static void initSample()
{ {
if (!INelContext::isContextInitialised()) if (!INelContext::isContextInitialised())
new CApplicationContext(); new CApplicationContext();
CSheetId::initWithoutSheet();
CPath::addSearchPath(NL_SOUND_DATA"/data", true, false); CPath::addSearchPath(NL_SOUND_DATA"/data", true, false);
printf("Sample demonstrating OGG playback using stream file .sound sheets."); printf("Sample demonstrating OGG playback using stream file .sound sheets.");
@ -98,7 +97,7 @@ static void initSample()
//NLMISC::CHTimer::startBench(); //NLMISC::CHTimer::startBench();
s_Source = s_AudioMixer->createSource(CSheetId("stream_file.sound")); s_Source = s_AudioMixer->createSource(CStringMapper::map("stream_file"));
nlassert(s_Source); nlassert(s_Source);
s_StreamFileSource = dynamic_cast<CStreamFileSource *>(s_Source); s_StreamFileSource = dynamic_cast<CStreamFileSource *>(s_Source);
nlassert(s_StreamFileSource); nlassert(s_StreamFileSource);

3
code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp
Unescape Escape View File

@ -59,7 +59,6 @@ static void initSample()
{ {
if (!INelContext::isContextInitialised()) if (!INelContext::isContextInitialised())
new CApplicationContext(); new CApplicationContext();
CSheetId::initWithoutSheet();
CPath::addSearchPath(NL_SOUND_DATA"/database/build/", true, false); CPath::addSearchPath(NL_SOUND_DATA"/database/build/", true, false);
printf("Sample demonstrating OGG playback using UStreamSource."); printf("Sample demonstrating OGG playback using UStreamSource.");
@ -88,7 +87,7 @@ static void initSample()
//NLMISC::CHTimer::startBench(); //NLMISC::CHTimer::startBench();
USource *source = s_AudioMixer->createSource(CSheetId("default_stream.sound")); USource *source = s_AudioMixer->createSource(CStringMapper::map("default_stream"));
nlassert(source); nlassert(source);
s_StreamSource = dynamic_cast<UStreamSource *>(source); s_StreamSource = dynamic_cast<UStreamSource *>(source);
nlassert(s_StreamSource); nlassert(s_StreamSource);

21
code/nel/src/3d/ps_sound.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ CPSSound::CPSSound() : _Gain(1.f),
{ {
NL_PS_FUNC(CPSSound_CPSSound) NL_PS_FUNC(CPSSound_CPSSound)
if (CParticleSystem::getSerializeIdentifierFlag()) _Name = std::string("sound"); if (CParticleSystem::getSerializeIdentifierFlag()) _Name = std::string("sound");
_SoundName = NLMISC::CSheetId::Unknown /*NLMISC::CStringMapper::emptyId()*/; _SoundName = NLMISC::CStringMapper::emptyId();
} }
// *************************************************************************************************** // ***************************************************************************************************
@ -270,13 +270,18 @@ void CPSSound::serial(NLMISC::IStream &f)
// FIXME: CPSSound is reserialized from the _ParticleSystemProto // FIXME: CPSSound is reserialized from the _ParticleSystemProto
// cache when a non-_Shared particle system is instanced, this // cache when a non-_Shared particle system is instanced, this
// causes unnecessary sheet id lookups from string. // causes unnecessary id lookups from string.
// SLN1: Serialize as uint32, but this requires the editor to know if (f.isReading())
// the correct sheet id (and thus requires a built sheet_id.bin). {
// SLN2: Create a tool that reserializes all ps with sound sheet id std::string soundName;
// instead of sheet names, based on a global flag, and serialize f.serial(soundName);
// a flag that specifies if the ps is serialized with id or name. _SoundName = NLMISC::CStringMapper::map(soundName);
_SoundName.serialString(f, "sound"); }
else
{
std::string soundName = NLMISC::CStringMapper::unmap(_SoundName);
f.serial(soundName);
}
sint32 nbSounds; sint32 nbSounds;
bool hasScheme; bool hasScheme;

21
code/nel/src/sound/audio_mixer_user.cpp
Unescape Escape View File

@ -23,7 +23,6 @@
#include "nel/misc/command.h" #include "nel/misc/command.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/sheet_id.h"
#include "nel/georges/u_form_loader.h" #include "nel/georges/u_form_loader.h"
#include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_elm.h"
@ -1058,8 +1057,9 @@ public:
for (uint i=0; i<size; ++i) for (uint i=0; i<size; ++i)
{ {
items->getArrayValue(soundName, i); items->getArrayValue(soundName, i);
nlassert(soundName.find(".sound") != std::string::npos); soundName = soundName.substr(0, soundName.find(".sound"));
cs.SoundNames.push_back(CSheetId(soundName));
cs.SoundNames.push_back(CStringMapper::map(soundName));
} }
if (!cs.SoundNames.empty()) if (!cs.SoundNames.empty())
@ -1109,7 +1109,7 @@ void CAudioMixerUser::initUserVar()
TUserVarControlsContainer::iterator first(_UserVarControls.begin()), last(_UserVarControls.end()); TUserVarControlsContainer::iterator first(_UserVarControls.begin()), last(_UserVarControls.end());
for(; first != last; ++first) for(; first != last; ++first)
{ {
std::vector<NLMISC::CSheetId>::iterator first2(first->second.SoundNames.begin()), last2(first->second.SoundNames.end()); std::vector<NLMISC::TStringId>::iterator first2(first->second.SoundNames.begin()), last2(first->second.SoundNames.end());
for (; first2 != last2; ++first2) for (; first2 != last2; ++first2)
{ {
CSound *sound = getSoundId(*first2); CSound *sound = getSoundId(*first2);
@ -1140,7 +1140,7 @@ void CAudioMixerUser::CControledSources::serial(NLMISC::IStream &s)
for (uint i=0; i<size; ++i) for (uint i=0; i<size; ++i)
{ {
s.serial(soundName); s.serial(soundName);
SoundNames.push_back(CSheetId(soundName, "sound")); SoundNames.push_back(CStringMapper::map(soundName));
} }
} }
else else
@ -1154,7 +1154,7 @@ void CAudioMixerUser::CControledSources::serial(NLMISC::IStream &s)
for (uint i=0; i<size; ++i) for (uint i=0; i<size; ++i)
{ {
soundName = SoundNames[i].toString();; soundName = CStringMapper::unmap(SoundNames[i]);
s.serial(soundName); s.serial(soundName);
} }
} }
@ -1788,7 +1788,7 @@ void CAudioMixerUser::update()
// ****************************************************************** // ******************************************************************
TSoundId CAudioMixerUser::getSoundId( const NLMISC::CSheetId &name ) TSoundId CAudioMixerUser::getSoundId( const NLMISC::TStringId &name )
{ {
return _SoundBank->getSound(name); return _SoundBank->getSound(name);
} }
@ -1902,7 +1902,7 @@ retrySound:
if (invalid) if (invalid)
{ {
nlwarning("The sound %s contain an infinite recursion !", id->getName().toString().c_str()/*CStringMapper::unmap(id->getName()).c_str()*/); nlwarning("The sound %s contain an infinite recursion !", CStringMapper::unmap(id->getName()).c_str());
return NULL; return NULL;
} }
@ -2043,7 +2043,7 @@ retrySound:
// ****************************************************************** // ******************************************************************
USource *CAudioMixerUser::createSource( const NLMISC::CSheetId &name, bool spawn, TSpawnEndCallback cb, void *userParam, NL3D::CCluster *cluster, CSoundContext *context, UGroupController *groupController) USource *CAudioMixerUser::createSource( const NLMISC::TStringId &name, bool spawn, TSpawnEndCallback cb, void *userParam, NL3D::CCluster *cluster, CSoundContext *context, UGroupController *groupController)
{ {
return createSource( getSoundId( name ), spawn, cb, userParam, cluster, context, groupController); return createSource( getSoundId( name ), spawn, cb, userParam, cluster, context, groupController);
} }
@ -2170,7 +2170,7 @@ bool CAudioMixerUser::unloadSampleBank(const std::string &name)
// ****************************************************************** // ******************************************************************
void CAudioMixerUser::getSoundNames( std::vector<NLMISC::CSheetId> &names ) const void CAudioMixerUser::getSoundNames( std::vector<NLMISC::TStringId> &names ) const
{ {
_SoundBank->getNames(names); _SoundBank->getNames(names);
} }
@ -2320,6 +2320,7 @@ void CAudioMixerUser::getLoadedSampleBankInfo(std::vector<std::pair<std::strin
} }
void CAudioMixerUser::setListenerPos (const NLMISC::CVector &pos) void CAudioMixerUser::setListenerPos (const NLMISC::CVector &pos)
{ {
_Listener.setPos(pos); _Listener.setPos(pos);

5
code/nel/src/sound/background_sound.cpp
Unescape Escape View File

@ -84,8 +84,7 @@ void CBackgroundSound::importForm(const std::string& filename, NLGEORGES::UFormE
// Read the sound name. // Read the sound name.
std::string soundName; std::string soundName;
psoundItem->getValueByName(soundName, "Sound"); psoundItem->getValueByName(soundName, "Sound");
nlassert(soundName.find(".sound") != std::string::npos); sound.SoundName = CStringMapper::map(CFile::getFilenameWithoutExtension(soundName));
sound.SoundName = NLMISC::CSheetId(soundName);
// Read the environnement flag. // Read the environnement flag.
@ -134,7 +133,7 @@ void CBackgroundSound::getSubSoundList(std::vector<std::pair<std::string, CSound
for (; first != last; ++first) for (; first != last; ++first)
{ {
CSound *sound = mixer->getSoundId(first->SoundName); CSound *sound = mixer->getSoundId(first->SoundName);
subsounds.push_back(make_pair(first->SoundName.toString()/*CStringMapper::unmap(first->SoundName)*/, sound)); subsounds.push_back(make_pair(CStringMapper::unmap(first->SoundName), sound));
} }
} }

14
code/nel/src/sound/background_sound_manager.cpp
Unescape Escape View File

@ -86,7 +86,7 @@ void CBackgroundSoundManager::addSound(const std::string &soundName, uint layerI
CAudioMixerUser *mixer = CAudioMixerUser::instance(); CAudioMixerUser *mixer = CAudioMixerUser::instance();
TSoundData sd; TSoundData sd;
sd.SoundName = NLMISC::CSheetId(soundName, "sound"); // note: loaded from .primitive sd.SoundName = CStringMapper::map(soundName);
sd.Sound = mixer->getSoundId(sd.SoundName); sd.Sound = mixer->getSoundId(sd.SoundName);
sd.Source = 0; sd.Source = 0;
@ -133,7 +133,7 @@ void CBackgroundSoundManager::addSound(const std::string &soundName, uint layerI
} }
else else
{ {
nlwarning ("The sound '%s' can't be loaded", sd.SoundName.toString().c_str()/*CStringMapper::unmap(sd.SoundName).c_str()*/); nlwarning ("The sound '%s' can't be loaded", CStringMapper::unmap(sd.SoundName).c_str());
} }
} }
@ -1431,15 +1431,21 @@ void CBackgroundSoundManager::TBanksData::serial(NLMISC::IStream &s)
void CBackgroundSoundManager::TSoundData::serial(NLMISC::IStream &s) void CBackgroundSoundManager::TSoundData::serial(NLMISC::IStream &s)
{ {
//std::string str; std::string str;
SoundName.serialString(s, "sound");
if (s.isReading()) if (s.isReading())
{ {
CAudioMixerUser *mixer = CAudioMixerUser::instance(); CAudioMixerUser *mixer = CAudioMixerUser::instance();
s.serial(str);
SoundName = NLMISC::CStringMapper::map(str);
Sound = mixer->getSoundId(SoundName); Sound = mixer->getSoundId(SoundName);
Source = NULL; Source = NULL;
Selected = false; Selected = false;
} }
else
{
s.serial(const_cast<std::string&>(NLMISC::CStringMapper::unmap(SoundName)));
}
s.serial(MinBox); s.serial(MinBox);
s.serial(MaxBox); s.serial(MaxBox);
s.serial(Surface); s.serial(Surface);

36
code/nel/src/sound/clustered_sound.cpp
Unescape Escape View File

@ -70,7 +70,7 @@ float EAX_MATERIAL_PARAM[] =
class CSoundGroupSerializer class CSoundGroupSerializer
{ {
public: public:
std::vector<std::pair<NLMISC::TStringId, NLMISC::CSheetId> > _SoundGroupAssoc; std::vector<std::pair<NLMISC::TStringId, NLMISC::TStringId> > _SoundGroupAssoc;
// load the values using the george sheet (called by GEORGE::loadForm) // load the values using the george sheet (called by GEORGE::loadForm)
void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const std::string &/* name */) void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const std::string &/* name */)
@ -95,9 +95,15 @@ public:
item->getValueByName(soundGroup, ".SoundGroup"); item->getValueByName(soundGroup, ".SoundGroup");
item->getValueByName(sound, ".Sound"); item->getValueByName(sound, ".Sound");
nlassert(sound.find(".sound") != std::string::npos); string::size_type n = sound.rfind(".sound");
_SoundGroupAssoc.push_back(make_pair(CStringMapper::map(soundGroup), CSheetId(sound))); if (n != string::npos)
{
// remove the tailing .sound
sound = sound.substr(0, n);
}
_SoundGroupAssoc.push_back(make_pair(CStringMapper::map(soundGroup), CStringMapper::map(sound)));
} }
} }
catch(...) catch(...)
@ -119,18 +125,24 @@ public:
{ {
if (s.isReading()) if (s.isReading())
{ {
TStringId soundGroup; std::string soundGroup;
CSheetId sound; std::string sound;
CStringMapper::serialString(s, soundGroup); s.serial(soundGroup);
sound.serialString(s, "sound"); s.serial(sound);
_SoundGroupAssoc.push_back(make_pair(soundGroup, sound)); _SoundGroupAssoc.push_back(make_pair(CStringMapper::map(soundGroup), CStringMapper::map(sound)));
} }
else else
{ {
CStringMapper::serialString(s, _SoundGroupAssoc[i].first); std::string soundGroup;
_SoundGroupAssoc[i].second.serialString(s, "sound"); std::string sound;
soundGroup = CStringMapper::unmap(_SoundGroupAssoc[i].first);
sound = CStringMapper::unmap(_SoundGroupAssoc[i].second);
s.serial(soundGroup);
s.serial(sound);
} }
} }
} }
@ -277,10 +289,10 @@ void CClusteredSound::update(const CVector &listenerPos, const CVector &/* view
// nldebug("Searching sound assoc for group [%s]", CStringMapper::unmap(soundGroup).c_str()); // nldebug("Searching sound assoc for group [%s]", CStringMapper::unmap(soundGroup).c_str());
TStringSheetMap::iterator it2(_SoundGroupToSound.find(soundGroup)); TStringStringMap::iterator it2(_SoundGroupToSound.find(soundGroup));
if (it2 != _SoundGroupToSound.end()) if (it2 != _SoundGroupToSound.end())
{ {
NLMISC::CSheetId soundName = it2->second; NLMISC::TStringId soundName = it2->second;
CClusterSound cs; CClusterSound cs;
// nldebug("Found the sound [%s] for sound group [%s]", CStringMapper::unmap(soundName).c_str(), CStringMapper::unmap(soundGroup).c_str()); // nldebug("Found the sound [%s] for sound group [%s]", CStringMapper::unmap(soundName).c_str(), CStringMapper::unmap(soundGroup).c_str());

17
code/nel/src/sound/complex_sound.cpp
Unescape Escape View File

@ -19,7 +19,6 @@
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/common.h" #include "nel/misc/common.h"
#include "nel/sound/audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include "nel/misc/sheet_id.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
@ -64,11 +63,11 @@ void CComplexSound::parseSequence(const std::string &str, std::vector<uint32> &s
void CComplexSound::getSubSoundList(std::vector<std::pair<std::string, CSound*> > &subsounds) const void CComplexSound::getSubSoundList(std::vector<std::pair<std::string, CSound*> > &subsounds) const
{ {
CAudioMixerUser *mixer = CAudioMixerUser::instance(); CAudioMixerUser *mixer = CAudioMixerUser::instance();
std::vector<NLMISC::CSheetId>::const_iterator first(_Sounds.begin()), last(_Sounds.end()); std::vector<NLMISC::TStringId>::const_iterator first(_Sounds.begin()), last(_Sounds.end());
for (; first != last; ++first) for (; first != last; ++first)
{ {
CSound *sound = mixer->getSoundId(*first); CSound *sound = mixer->getSoundId(*first);
subsounds.push_back(make_pair((*first).toString()/*CStringMapper::unmap(*first)*/, sound)); subsounds.push_back(make_pair(CStringMapper::unmap(*first), sound));
} }
} }
@ -84,7 +83,7 @@ uint32 CComplexSound::getDuration()
CAudioMixerUser *mixer = CAudioMixerUser::instance(); CAudioMixerUser *mixer = CAudioMixerUser::instance();
vector<sint32> durations; vector<sint32> durations;
std::vector<NLMISC::CSheetId>::iterator first(_Sounds.begin()), last(_Sounds.end()); std::vector<NLMISC::TStringId>::iterator first(_Sounds.begin()), last(_Sounds.end());
for (; first != last; ++first) for (; first != last; ++first)
{ {
CSound *sound = mixer->getSoundId(*first); CSound *sound = mixer->getSoundId(*first);
@ -205,7 +204,7 @@ float CComplexSound::getMaxDistance() const
CComplexSound *This = const_cast<CComplexSound*>(this); CComplexSound *This = const_cast<CComplexSound*>(this);
This->_MaxDist = 0.0f; This->_MaxDist = 0.0f;
std::vector<NLMISC::CSheetId>::const_iterator first(_Sounds.begin()), last(_Sounds.end()); std::vector<NLMISC::TStringId>::const_iterator first(_Sounds.begin()), last(_Sounds.end());
for (; first != last; ++first) for (; first != last; ++first)
{ {
@ -237,7 +236,7 @@ void CComplexSound::serial(NLMISC::IStream &s)
{ {
std::string name; std::string name;
s.serial(name); s.serial(name);
_Sounds.push_back(NLMISC::CSheetId(name, "sound")); _Sounds.push_back(CStringMapper::map(name));
} }
} }
else else
@ -246,7 +245,7 @@ void CComplexSound::serial(NLMISC::IStream &s)
s.serial(nb); s.serial(nb);
for (uint i=0; i<nb; ++i) for (uint i=0; i<nb; ++i)
{ {
std::string name = _Sounds[i].toString(); std::string name = CStringMapper::unmap(_Sounds[i]);
s.serial(name); s.serial(name);
} }
} }
@ -301,8 +300,8 @@ void CComplexSound::importForm(const std::string& filename, NLGEORGES::UFormElm&
string soundname; string soundname;
if (psoundsArray->getArrayValue(soundname, i)) if (psoundsArray->getArrayValue(soundname, i))
{ {
nlassert(soundname.find(".sound") != std::string::npos); soundname = CFile::getFilenameWithoutExtension(soundname);
_Sounds.push_back(NLMISC::CSheetId(soundname)); _Sounds.push_back(CStringMapper::map(soundname));
} }
} }
} }

6
code/nel/src/sound/complex_source.cpp
Unescape Escape View File

@ -191,9 +191,9 @@ void CComplexSource::playStuf()
case CComplexSound::MODE_ALL_IN_ONE: case CComplexSound::MODE_ALL_IN_ONE:
{ {
// just spanw all the listed source. // just spanw all the listed source.
const std::vector<NLMISC::CSheetId> &sounds = _PatternSound->getSounds(); const std::vector<NLMISC::TStringId> &sounds = _PatternSound->getSounds();
std::vector<NLMISC::CSheetId>::const_iterator first(sounds.begin()), last(sounds.end()); std::vector<NLMISC::TStringId>::const_iterator first(sounds.begin()), last(sounds.end());
if (_AllSources.empty()) if (_AllSources.empty())
{ {
@ -525,7 +525,7 @@ void CComplexSource::onUpdate()
else else
{ {
// no sound after, just set an event at end of current sound to stop the complex sound. // no sound after, just set an event at end of current sound to stop the complex sound.
nldebug("Setting last event for sound %s in %u millisec.", _Source1->getSound()->getName().toString().c_str()/*CStringMapper::unmap(_Source1->getSound()->getName()).c_str()*/, _Source1->getSound()->getDuration()); nldebug("Setting last event for sound %s in %u millisec.", CStringMapper::unmap(_Source1->getSound()->getName()).c_str(), _Source1->getSound()->getDuration());
if (_PatternSound->doFadeOut()) if (_PatternSound->doFadeOut())
{ {
// set the event to begin fade out. // set the event to begin fade out.

16
code/nel/src/sound/context_sound.cpp
Unescape Escape View File

@ -187,7 +187,7 @@ void CContextSound::init()
} }
else else
{ {
nlassertex(nbJoker < SoundContextNbArgs, ("Error will trying to play ContextSound '%s'", _Name.toString().c_str()/*CStringMapper::unmap(_Name).c_str()*/)); nlassertex(nbJoker < SoundContextNbArgs, ("Error will trying to play ContextSound '%s'", CStringMapper::unmap(_Name).c_str()));
fromString(index, contextArgIndex[nbJoker++]); fromString(index, contextArgIndex[nbJoker++]);
parseArg = false; parseArg = false;
index.clear(); index.clear();
@ -195,13 +195,13 @@ void CContextSound::init()
} }
else if (*first == 'r') else if (*first == 'r')
{ {
nlassertex(useRandom == false, ("Error will trying to play ContextSound '%s'", _Name.toString().c_str()/*CStringMapper::unmap(_Name).c_str()*/)); nlassertex(useRandom == false, ("Error will trying to play ContextSound '%s'", CStringMapper::unmap(_Name).c_str()));
useRandom = true; useRandom = true;
} }
} }
else if (*first == '%') else if (*first == '%')
{ {
nlassertex(useRandom == false, ("Error will trying to play ContextSound '%s'", _Name.toString().c_str()/*CStringMapper::unmap(_Name).c_str()*/)); nlassertex(useRandom == false, ("Error will trying to play ContextSound '%s'", CStringMapper::unmap(_Name).c_str()));
parseArg = true; parseArg = true;
} }
} }
@ -215,7 +215,7 @@ void CContextSound::init()
} }
else else
{ {
nlassertex(nbJoker < SoundContextNbArgs, ("Error will trying to play ContextSound '%s'", _Name.toString().c_str()/*CStringMapper::unmap(_Name).c_str()*/)); nlassertex(nbJoker < SoundContextNbArgs, ("Error will trying to play ContextSound '%s'", CStringMapper::unmap(_Name).c_str()));
fromString(index, contextArgIndex[nbJoker++]); fromString(index, contextArgIndex[nbJoker++]);
parseArg = false; parseArg = false;
} }
@ -247,7 +247,7 @@ void CContextSound::init()
LM_CASE_CONTAINER_CREATOR(9) LM_CASE_CONTAINER_CREATOR(9)
LM_CASE_CONTAINER_CREATOR(10) LM_CASE_CONTAINER_CREATOR(10)
default: default:
nlwarning("Unsuported number of context argument in context sound '%s'!", _Name.toString().c_str()/*CStringMapper::unmap(_Name).c_str()*/); nlwarning("Unsuported number of context argument in context sound '%s'!", CStringMapper::unmap(_Name).c_str());
return; return;
} }
// cleanup macro // cleanup macro
@ -257,14 +257,14 @@ void CContextSound::init()
// ok, we have the container, now fill it with the sound // ok, we have the container, now fill it with the sound
{ {
std::vector<NLMISC::CSheetId> allSounds; std::vector<NLMISC::TStringId> allSounds;
// CSoundBank::getSoundNames(allSounds); // CSoundBank::getSoundNames(allSounds);
CAudioMixerUser::instance()->getSoundNames(allSounds); CAudioMixerUser::instance()->getSoundNames(allSounds);
std::vector<NLMISC::CSheetId>::iterator first(allSounds.begin()), last(allSounds.end()); std::vector<NLMISC::TStringId>::iterator first(allSounds.begin()), last(allSounds.end());
for (; first != last; ++first) for (; first != last; ++first)
{ {
const std::string &soundName = first->toString()/*CStringMapper::unmap(*first)*/; const std::string &soundName = CStringMapper::unmap(*first);
if (soundName.size() > _BaseName.size()) if (soundName.size() > _BaseName.size())
{ {
uint i; uint i;

18
code/nel/src/sound/sound.cpp
Unescape Escape View File

@ -133,9 +133,18 @@ void CSound::serial(NLMISC::IStream &s)
s.serial(_Direction); s.serial(_Direction);
s.serial(_Looping); s.serial(_Looping);
s.serial(_MaxDist); s.serial(_MaxDist);
if (s.isReading())
_Name.serialString(s, "sound"); {
std::string name;
s.serial(name);
_Name = CStringMapper::map(name);
}
else
{
std::string name = CStringMapper::unmap(_Name);
s.serial(name);
}
nlassert(CGroupControllerRoot::isInitialized()); // not sure nlassert(CGroupControllerRoot::isInitialized()); // not sure
#if NLSOUND_SHEET_VERSION_BUILT < 2 #if NLSOUND_SHEET_VERSION_BUILT < 2
if (s.isReading()) _GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER); if (s.isReading()) _GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER);
@ -161,8 +170,7 @@ void CSound::serial(NLMISC::IStream &s)
void CSound::importForm(const std::string& filename, NLGEORGES::UFormElm& root) void CSound::importForm(const std::string& filename, NLGEORGES::UFormElm& root)
{ {
// Name // Name
nlassert(filename.find(".sound") != std::string::npos); _Name = CStringMapper::map(CFile::getFilenameWithoutExtension(filename));
_Name = NLMISC::CSheetId(filename);
// InternalConeAngle // InternalConeAngle
uint32 inner; uint32 inner;

10
code/nel/src/sound/sound_anim_marker.cpp
Unescape Escape View File

@ -53,19 +53,19 @@ void CSoundAnimMarker::play(UAudioMixer* mixer, NL3D::CCluster *cluster, CSoundC
// ******************************************************** // ********************************************************
void CSoundAnimMarker::addSound(const NLMISC::CSheetId& soundName) void CSoundAnimMarker::addSound(const NLMISC::TStringId& soundName)
{ {
pair<TMarkerSoundSet::iterator, bool> inserted; pair<TMarkerSoundSet::iterator, bool> inserted;
inserted = _Sounds.insert(soundName); inserted = _Sounds.insert(soundName);
if (inserted.second == false) if (inserted.second == false)
{ {
nlwarning("Duplicate sound (%s)",/* CStringMapper::unmap(soundName).c_str()*/soundName.toString().c_str()); nlwarning("Duplicate sound (%s)", CStringMapper::unmap(soundName).c_str());
} }
} }
// ******************************************************** // ********************************************************
void CSoundAnimMarker::removeSound(const NLMISC::CSheetId &soundName) void CSoundAnimMarker::removeSound(const NLMISC::TStringId &soundName)
{ {
TMarkerSoundSet::iterator iter = _Sounds.find(soundName); TMarkerSoundSet::iterator iter = _Sounds.find(soundName);
if (iter != _Sounds.end()) if (iter != _Sounds.end())
@ -74,13 +74,13 @@ void CSoundAnimMarker::removeSound(const NLMISC::CSheetId &soundName)
} }
else else
{ {
nlwarning("No sound was removed (%s)", soundName.toString().c_str()/*CStringMapper::unmap(soundName).c_str()*/); nlwarning("No sound was removed (%s)", CStringMapper::unmap(soundName).c_str());
} }
} }
// ******************************************************** // ********************************************************
void CSoundAnimMarker::getSounds(vector<NLMISC::CSheetId> &sounds) void CSoundAnimMarker::getSounds(vector<NLMISC::TStringId> &sounds)
{ {
sounds.insert(sounds.end(), _Sounds.begin(), _Sounds.end()); sounds.insert(sounds.end(), _Sounds.begin(), _Sounds.end());

8
code/nel/src/sound/sound_animation.cpp
Unescape Escape View File

@ -73,7 +73,7 @@ void CSoundAnimation::save()
{ {
// File stream // File stream
COFile file; COFile file;
vector<NLMISC::CSheetId> sounds; vector<NLMISC::TStringId> sounds;
// Open the file // Open the file
if (!file.open(_Filename.c_str())) if (!file.open(_Filename.c_str()))
@ -108,11 +108,11 @@ void CSoundAnimation::save()
marker->getSounds(sounds); marker->getSounds(sounds);
vector<NLMISC::CSheetId>::iterator iter2; vector<NLMISC::TStringId>::iterator iter2;
for (iter2 = sounds.begin(); iter2 != sounds.end(); iter2++) for (iter2 = sounds.begin(); iter2 != sounds.end(); iter2++)
{ {
xmlNodePtr soundNode = xmlNewChild ( markerNode, NULL, (const xmlChar*)"SOUND", NULL ); xmlNodePtr soundNode = xmlNewChild ( markerNode, NULL, (const xmlChar*)"SOUND", NULL );
xmlSetProp (soundNode, (const xmlChar*)"name", (const xmlChar*)iter2->toString().c_str() /*CStringMapper::unmap(*iter2).c_str()*/); xmlSetProp (soundNode, (const xmlChar*)"name", (const xmlChar*) CStringMapper::unmap(*iter2).c_str());
} }
sounds.clear(); sounds.clear();
@ -193,7 +193,7 @@ void CSoundAnimation::load()
throw NLMISC::Exception("Invalid sound animation marker"); throw NLMISC::Exception("Invalid sound animation marker");
} }
marker->addSound(NLMISC::CSheetId(string(name), "sound")); marker->addSound(CStringMapper::map(string(name)));
xmlFree ((void*)name); xmlFree ((void*)name);

91
code/nel/src/sound/sound_bank.cpp
Unescape Escape View File

@ -127,16 +127,14 @@ CSoundBank::~CSoundBank()
void CSoundBank::addSound(CSound *sound) void CSoundBank::addSound(CSound *sound)
{ {
// nlassert(_Sounds.size() > sound->getName().getShortId()); std::pair<TSoundTable::iterator, bool> ret;
// nldebug("SOUNDBANK: Add %s", sound->getName().toString().c_str()); ret = _Sounds.insert(make_pair(sound->getName(), sound));
if (_Sounds.size() <= sound->getName().getShortId()) nlassert(ret.second);
_Sounds.resize(sound->getName().getShortId() + 1);
_Sounds[sound->getName().getShortId()] = sound;
} }
void CSoundBank::removeSound(const NLMISC::CSheetId &sheetId) void CSoundBank::removeSound(const NLMISC::TStringId &name)
{ {
_Sounds[sheetId.getShortId()] = NULL; _Sounds.erase(name);
} }
@ -264,59 +262,35 @@ public:
void CSoundBank::load(const std::string &packedSheetDir, bool packedSheetUpdate) void CSoundBank::load(const std::string &packedSheetDir, bool packedSheetUpdate)
{ {
// this structure is fill by the loadForm() function and will contain all you need // this structure is fill by the loadForm() function and will contain all you need
std::map<std::string, CSoundSerializer> container; // load the old way for compatibility std::map<std::string, CSoundSerializer> Container;
nlassert(!_Loaded); nlassert(!_Loaded);
// Just call the GEORGE::loadFrom method to read all available sounds // Just call the GEORGE::loadFrom method to read all available sounds
::loadForm("sound", packedSheetDir + "sounds.packed_sheets", container, packedSheetUpdate, false); ::loadForm("sound", packedSheetDir + "sounds.packed_sheets", Container, packedSheetUpdate, false);
_Loaded = true; _Loaded = true;
// get the largest sheet id needed and init the sound bank
uint32 maxShortId = 0;
{
std::map<std::string, CSoundSerializer>::iterator first(container.begin()), last(container.end());
for (; first != last; ++first)
{
if (first->second.Sound != 0)
if (first->second.Sound->getName().getShortId() > maxShortId)
maxShortId = first->second.Sound->getName().getShortId();
}
++maxShortId; // inc for size = last idx + 1
if (container.empty())
{
nlwarning("NLSOUND: No sound sheets have been loaded, missing sound sheet directory or packed sound sheets file");
}
else
{
nlassert(maxShortId < (container.size() * 8)); // ensure no ridiculous sheet id values
if (maxShortId > _Sounds.size())
_Sounds.resize(maxShortId);
}
}
// add all the loaded sound in the sound banks // add all the loaded sound in the sound banks
std::map<std::string, CSoundSerializer>::iterator first(Container.begin()), last(Container.end());
for (; first != last; ++first)
{ {
std::map<std::string, CSoundSerializer>::iterator first(container.begin()), last(container.end()); if (first->second.Sound != 0)
for (; first != last; ++first) addSound(first->second.Sound);
{
if (first->second.Sound != 0)
addSound(first->second.Sound);
}
} }
container.clear(); Container.clear();
} }
/* /*
* Unload all the sound samples in this bank. * Unload all the sound samples in this bank.
*/ */
void CSoundBank::unload() void CSoundBank::unload()
{ {
nlassert(_Loaded); nlassert(_Loaded);
for (TSoundTable::size_type i = 0; i < _Sounds.size(); ++i) TSoundTable::iterator first(_Sounds.begin()), last(_Sounds.end());
for (; first != last; ++first)
{ {
delete _Sounds[i]; delete first->second;
} }
_Sounds.clear(); _Sounds.clear();
@ -350,7 +324,7 @@ void CSoundBank::unload()
/* /*
* Returns true if the samples in this bank have been loaded. * Returns true if the samples in this bank have been loaded.
*/ */
bool CSoundBank::isLoaded() bool CSoundBank::isLoaded()
{ {
return _Loaded; return _Loaded;
} }
@ -358,38 +332,37 @@ bool CSoundBank::isLoaded()
/* /*
* Return a sound sample corresponding to a name. * Return a sound sample corresponding to a name.
*/ */
CSound* CSoundBank::getSound(const NLMISC::CSheetId &sheetId) CSound* CSoundBank::getSound(const NLMISC::TStringId &name)
{ {
if (sheetId == NLMISC::CSheetId::Unknown) // Find sound
return NULL; TSoundTable::iterator iter = _Sounds.find(name);
if ( iter == _Sounds.end() )
// nlassert(sheetId.getShortId() < _Sounds.size());
if (sheetId.getShortId() >= _Sounds.size())
{ {
std::string sheetName = sheetId.toString(); return 0;
nldebug("NLSOUND: Sound sheet id '%s' exceeds loaded sound sheets", sheetName.c_str()); }
return NULL; else
{
return (*iter).second;
} }
return _Sounds[sheetId.getShortId()];
} }
/** /**
* Return the names of the sounds * Return the names of the sounds
*/ */
void CSoundBank::getNames( std::vector<NLMISC::CSheetId> &sheetIds ) void CSoundBank::getNames( std::vector<NLMISC::TStringId> &names )
{ {
for (TSoundTable::size_type i = 0; i < _Sounds.size(); ++i) TSoundTable::const_iterator iter;
for (iter = _Sounds.begin(); iter != _Sounds.end(); ++iter)
{ {
if (_Sounds[i]) names.push_back((*iter).first);
sheetIds.push_back(_Sounds[i]->getName()); //nlwarning("getting sound %s", (*iter).first);
} }
} }
/* /*
* Return the number of buffers in this bank. * Return the number of buffers in this bank.
*/ */
uint CSoundBank::countSounds() uint CSoundBank::countSounds()
{ {
return (uint)_Sounds.size(); return (uint)_Sounds.size();
} }

10
code/nel/src/sound/stream_file_sound.cpp
Unescape Escape View File

@ -73,13 +73,11 @@ void CStreamFileSound::serial(NLMISC::IStream &s)
void CStreamFileSound::setMusicFilePath(const std::string &filePath, bool async, bool loop) void CStreamFileSound::setMusicFilePath(const std::string &filePath, bool async, bool loop)
{ {
/*#if !FINAL_VERSION #if !FINAL_VERSION
//_Name = NLMISC::CStringMapper::map(std::string("<MusicChannel:") + NLMISC::CFile::getFilenameWithoutExtension(filePath) + ">"); _Name = NLMISC::CStringMapper::map(std::string("<MusicChannel:") + NLMISC::CFile::getFilenameWithoutExtension(filePath) + ">");
_Name = NLMISC::CSheetId(std::string("<MusicChannel:") + NLMISC::CFile::getFilenameWithoutExtension(filePath) + ">");
#else #else
//_Name = NLMISC::CStringMapper::map("<MusicChannel>"); _Name = NLMISC::CStringMapper::map("<MusicChannel>");
#endif*/ #endif
_Name = NLMISC::CSheetId("music_channel.sound");
_ConeInnerAngle = NLMISC::Pi * 2; _ConeInnerAngle = NLMISC::Pi * 2;
_ConeOuterAngle = NLMISC::Pi * 2; _ConeOuterAngle = NLMISC::Pi * 2;
_Looping = loop; _Looping = loop;

8
code/nel/tools/3d/object_viewer/edit_ps_sound.cpp
Unescape Escape View File

@ -159,7 +159,7 @@ END_MESSAGE_MAP()
void CEditPSSound::OnBrowseSound() void CEditPSSound::OnBrowseSound()
{ {
// CPickSound::TNameVect names; // CPickSound::TNameVect names;
vector<NLMISC::CSheetId> names; vector<NLMISC::TStringId> names;
NLSOUND::UAudioMixer *audioMixer = CSoundSystem::getAudioMixer(); NLSOUND::UAudioMixer *audioMixer = CSoundSystem::getAudioMixer();
@ -172,7 +172,7 @@ void CEditPSSound::OnBrowseSound()
if (ps.DoModal() == IDOK) if (ps.DoModal() == IDOK)
{ {
m_SoundName = ps.getName().toString().c_str(); m_SoundName = NLMISC::CStringMapper::unmap(ps.getName()).c_str();
_Sound->setSoundName(ps.getName()); _Sound->setSoundName(ps.getName());
updateModifiedFlag(); updateModifiedFlag();
UpdateData(FALSE); UpdateData(FALSE);
@ -184,7 +184,7 @@ BOOL CEditPSSound::OnInitDialog()
CDialog::OnInitDialog(); CDialog::OnInitDialog();
nlassert(_Sound); nlassert(_Sound);
m_SoundName = _Sound->getSoundName().toString().c_str(); m_SoundName = NLMISC::CStringMapper::unmap(_Sound->getSoundName()).c_str();
UpdateData(FALSE); UpdateData(FALSE);
return TRUE; // return TRUE unless you set the focus to a control return TRUE; // return TRUE unless you set the focus to a control
@ -195,7 +195,7 @@ void CEditPSSound::OnChangeSoundName()
{ {
nlassert(_Sound); nlassert(_Sound);
UpdateData(); UpdateData();
_Sound->setSoundName(NLMISC::CSheetId(NLMISC::tStrToUtf8(m_SoundName), "sound")); _Sound->setSoundName(NLMISC::CStringMapper::map(NLMISC::tStrToUtf8(m_SoundName)));
updateModifiedFlag(); updateModifiedFlag();
} }

1
code/nel/tools/3d/object_viewer/object_viewer.cpp
Unescape Escape View File

@ -606,7 +606,6 @@ bool CObjectViewer::initUI (HWND parent)
{ {
new NLMISC::CApplicationContext(); new NLMISC::CApplicationContext();
nldebug("NeL Object Viewer: initUI"); nldebug("NeL Object Viewer: initUI");
NLMISC::CSheetId::initWithoutSheet();
} }
// The fonts manager // The fonts manager

4
code/nel/tools/3d/object_viewer/pick_sound.cpp
Unescape Escape View File

@ -74,7 +74,7 @@ BOOL CPickSound::OnInitDialog()
for (TNameVect::iterator it = _Names.begin(); it != _Names.end(); ++it) for (TNameVect::iterator it = _Names.begin(); it != _Names.end(); ++it)
{ {
m_NameList.AddString(nlUtf8ToTStr((*it).toString())); m_NameList.AddString(nlUtf8ToTStr(NLMISC::CStringMapper::unmap(*it).c_str()));
} }
_Timer = SetTimer (1, 100, NULL); _Timer = SetTimer (1, 100, NULL);
@ -111,7 +111,7 @@ void CPickSound::OnSelchange()
nlassert(m_NameList.GetTextLen(m_NameList.GetCurSel()) < 1024); nlassert(m_NameList.GetTextLen(m_NameList.GetCurSel()) < 1024);
m_NameList.GetText(m_NameList.GetCurSel(), str); m_NameList.GetText(m_NameList.GetCurSel(), str);
_CurrName = NLMISC::CSheetId(NLMISC::tStrToUtf8(str), "sound"); _CurrName = NLMISC::CStringMapper::map(NLMISC::tStrToUtf8(str));
} }

8
code/nel/tools/3d/object_viewer/pick_sound.h
Unescape Escape View File

@ -23,7 +23,7 @@
#endif // _MSC_VER > 1000 #endif // _MSC_VER > 1000
// pick_sound.h : header file // pick_sound.h : header file
// //
#include "nel/misc/sheet_id.h" #include "nel/misc/string_mapper.h"
#include <vector> #include <vector>
#include <string> #include <string>
@ -40,11 +40,11 @@ class CPickSound : public CDialog
{ {
// Construction // Construction
public: public:
typedef std::vector<NLMISC::CSheetId> TNameVect; typedef std::vector<NLMISC::TStringId> TNameVect;
CPickSound(const TNameVect &names, CWnd* pParent = NULL); // standard constructor CPickSound(const TNameVect &names, CWnd* pParent = NULL); // standard constructor
const NLMISC::CSheetId &getName(void) const { return _CurrName; } const NLMISC::TStringId &getName(void) const { return _CurrName; }
// Dialog Data // Dialog Data
//{{AFX_DATA(CPickSound) //{{AFX_DATA(CPickSound)
@ -63,7 +63,7 @@ public:
// Implementation // Implementation
protected: protected:
TNameVect _Names; TNameVect _Names;
NLMISC::CSheetId _CurrName; NLMISC::TStringId _CurrName;
UINT_PTR _Timer; UINT_PTR _Timer;

10
code/nel/tools/3d/object_viewer/sound_anim_dlg.cpp
Unescape Escape View File

@ -125,18 +125,18 @@ void CSoundAnimDlg::updateSounds()
{ {
if (_SelectedMarker != 0) if (_SelectedMarker != 0)
{ {
vector<NLMISC::CSheetId> sounds; vector<NLMISC::TStringId> sounds;
_SelectedMarker->getSounds(sounds); _SelectedMarker->getSounds(sounds);
CListBox* list = (CListBox*) GetDlgItem(IDC_SOUND_ANIM_LIST); CListBox* list = (CListBox*) GetDlgItem(IDC_SOUND_ANIM_LIST);
list->ResetContent(); list->ResetContent();
vector<NLMISC::CSheetId>::iterator iter; vector<NLMISC::TStringId>::iterator iter;
for (iter = sounds.begin(); iter != sounds.end(); iter++) for (iter = sounds.begin(); iter != sounds.end(); iter++)
{ {
list->AddString(nlUtf8ToTStr((*iter).toString())); list->AddString(nlUtf8ToTStr(CStringMapper::unmap(*iter).c_str()));
} }
list->UpdateData(); list->UpdateData();
@ -150,7 +150,7 @@ void CSoundAnimDlg::OnAddSound()
if (_SelectedMarker != 0) if (_SelectedMarker != 0)
{ {
// CPickSound::TNameVect names; // CPickSound::TNameVect names;
vector<NLMISC::CSheetId> names; vector<NLMISC::TStringId> names;
NLSOUND::UAudioMixer *audioMixer = CSoundSystem::getAudioMixer(); NLSOUND::UAudioMixer *audioMixer = CSoundSystem::getAudioMixer();
@ -181,7 +181,7 @@ void CSoundAnimDlg::OnRemoveSound()
if (list->GetText(list->GetCurSel(), s) != LB_ERR) if (list->GetText(list->GetCurSel(), s) != LB_ERR)
{ {
_SelectedMarker->removeSound(NLMISC::CSheetId(tStrToUtf8(s), "sound")); _SelectedMarker->removeSound(CStringMapper::map(tStrToUtf8(s)));
updateSounds(); updateSounds();
} }
} }

4
code/nel/tools/3d/object_viewer/sound_system.cpp
Unescape Escape View File

@ -168,7 +168,7 @@ void CSoundSystem::play(const string &soundName)
{ {
if (_AudioMixer) if (_AudioMixer)
{ {
NLSOUND::USource *src = _AudioMixer->createSource(NLMISC::CSheetId(soundName, "sound"), true); NLSOUND::USource *src = _AudioMixer->createSource(CStringMapper::map(soundName), true);
if (src) if (src)
{ {
src->setLooping(false); src->setLooping(false);
@ -187,7 +187,7 @@ USource *CSoundSystem::create(const std::string &soundName)
{ {
if (_AudioMixer) if (_AudioMixer)
{ {
NLSOUND::USource *src = _AudioMixer->createSource(NLMISC::CSheetId(soundName, "sound"), false); NLSOUND::USource *src = _AudioMixer->createSource(CStringMapper::map(soundName), false);
if (src) if (src)
{ {
src->setLooping(false); src->setLooping(false);

2
code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp
Unescape Escape View File

@ -20,7 +20,6 @@
#include "nel/misc/app_context.h" #include "nel/misc/app_context.h"
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h> #include <maxversion.h>
#include "nel/misc/sheet_id.h"
extern ClassDesc2* GetCNelExportDesc(); extern ClassDesc2* GetCNelExportDesc();
@ -35,7 +34,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{ {
new NLMISC::CLibraryContext(GetSharedNelContext()); new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Export: DllMain"); nldebug("NeL Export: DllMain");
NLMISC::CSheetId::initWithoutSheet();
} }
hInstance = hinstDLL; // Hang on to this DLL's instance handle. hInstance = hinstDLL; // Hang on to this DLL's instance handle.

2
code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp
Unescape Escape View File

@ -21,7 +21,6 @@
#include "nel/misc/app_context.h" #include "nel/misc/app_context.h"
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h> #include <maxversion.h>
#include "nel/misc/sheet_id.h"
extern ClassDesc2* GetPO2RPODesc(); extern ClassDesc2* GetPO2RPODesc();
extern ClassDesc* GetRPODesc(); extern ClassDesc* GetRPODesc();
@ -45,7 +44,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{ {
new NLMISC::CLibraryContext(GetSharedNelContext()); new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Export: DllMain"); nldebug("NeL Export: DllMain");
NLMISC::CSheetId::initWithoutSheet();
} }
if(fdwReason == DLL_PROCESS_ATTACH) if(fdwReason == DLL_PROCESS_ATTACH)

2
code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp
Unescape Escape View File

@ -18,7 +18,6 @@
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h> #include <maxversion.h>
#include "nel/misc/sheet_id.h"
HINSTANCE hInstance; HINSTANCE hInstance;
int controlsInit = FALSE; int controlsInit = FALSE;
@ -33,7 +32,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{ {
new NLMISC::CLibraryContext(GetSharedNelContext()); new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Patch Edit: DllMain"); nldebug("NeL Patch Edit: DllMain");
NLMISC::CSheetId::initWithoutSheet();
} }
if (fdwReason == DLL_PROCESS_ATTACH) if (fdwReason == DLL_PROCESS_ATTACH)

2
code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp
Unescape Escape View File

@ -4,7 +4,6 @@
#include "nel/misc/app_context.h" #include "nel/misc/app_context.h"
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h> #include <maxversion.h>
#include "nel/misc/sheet_id.h"
HINSTANCE hInstance; HINSTANCE hInstance;
int controlsInit = FALSE; int controlsInit = FALSE;
@ -23,7 +22,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{ {
new NLMISC::CLibraryContext(GetSharedNelContext()); new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Patch Paint: DllMain"); nldebug("NeL Patch Paint: DllMain");
NLMISC::CSheetId::initWithoutSheet();
} }
hInstance = hinstDLL; hInstance = hinstDLL;

2
code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp
Unescape Escape View File

@ -1,7 +1,6 @@
#include "vertex_tree_paint.h" #include "vertex_tree_paint.h"
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h> #include <maxversion.h>
#include "nel/misc/sheet_id.h"
HINSTANCE hInstance; HINSTANCE hInstance;
@ -13,7 +12,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{ {
new NLMISC::CLibraryContext(GetSharedNelContext()); new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Vertex Tree Paint: DllMain"); nldebug("NeL Vertex Tree Paint: DllMain");
NLMISC::CSheetId::initWithoutSheet();
} }
hInstance = hinstDLL; // Hang on to this DLL's instance handle. hInstance = hinstDLL; // Hang on to this DLL's instance handle.

2
code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp
Unescape Escape View File

@ -21,7 +21,6 @@
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <vector> #include <vector>
#include <maxversion.h> #include <maxversion.h>
#include "nel/misc/sheet_id.h"
extern ClassDesc2* GetTile_utilityDesc(); extern ClassDesc2* GetTile_utilityDesc();
extern ClassDesc* GetRGBAddDesc(); extern ClassDesc* GetRGBAddDesc();
@ -42,7 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{ {
new NLMISC::CLibraryContext(GetSharedNelContext()); new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Tile Utility: DllMain"); nldebug("NeL Tile Utility: DllMain");
NLMISC::CSheetId::initWithoutSheet();
} }
hInstance = hinstDLL; // Hang on to this DLL's instance handle. hInstance = hinstDLL; // Hang on to this DLL's instance handle.

4
code/nel/tools/sound/build_soundbank/build_soundbank.cpp
Unescape Escape View File

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

4
code/ryzom/client/src/commands.cpp
Unescape Escape View File

@ -5165,14 +5165,14 @@ NLMISC_COMMAND(reloadFogMaps, "Force to reload all the fog maps", "<>")
NLMISC_COMMAND(dumpSounds, "Dump names of all loaded sound", "<>") NLMISC_COMMAND(dumpSounds, "Dump names of all loaded sound", "<>")
{ {
if (!args.empty()) return false; if (!args.empty()) return false;
std::vector<NLMISC::CSheetId> sounds; std::vector<NLMISC::TStringId> sounds;
extern CSoundManager *SoundMngr; extern CSoundManager *SoundMngr;
if (!SoundMngr) return false; if (!SoundMngr) return false;
if (!SoundMngr->getMixer()) return false; if (!SoundMngr->getMixer()) return false;
SoundMngr->getMixer()->getSoundNames(sounds); SoundMngr->getMixer()->getSoundNames(sounds);
for(uint k = 0; k < sounds.size(); ++k) for(uint k = 0; k < sounds.size(); ++k)
{ {
nlinfo(sounds[k].toString()/*NLMISC::CStringMapper::unmap(sounds[k])*/.c_str()); nlinfo(NLMISC::CStringMapper::unmap(sounds[k]).c_str());
} }
return true; return true;
} }

2
code/ryzom/client/src/connection.cpp
Unescape Escape View File

@ -2017,7 +2017,7 @@ public:
virtual void execute (CCtrlBase * /* pCaller */, const string &Params) virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
{ {
string sName = getParam(Params, "name"); string sName = getParam(Params, "name");
CSheetId id = CSheetId(sName, "sound"); TStringId id = CStringMapper::map(sName);
if (SoundMngr != NULL) if (SoundMngr != NULL)
SoundMngr->spawnSource(id,CVector(0,0,0)); SoundMngr->spawnSource(id,CVector(0,0,0));
} }

21
code/ryzom/client/src/init.cpp
Unescape Escape View File

@ -1534,19 +1534,6 @@ void postlogInit()
// set the primitive context // set the primitive context
CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig; CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig;
{
H_AUTO(InitRZShIdI)
nmsg = "Initializing sheets...";
ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
// Initialize Sheet IDs.
CSheetId::init (ClientCfg.UpdatePackedSheet);
initLast = initCurrent;
initCurrent = ryzomGetLocalTime();
}
{ {
H_AUTO(InitRZSound) H_AUTO(InitRZSound)
@ -1597,7 +1584,13 @@ void postlogInit()
} }
{ {
H_AUTO(InitRZSheetL) H_AUTO(InitRZShIdI)
nmsg = "Initializing sheets...";
ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
// Initialize Sheet IDs.
CSheetId::init (ClientCfg.UpdatePackedSheet);
// load packed sheets // load packed sheets
nmsg = "Loading sheets..."; nmsg = "Loading sheets...";

14
code/ryzom/client/src/sound_manager.cpp
Unescape Escape View File

@ -628,17 +628,17 @@ void CSoundManager::init(IProgressCallback *progressCallBack)
// add a new source to the world, attached to the specified entity // add a new source to the world, attached to the specified entity
// return 0 if creation failed, sound id if creation was successful // return 0 if creation failed, sound id if creation was successful
//----------------------------------------------- //-----------------------------------------------
CSoundManager::TSourceId CSoundManager::addSource( const NLMISC::CSheetId &soundName, const NLMISC::CVector &position, bool play, bool loop, const CEntityId &id) CSoundManager::TSourceId CSoundManager::addSource(const NLMISC::TStringId &soundName, const NLMISC::CVector &position, bool play, bool loop, const CEntityId &id)
{ {
uint32 retValue = 0; uint32 retValue = 0;
// Create a source // Create a source
USource *pSource = _AudioMixer->createSource( soundName ); USource *pSource = _AudioMixer->createSource(soundName);
// If the source is valid. // If the source is valid.
if(pSource == 0) if(pSource == 0)
{ {
nlwarning("Sound '%s' not found !", /*CStringMapper::unmap(soundName).c_str()*/soundName.toString().c_str()); nlwarning("Sound '%s' not found !", CStringMapper::unmap(soundName).c_str());
return retValue; return retValue;
} }
@ -676,7 +676,7 @@ CSoundManager::TSourceId CSoundManager::addSource( const NLMISC::CSheetId &sound
// spawn a new source to the world // spawn a new source to the world
// return false if creation failed, true if creation was successful // return false if creation failed, true if creation was successful
//----------------------------------------------- //-----------------------------------------------
bool CSoundManager::spawnSource(const NLMISC::CSheetId &soundName, CSoundContext &context) bool CSoundManager::spawnSource(const NLMISC::TStringId &soundName, CSoundContext &context)
{ {
if (!_PlaySound) return false; if (!_PlaySound) return false;
@ -687,7 +687,7 @@ bool CSoundManager::spawnSource(const NLMISC::CSheetId &soundName, CSoundContext
// If the source is valid. // If the source is valid.
if(pSource == 0) if(pSource == 0)
{ {
nlwarning("Sound '%s' not found !", soundName.toString().c_str()); nlwarning("Sound '%s' not found !", soundName);
return false; return false;
} }
@ -706,7 +706,7 @@ bool CSoundManager::spawnSource(const NLMISC::CSheetId &soundName, CSoundContext
// spawn a new source to the world // spawn a new source to the world
// return false if creation failed, true if creation was successful // return false if creation failed, true if creation was successful
//----------------------------------------------- //-----------------------------------------------
bool CSoundManager::spawnSource(const NLMISC::CSheetId &soundName, const NLMISC::CVector &position) bool CSoundManager::spawnSource(const NLMISC::TStringId &soundName, const NLMISC::CVector &position)
{ {
if (!_PlaySound) return false; if (!_PlaySound) return false;
@ -716,7 +716,7 @@ bool CSoundManager::spawnSource(const NLMISC::CSheetId &soundName, const NLMISC:
// If the source is valid. // If the source is valid.
if(pSource == 0) if(pSource == 0)
{ {
nlwarning("Sound '%s' not found !", /*CStringMapper::unmap(soundName).c_str ()*/soundName.toString().c_str()); nlwarning("Sound '%s' not found !", CStringMapper::unmap(soundName).c_str ());
return false; return false;
} }

7
code/ryzom/client/src/sound_manager.h
Unescape Escape View File

@ -32,7 +32,6 @@
// sound // sound
#include "nel/sound/u_audio_mixer.h" #include "nel/sound/u_audio_mixer.h"
#include "nel/sound/u_listener.h" #include "nel/sound/u_listener.h"
#include "nel/misc/sheet_id.h"
extern class CSoundManager *SoundMngr; extern class CSoundManager *SoundMngr;
@ -89,13 +88,13 @@ public:
/// Return the audio mixer instance pointer. /// Return the audio mixer instance pointer.
NLSOUND::UAudioMixer *getMixer(); NLSOUND::UAudioMixer *getMixer();
TSourceId addSource( const NLMISC::CSheetId &soundName, const NLMISC::CVector &position, bool play = true , bool loop = false, const NLMISC::CEntityId &id = NLMISC::CEntityId::Unknown ); TSourceId addSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position, bool play = true , bool loop = false, const NLMISC::CEntityId &id = NLMISC::CEntityId::Unknown );
/// spawn a new source to the world but sound manager don't keep any link and the sound will be automatically deleted when finnished /// spawn a new source to the world but sound manager don't keep any link and the sound will be automatically deleted when finnished
bool spawnSource (const NLMISC::CSheetId &soundName, NLSOUND::CSoundContext &context); bool spawnSource (const NLMISC::TStringId &soundName, NLSOUND::CSoundContext &context);
/// spawn a new source to the world but sound manager don't keep any link and the sound will be automatically deleted when finnished /// spawn a new source to the world but sound manager don't keep any link and the sound will be automatically deleted when finnished
bool spawnSource( const NLMISC::CSheetId &soundName, const NLMISC::CVector &position ); bool spawnSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position );
/** /**
* remove a source * remove a source

7
code/ryzom/tools/leveldesign/georges_plugin_sound/sound_plugin.cpp
Unescape Escape View File

@ -68,9 +68,6 @@ CSoundPlugin::CSoundPlugin(IEdit *globalInterface)
{ {
AFX_MANAGE_STATE(AfxGetStaticModuleState()); AFX_MANAGE_STATE(AfxGetStaticModuleState());
// Initialize without sheet id bin
NLMISC::CSheetId::initWithoutSheet();
CVector dir; CVector dir;
_GlobalInterface = globalInterface; _GlobalInterface = globalInterface;
@ -340,7 +337,7 @@ void CSoundPlugin::setActiveDocument(IEditDocument *pdoc)
_Dialog.setName(_Filename); _Dialog.setName(_Filename);
// 1st, try to found the sound in the preloaded sound bank. // 1st, try to found the sound in the preloaded sound bank.
_Sound = _Mixer->getSoundId(CSheetId(_Filename, "sound")); _Sound = _Mixer->getSoundId(CStringMapper::map(_Filename));
if (_Sound == NULL) if (_Sound == NULL)
{ {
// not found, create a new one. // not found, create a new one.
@ -540,7 +537,7 @@ void CSoundPlugin::play(std::string &filename)
// point.Name = string("simulation-")+_Sound->getName()+"-000"; // point.Name = string("simulation-")+_Sound->getName()+"-000";
region.VPoints.push_back(point); region.VPoints.push_back(point);
string name = string("simulation-")+NLMISC::CFile::getFilenameWithoutExtension(_Sound->getName().toString())+"-000"; string name = string("simulation-")+CStringMapper::unmap(_Sound->getName())+"-000";
if (region.VPoints.back().checkProperty("name")) if (region.VPoints.back().checkProperty("name"))
region.VPoints.back().removePropertyByName("name"); region.VPoints.back().removePropertyByName("name");

Write Preview
Loading…
Cancel
Save