zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- snd_midipatchset and fluid_patchset are now processed through NicePath() for variable

Browse source 
substitution. In addition, on Windows, if they contain no path separator, they will
  automatically have $PROGDIR prepended to them.

SVN r3781 (trunk)
This commit is contained in:
Randy Heit 2012-07-21 03:46:36 +00:00
parent 37dffe210f
commit 12ef53a2ff
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/sound/fmodsound.cpp
View file

@ -1598,6 +1598,7 @@ SoundStream *FMODSoundRenderer::OpenStream(const char *filename_or_data, int fla
FMOD::Sound *stream; FMOD::Sound *stream;
FMOD_RESULT result; FMOD_RESULT result;
bool url; bool url;
FString patches;
InitCreateSoundExInfo(&exinfo); InitCreateSoundExInfo(&exinfo);
mode = FMOD_SOFTWARE | FMOD_2D | FMOD_CREATESTREAM; mode = FMOD_SOFTWARE | FMOD_2D | FMOD_CREATESTREAM;
@ -1614,7 +1615,20 @@ SoundStream *FMODSoundRenderer::OpenStream(const char *filename_or_data, int fla
exinfo.fileoffset = offset; exinfo.fileoffset = offset;
if ((*snd_midipatchset)[0] != '\0') if ((*snd_midipatchset)[0] != '\0')
{ {
exinfo.dlsname = snd_midipatchset; #ifdef _WIN32
// If the path does not contain any path separators, automatically
// prepend $PROGDIR to the path.
if (strcspn(snd_midipatchset, ":/\\") == strlen(snd_midipatchset))
{
patches << "$PROGDIR/" << snd_midipatchset;
patches = NicePath(patches);
}
else
#endif
{
patches = NicePath(snd_midipatchset);
}
exinfo.dlsname = patches;
} }
url = (offset == 0 && length == 0 && strstr(filename_or_data, "://") > filename_or_data); url = (offset == 0 && length == 0 && strstr(filename_or_data, "://") > filename_or_data);

17
src/sound/music_fluidsynth_mididevice.cpp
View file

@ -42,6 +42,7 @@
#include "m_swap.h" #include "m_swap.h"
#include "w_wad.h" #include "w_wad.h"
#include "v_text.h" #include "v_text.h"
#include "cmdlib.h"
// MACROS ------------------------------------------------------------------ // MACROS ------------------------------------------------------------------
@ -471,7 +472,21 @@ int FluidSynthMIDIDevice::LoadPatchSets(const char *patches)
count = 0; count = 0;
while (tok != NULL) while (tok != NULL)
{ {
if (FLUID_FAILED != fluid_synth_sfload(FluidSynth, tok, count == 0)) FString path;
#ifdef _WIN32
// If the path does not contain any path separators, automatically
// prepend $PROGDIR to the path.
if (strcspn(tok, ":/\\") == strlen(tok))
{
path << "$PROGDIR/" << tok;
path = NicePath(path);
}
else
#endif
{
path = NicePath(tok);
}
if (FLUID_FAILED != fluid_synth_sfload(FluidSynth, path, count == 0))
{ {
DPrintf("Loaded patch set %s.\n", tok); DPrintf("Loaded patch set %s.\n", tok);
count++; count++;