From dee80dc90ee849854dc1bc2e7bd1ed02962c29aa Mon Sep 17 00:00:00 2001 From: Nimetu Date: Thu, 25 Aug 2016 22:18:35 +0300 Subject: [PATCH] Merge with develop --- .../data/gamedev/interfaces_v3/compass.xml | 8 +- .../data/gamedev/syui_v3/syui/compass.xml | 8 +- .../client/src/interface_v3/music_player.cpp | 250 +++++++----------- 3 files changed, 99 insertions(+), 167 deletions(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml b/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml index 35a259ea4..3a7694593 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml @@ -8,7 +8,7 @@ - @@ -58,9 +58,9 @@ onclick_l="leave_modal" params_l="" /> - + params="volume=@UI:SAVE:MP3_VOLUME" /> - @@ -58,9 +58,9 @@ onclick_l="leave_modal" params_l="" /> - + params="volume=@UI:SAVE:MP3_VOLUME" /> &filenames) +{ + static uint8 utf8Header[] = { 0xefu, 0xbbu, 0xbfu }; + // Add playlist + uint i; + // Get the path of the playlist + string basePlaylist = CFile::getPath (playlist); + FILE *file = nlfopen (playlist, "r"); + + bool useUtf8 = CFile::getExtension(playlist) == "m3u8"; + if (file) + { + char line[512]; + while (fgets (line, 512, file)) + { + string lineStr = trim(std::string(line)); + + // id a UTF-8 BOM header is present, parse as UTF-8 + if (!useUtf8 && lineStr.length() >= 3 && memcmp(line, utf8Header, 3) == 0) + useUtf8 = true; + + if (!useUtf8) + { + lineStr = ucstring(line).toUtf8(); + lineStr = trim(lineStr); + } + + // Not a comment line + if (lineStr[0] != '#') + { + std::string filepath = CFile::getPath(lineStr); + std::string filename = CFile::getFilename(lineStr); + filenames.push_back (CPath::makePathAbsolute(filepath, basePlaylist)+filename); + } + } + fclose (file); + } +} + +// *************************************************************************** class CMusicPlayerPlaySongs: public IActionHandler { public: @@ -187,192 +229,82 @@ public: // no format supported if (extensions.empty()) return; -#ifdef NL_OS_WINDOWS - // Backup the current directory - string currentPath = CPath::getCurrentPath (); - - // Hardware mouse - bool wasHardware = IsMouseCursorHardware (); - InitMouseWithCursor (true); - Driver->showCursor (true); - bool oggSupported = false; bool mp3Supported = false; + std::string message; for(uint i = 0; i < extensions.size(); ++i) { if (extensions[i] == "ogg") { oggSupported = true; + message += " ogg"; } else if (extensions[i] == "mp3") { mp3Supported = true; + message += " mp3"; } } + message += " m3u m3u8"; + nlinfo("Media player supports: '%s'", message.substr(1).c_str()); - std::vector filters; + // Recursive scan for files from media directory + vector filesToProcess; + string newPath = CPath::standardizePath(MediaPlayerDirectory); + CPath::getPathContent (newPath, true, false, true, filesToProcess); - // supported formats - filters.push_back("All Supported Files"); // TODO: translate + uint i; + std::vector filenames; + std::vector playlists; - std::string filter; - if (mp3Supported) filter += "*.mp3;*.mp2;*.mp1;"; - if (oggSupported) filter += "*.ogg;"; - filter += "*.m3u;*.m3u8"; - - filters.push_back(filter); - - // mp3 format - if (mp3Supported) + for (i = 0; i < filesToProcess.size(); ++i) { - filters.push_back("MPEG Audio Files (*.mp3;*.mp2;*.mp1)"); - filters.push_back("*.mp3;*.mp2;*.mp1"); + std::string ext = toLower(CFile::getExtension(filesToProcess[i])); + if (ext == "ogg") + { + if (oggSupported) + filenames.push_back(filesToProcess[i]); + } + else if (ext == "mp3" || ext == "mp2" || ext == "mp1") + { + if (mp3Supported) + filenames.push_back(filesToProcess[i]); + } + else if (ext == "m3u" || ext == "m3u8") + { + playlists.push_back(filesToProcess[i]); + } } - // ogg format - if (oggSupported) + // Sort songs by filename + sort (filenames.begin(), filenames.end()); + + // Add songs from playlists + for (i = 0; i < playlists.size(); ++i) { - filters.push_back("Vorbis Files (*.ogg)"); - filters.push_back("*.ogg"); + addFromPlaylist(filesToProcess[i], filenames); } - // playlist - filters.push_back("Playlist Files (*.m3u;*.m3u8)"); - filters.push_back("*.m3u;*.m3u8"); - - // all files - filters.push_back("All Files (*.*)"); - filters.push_back("*.*"); - - filters.push_back(""); - - static wchar_t szFilter[1024] = { '\0' }; - - uint offset = 0; - - for(uint i = 0; i < filters.size(); ++i) + // Build the songs array + std::vector songs; + for (i=0; igetMixer()->getSongTitle(filenames[i], song.Title); + songs.push_back (song); } - // Filename buffer - wchar_t buffer[1024]; - buffer[0]=0; - - OPENFILENAMEW ofn; - memset (&ofn, 0, sizeof(OPENFILENAME)); - ofn.lStructSize = sizeof(OPENFILENAME); - ofn.hwndOwner = Driver ? Driver->getDisplay():NULL; - ofn.hInstance = HInstance; - ofn.lpstrFilter = szFilter; - ofn.nFilterIndex = 0; - ofn.lpstrFile = buffer; - ofn.nMaxFile = sizeof(buffer); - ofn.lpstrTitle = (wchar_t*)NLMISC::CI18N::get("uiPlaySongs").c_str(); - ofn.Flags = OFN_OVERWRITEPROMPT|OFN_ALLOWMULTISELECT|OFN_ENABLESIZING|OFN_EXPLORER; - - if (Driver) - Driver->beginDialogMode(); - - if (GetOpenFileNameW (&ofn)) - { - bool useUtf8 = false; - - // Skip the directory name - const wchar_t *bufferPtr = buffer; - - // Multi filename ? - string path; - if (ofn.nFileOffset>wcslen(buffer)) - { - // Backup the path and point to the next filename - path = wideToUtf8(buffer); - path += "\\"; - bufferPtr += wcslen(bufferPtr)+1; - } - - // Get selected files and playlists - std::vector filenames; - std::vector playlists; - while (*bufferPtr) - { - // Concat the directory name with the filename - std::string ext = toLower(CFile::getExtension(wideToUtf8(bufferPtr))); - if (ext == "m3u" || ext == "m3u8") - { - playlists.push_back (path + wideToUtf8(bufferPtr)); - } - else - { - filenames.push_back (path + wideToUtf8(bufferPtr)); - } - - bufferPtr += wcslen(bufferPtr) + 1; - } - - // Sort songs by filename - sort (filenames.begin(), filenames.end()); - - static uint8 utf8Header[] = { 0xefu, 0xbbu, 0xbfu }; - - // Add playlist - uint i; - for (i=0; i= 3 && memcmp(line, utf8Header, 3) == 0) - useUtf8 = true; - - if (!useUtf8) lineStr = ucstring(line).toUtf8(); - - if (lineStr[0] != '#') - filenames.push_back (CPath::makePathAbsolute(lineStr, basePlaylist)); - } - fclose (file); - } - } - - // Build the songs array - std::vector songs; - for (i=0; igetMixer()->getSongTitle(filenames[i], song.Title); - songs.push_back (song); - } - - MusicPlayer.playSongs(songs); - } - - if (Driver) - Driver->endDialogMode(); - - // Restore mouse - InitMouseWithCursor (wasHardware); - Driver->showCursor (wasHardware); - - // Restore current path - CPath::setCurrentPath (currentPath.c_str()); -#endif // NL_OS_WINDOWS + MusicPlayer.playSongs(songs); } else if (Params == "previous") MusicPlayer.previous();