zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 00:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed merge error.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-23 12:59:03 +02:00
parent cfe02cebf1
commit c81e79e635
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/common/audio/music/music.cpp
View file

@ -37,6 +37,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdexcept>
#include "i_sound.h" #include "i_sound.h"
@ -65,19 +66,6 @@ static void S_ActivatePlayList(bool goBack);
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------
// Test if a real file with this name exists with all known extensions for music.
for (auto& ext : knownMusicExts)
{
test.Format("%s.%s", name.GetChars(), ext);
if (FileExists(test)) return test;
#ifdef __unix__
test.Format("%s.%s", name.GetChars(), FString(ext).MakeLower().GetChars());
if (FileExists(test)) return test;
#endif
}
return defmusic;
}
static FileReader DefaultOpenMusic(const char* fn) static FileReader DefaultOpenMusic(const char* fn)
{ {