Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Get length of song in FMod driver too (issue #59)

Browse source
This commit is contained in:
kervala 2016-09-03 10:03:33 +02:00
parent 2c38ac8e2e
commit dd88ab208c
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/driver/sound_driver.h
View file

@ -192,7 +192,7 @@ public:
* \param artist returns the song artist (empty if not available) * \param artist returns the song artist (empty if not available)
* \param title returns the title (empty if not available) * \param title returns the title (empty if not available)
*/ */
virtual bool getMusicInfo(const std::string &/* filepath */, std::string &artist, std::string &title) { artist.clear(); title.clear(); return false; } virtual bool getMusicInfo(const std::string &/* filepath */, std::string &artist, std::string &title, float &length) { artist.clear(); title.clear(); length = 0.f; return false; }
/// Get audio/container extensions that are supported natively by the driver implementation. /// Get audio/container extensions that are supported natively by the driver implementation.
virtual void getMusicExtensions(std::vector<std::string> &extensions) const = 0; virtual void getMusicExtensions(std::vector<std::string> &extensions) const = 0;
/// Return if a music extension is supported by the driver's music channel. /// Return if a music extension is supported by the driver's music channel.

2
code/nel/src/sound/audio_mixer_user.cpp
View file

@ -2691,7 +2691,7 @@ bool CAudioMixerUser::getSongTitle(const std::string &filename, std::string &res
std::string artist; std::string artist;
std::string title; std::string title;
if (!_SoundDriver->getMusicInfo(filename, artist, title)) if (!_SoundDriver->getMusicInfo(filename, artist, title, length))
{ {
// use 3rd party libraries supported formats // use 3rd party libraries supported formats
IAudioDecoder::getInfo(filename, artist, title, length); IAudioDecoder::getInfo(filename, artist, title, length);

2
code/nel/src/sound/driver/dsound/sound_driver_dsound.h
View file

@ -115,7 +115,7 @@ public:
* \param artist returns the song artist (empty if not available) * \param artist returns the song artist (empty if not available)
* \param title returns the title (empty if not available) * \param title returns the title (empty if not available)
*/ */
virtual bool getMusicInfo(const std::string & /* filepath */, std::string &artist, std::string &title) { artist.clear(); title.clear(); return false; } virtual bool getMusicInfo(const std::string & /* filepath */, std::string &artist, std::string &title, float &length) { artist.clear(); title.clear(); length = 0.f; return false; }
private: private:

4
code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
View file

@ -496,7 +496,7 @@ bool getTag (std::string &result, const char *tag, FSOUND_STREAM *stream)
* \param artist returns the song artist (empty if not available) * \param artist returns the song artist (empty if not available)
* \param title returns the title (empty if not available) * \param title returns the title (empty if not available)
*/ */
bool CSoundDriverFMod::getMusicInfo(const std::string &filepath, std::string &artist, std::string &title) bool CSoundDriverFMod::getMusicInfo(const std::string &filepath, std::string &artist, std::string &title, float &length)
{ {
/* Open a stream, get the tag if it exists, close the stream */ /* Open a stream, get the tag if it exists, close the stream */
string pathName = CPath::lookup(filepath, false); string pathName = CPath::lookup(filepath, false);
@ -526,6 +526,8 @@ bool CSoundDriverFMod::getMusicInfo(const std::string &filepath, std::string &ar
{ {
getTag(artist, "ARTIST", stream); getTag(artist, "ARTIST", stream);
getTag(title, "TITLE", stream); getTag(title, "TITLE", stream);
// get length of the music in seconds
length = (float)FSOUND_Stream_GetLengthMs(stream) / 1000.f;
FSOUND_Stream_Close(stream); FSOUND_Stream_Close(stream);
return true; return true;
} }

2
code/nel/src/sound/driver/fmod/sound_driver_fmod.h
View file

@ -116,7 +116,7 @@ public:
* \param artist returns the song artist (empty if not available) * \param artist returns the song artist (empty if not available)
* \param title returns the title (empty if not available) * \param title returns the title (empty if not available)
*/ */
virtual bool getMusicInfo(const std::string &filepath, std::string &artist, std::string &title); virtual bool getMusicInfo(const std::string &filepath, std::string &artist, std::string &title, float &length);
// also check that the channel still exist (avoid any free problem) // also check that the channel still exist (avoid any free problem)
void markMusicChannelEnded(void *stream, CMusicChannelFMod *musicChannel); void markMusicChannelEnded(void *stream, CMusicChannelFMod *musicChannel);