OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed some ZDoomd dependencies from Timidity(GUS) backend

Browse source 
* use std::string instead of FString
* replaced the single use of clamp with std::min/std::max.
* copied MAKE_ID macro into the source.
* use snprintf instead of mysnprintf
* use std::runtime_error instead of I_Error to abort on failed memory allocations.
This commit is contained in:
Christoph Oelckers 2019-09-24 11:07:32 +02:00
commit fea0f77905
9 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/sound/timidity/timidity.cpp
View file

@ -65,7 +65,7 @@ namespace Timidity
ToneBank *tonebank[MAXBANK], *drumset[MAXBANK];
static FString def_instr_name;
static std::string def_instr_name;
std::unique_ptr<FSoundFontReader> gus_sfreader;
static bool InitReader(const char *config_file)
@ -733,8 +733,8 @@ Renderer::Renderer(float sample_rate, const char *args)
default_instrument = NULL;
default_program = DEFAULT_PROGRAM;
if (def_instr_name.IsNotEmpty())
set_default_instrument(def_instr_name);
if (def_instr_name.length() > 0)
set_default_instrument(def_instr_name.c_str());
voices = MAX(*midi_voices, 16);
voice = new Voice[voices];