|
|
@ -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
|
|
|
|
return true;
|
|
|
|
{
|
|
|
|
|
|
|
|
result = CFile::getFilename(filename);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
result = "???";
|
|
|
|
result = "???";
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|