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

Fixed: Display title and artist name from ogg files in music player

Browse source
This commit is contained in:
kervala 2015-11-15 13:13:44 +01:00
parent 2bad77c5fa
commit c210bb0e88
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2690,8 +2690,13 @@ 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))
{ {
// use 3rd party libraries supported formats
IAudioDecoder::getInfo(filename, artist, title);
}
if (!title.empty()) if (!title.empty())
{ {
if (!artist.empty()) result = artist + " - " + title; if (!artist.empty()) result = artist + " - " + title;
@ -2701,10 +2706,14 @@ bool CAudioMixerUser::getSongTitle(const std::string &filename, std::string &res
{ {
result = artist + " - " + CFile::getFilename(filename); result = artist + " - " + CFile::getFilename(filename);
} }
else result = CFile::getFilename(filename); else
{
result = CFile::getFilename(filename);
}
return true; return true;
} }
}
result = "???"; result = "???";
return false; return false;
} }

2
code/ryzom/client/src/interface_v3/music_player.cpp
View file

@ -83,7 +83,7 @@ void CMusicPlayer::play ()
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:mp3_player:screen:text")); CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:mp3_player:screen:text"));
if (pVT) if (pVT)
pVT->setText (_Songs[_CurrentSong].Title); pVT->setText (ucstring::makeFromUtf8(_Songs[_CurrentSong].Title));
} }
} }