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

- cleaned up the includes in timidity.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-24 23:12:38 +02:00
parent d557f609cf
commit dcef3681d4
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,19 +24,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <memory> #include <memory>
#include "templates.h"
#include "cmdlib.h"
#include "c_cvars.h"
#include "c_dispatch.h"
#include "doomerrors.h"
#include "i_system.h"
#include "files.h"
#include "w_wad.h"
#include "i_soundfont.h"
#include "i_musicinterns.h"
#include "v_text.h"
#include "timidity.h" #include "timidity.h"
#include "i_soundfont.h"
#include "timidity_file.h" #include "timidity_file.h"
#include "common.h" #include "common.h"
#include "instrum.h" #include "instrum.h"
@ -615,7 +603,7 @@ int Instruments::LoadDMXGUS(int gus_memsize)
int status = -1; int status = -1;
int gusbank = (gus_memsize >= 1 && gus_memsize <= 4) ? gus_memsize : -1; int gusbank = (gus_memsize >= 1 && gus_memsize <= 4) ? gus_memsize : -1;
data->seek(0, FileReader::SeekSet); data->seek(0, SEEK_SET);
while (data->gets(readbuffer, 1024) && read < size) while (data->gets(readbuffer, 1024) && read < size)
{ {
@ -706,9 +694,7 @@ int Instruments::LoadDMXGUS(int gus_memsize)
return 0; return 0;
} }
DLS_Data *LoadDLS(FILE *src);
void FreeDLS(DLS_Data *data); void FreeDLS(DLS_Data *data);
Renderer::Renderer(float sample_rate, int voices_, Instruments *inst) Renderer::Renderer(float sample_rate, int voices_, Instruments *inst)
{ {
int res = 0; int res = 0;
@ -722,7 +708,7 @@ Renderer::Renderer(float sample_rate, int voices_, Instruments *inst)
voice = NULL; voice = NULL;
adjust_panning_immediately = false; adjust_panning_immediately = false;
control_ratio = clamp(int(rate / CONTROLS_PER_SECOND), 1, MAX_CONTROL_RATIO); control_ratio = std::min(1, std::max(MAX_CONTROL_RATIO, int(rate / CONTROLS_PER_SECOND)));
lost_notes = 0; lost_notes = 0;
cut_notes = 0; cut_notes = 0;