Changed: Display mp3 music path on sysinfo window.

feature/pre-code-move
Nimetu 5 years ago
parent f8bee17d3c
commit f449bb7c51

@ -378,7 +378,10 @@ public:
virtual void execute(CCtrlBase * /* pCaller */, const string &Params) virtual void execute(CCtrlBase * /* pCaller */, const string &Params)
{ {
if(!SoundMngr) if(!SoundMngr)
{
CInterfaceManager::getInstance()->messageBox (CI18N::get ("uiSoundDisabled"));
return; return;
}
if (Params == "play_songs") if (Params == "play_songs")
{ {
@ -386,19 +389,26 @@ public:
SoundMngr->getMixer()->getMusicExtensions(extensions); SoundMngr->getMixer()->getMusicExtensions(extensions);
// no format supported // no format supported
if (extensions.empty()) return; if (extensions.empty())
std::string message;
for(uint i = 0; i < extensions.size(); ++i)
{ {
message += " " + extensions[i]; // in the very unlikely scenario
const ucstring message("Sound driver has no support for music.");
CInterfaceManager::getInstance()->displaySystemInfo(message, "SYS");
nlinfo("%s", message.toUtf8().c_str());
return;
} }
message += " m3u m3u8"; std::string newPath = CPath::makePathAbsolute(CPath::standardizePath(ClientCfg.MediaPlayerDirectory), CPath::getCurrentPath(), true);
nlinfo("Media player supports: '%s'", message.substr(1).c_str()); std::string extlist;
join(extensions, ", ", extlist);
extlist += ", m3u, m3u8";
std::string msg(CI18N::get("uiMk_system6").toUtf8());
msg += ": " + newPath + " (" + extlist + ")";
CInterfaceManager::getInstance()->displaySystemInfo(ucstring::makeFromUtf8(msg), "SYS");
nlinfo("%s", msg.c_str());
// Recursive scan for files from media directory // Recursive scan for files from media directory
vector<string> filesToProcess; vector<string> filesToProcess;
string newPath = CPath::standardizePath(ClientCfg.MediaPlayerDirectory);
CPath::getPathContent (newPath, true, false, true, filesToProcess); CPath::getPathContent (newPath, true, false, true, filesToProcess);
uint i; uint i;

Loading…
Cancel
Save