github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CodeEditor: Fixed C++ highlighting, Core: LinuxBeep added gst-play-1.0

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15358 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-11-04 21:07:37 +00:00
parent 75a12da879
commit bcebd37a62
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CodeEditor/CInit.cpp
View file

@ -24,15 +24,15 @@ void CSyntax::InitKeywords()
"__finally", "__inline", "__int16", "__int32", "__int64",
"__int8", "__leave", "__stdcall", "__try", "__uuidof",
"alignas", "alignof", "and", "and_eq", "asm", "auto",
"bitand", "bitor", "bool", "break","case", "catch",
"bitand", "bitor", "bool", "break", "case", "catch",
"char", "char8_t", "char16_t", "char32_t", "class",
"co_await", "co_return", "co_yield", "compl", "concept",
"const", "const_cast", "consteval", "constexpr", "constinit",
"continue", "decltype", "default", "delete", "dllexport",
"dllimport", "do", "double", "dynamic_cast", "else", "enum",
"explicit", "export", "extern" "false", "final", "float",
"explicit", "export", "extern", "false", "final", "float",
"for", "force_inline", "friend", "goto", "if", "import",
"inline", "int", "long", "module" "mutable", "namespace",
"inline", "int", "long", "module", "mutable", "namespace",
"never_inline", "new", "noexcept", "not", "not_eq", "nullptr",
"operator", "or", "or_eq", "override", "private", "protected",
"public", "register", "reinterpret_cast", "requires", "return",

8
uppsrc/Core/Util.cpp
View file

@ -825,7 +825,7 @@ static void LinuxBeep(const char *name)
{
static String player;
ONCELOCK {
const char *players[] = { "play", "ogg123", "gst123" };
const char *players[] = { "play", "ogg123", "gst123", "gst-play-1.0" };
for(int i = 0; i < __countof(players); i++)
if(Sys("which " + String(players[i])).GetCount()) {
player = players[i];
@ -838,9 +838,9 @@ static void LinuxBeep(const char *name)
IGNORE_RESULT(system(player + " -q " + fn +
(FileExists(fn + ".ogg") ? ".ogg" :
FileExists(fn + ".oga") ? ".oga" :
FileExists(fn + ".wav") ? ".wav" :
".*")
+ " >/dev/null 2>/dev/null&"));
FileExists(fn + ".wav") ? ".wav" :
".*")
+ " >/dev/null 2>/dev/null&"));
}
}