From f449bb7c519e95e5cadd4e63eec1849c47855163 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Sun, 15 Mar 2020 13:28:12 +0200 Subject: [PATCH 1/5] Changed: Display mp3 music path on sysinfo window. --- .../client/src/interface_v3/music_player.cpp | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/music_player.cpp b/code/ryzom/client/src/interface_v3/music_player.cpp index 77d3fd698..2deaa965b 100644 --- a/code/ryzom/client/src/interface_v3/music_player.cpp +++ b/code/ryzom/client/src/interface_v3/music_player.cpp @@ -378,7 +378,10 @@ public: virtual void execute(CCtrlBase * /* pCaller */, const string &Params) { if(!SoundMngr) + { + CInterfaceManager::getInstance()->messageBox (CI18N::get ("uiSoundDisabled")); return; + } if (Params == "play_songs") { @@ -386,19 +389,26 @@ public: SoundMngr->getMixer()->getMusicExtensions(extensions); // no format supported - if (extensions.empty()) return; - - std::string message; - for(uint i = 0; i < extensions.size(); ++i) + if (extensions.empty()) { - 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"; - nlinfo("Media player supports: '%s'", message.substr(1).c_str()); + std::string newPath = CPath::makePathAbsolute(CPath::standardizePath(ClientCfg.MediaPlayerDirectory), CPath::getCurrentPath(), true); + 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 vector filesToProcess; - string newPath = CPath::standardizePath(ClientCfg.MediaPlayerDirectory); CPath::getPathContent (newPath, true, false, true, filesToProcess); uint i; From 6afd9ea1f2f72e5483a14aa63ac9ae6dad0c090e Mon Sep 17 00:00:00 2001 From: Nimetu Date: Mon, 23 Mar 2020 18:10:38 +0200 Subject: [PATCH 2/5] Fixed: invalid assignment --- code/nel/src/gui/group_html.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp index 8009c5ac8..50b381a3c 100644 --- a/code/nel/src/gui/group_html.cpp +++ b/code/nel/src/gui/group_html.cpp @@ -5178,7 +5178,7 @@ namespace NLGUI if (low < min) low = min; if (high > max) - max = max; + high = max; } float CGroupHTML::HTMLMeterElement::getValueRatio() const From e1dff3b4b8667499c5c7a5fb4e09b0537a0eb96e Mon Sep 17 00:00:00 2001 From: Nimetu Date: Tue, 24 Mar 2020 19:09:38 +0200 Subject: [PATCH 3/5] Fixed: typo --- code/nel/include/nel/misc/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/include/nel/misc/debug.h b/code/nel/include/nel/misc/debug.h index 7d4ddcd1b..fa32e6b96 100644 --- a/code/nel/include/nel/misc/debug.h +++ b/code/nel/include/nel/misc/debug.h @@ -371,7 +371,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); #if defined(_MSC_VER) && _MSC_VER >= 1900 #define nlassume(exp) do { __analysis_assume(exp); } while (0) // __analysis_assume doesn't evaluate the expression at runtime #else -#define nlassume(exp) do { ) while (0) +#define nlassume(exp) do { } while (0) #endif #ifdef NL_NO_DEBUG From f78decc6ad175f0956bbd2bfad54ab5b4d6079a4 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Thu, 26 Mar 2020 12:49:14 +0200 Subject: [PATCH 4/5] Fixed: typo --- code/nel/include/nel/misc/base64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/include/nel/misc/base64.h b/code/nel/include/nel/misc/base64.h index 4c5c2babd..2d61cf254 100644 --- a/code/nel/include/nel/misc/base64.h +++ b/code/nel/include/nel/misc/base64.h @@ -16,7 +16,7 @@ #ifndef NL_BASE64_H -#define NL_BASE64_h +#define NL_BASE64_H namespace NLMISC { From 14076b899d633bbbe3cfc78dc297e297f4fbffa2 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Thu, 26 Mar 2020 23:15:26 +0200 Subject: [PATCH 5/5] Fixed: compiling ryzom installer --- code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index c194cef6c..a1380407c 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -28,7 +28,7 @@ #include "filesextractor.h" #include "filescleaner.h" -#include "seven_zip.h" +#include "nel/misc/seven_zip.h" #if defined(Q_OS_WIN32) && defined(QT_WINEXTRAS_LIB) #include