mirror of
https://github.com/ZDoom/qzdoom.git
synced 2025-05-31 00:51:21 +00:00
- fixed a few Timidity warnings
This commit is contained in:
parent
d9e32eb207
commit
1112a69adb
4 changed files with 7 additions and 6 deletions
|
@ -8,6 +8,10 @@
|
||||||
#include "instrum.h"
|
#include "instrum.h"
|
||||||
#include "sf2.h"
|
#include "sf2.h"
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
#include <strings.h>
|
||||||
|
#define stricmp strcasecmp
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Timidity
|
namespace Timidity
|
||||||
{
|
{
|
||||||
|
|
|
@ -1182,9 +1182,6 @@ int Mixer::recompute_envelope(int v)
|
||||||
/* Envelope ran out. */
|
/* Envelope ran out. */
|
||||||
void Mixer::voice_ran_out(int v)
|
void Mixer::voice_ran_out(int v)
|
||||||
{
|
{
|
||||||
/* Already displayed as dead */
|
|
||||||
int died = (player->voice[v].status == VOICE_DIE);
|
|
||||||
|
|
||||||
player->free_voice(v);
|
player->free_voice(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1624,4 +1621,4 @@ int Mixer::recompute_modulation_envelope(int v)
|
||||||
return modenv_next_stage(v);
|
return modenv_next_stage(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,7 +137,7 @@ Player::Player(Instruments *instr)
|
||||||
temper_adj = 0;
|
temper_adj = 0;
|
||||||
current_play_tempo = 500000;
|
current_play_tempo = 500000;
|
||||||
opt_realtime_playing = 0;
|
opt_realtime_playing = 0;
|
||||||
check_eot_flag;
|
check_eot_flag = 0;
|
||||||
playmidi_seek_flag = 0;
|
playmidi_seek_flag = 0;
|
||||||
opt_pure_intonation = 0;
|
opt_pure_intonation = 0;
|
||||||
current_freq_table = 0;
|
current_freq_table = 0;
|
||||||
|
@ -6040,7 +6040,6 @@ static const struct ctl_chg_types {
|
||||||
|
|
||||||
int Player::convert_midi_control_change(int chn, int type, int val, MidiEvent *ev_ret)
|
int Player::convert_midi_control_change(int chn, int type, int val, MidiEvent *ev_ret)
|
||||||
{
|
{
|
||||||
int etype = -1;
|
|
||||||
for (auto &t : ctl_chg_list)
|
for (auto &t : ctl_chg_list)
|
||||||
{
|
{
|
||||||
if (t.mtype == type)
|
if (t.mtype == type)
|
||||||
|
|
|
@ -40,6 +40,7 @@ struct timidity_file
|
||||||
class SoundFontReaderInterface
|
class SoundFontReaderInterface
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
virtual ~SoundFontReaderInterface() {}
|
||||||
virtual struct timidity_file* open_timidityplus_file(const char* fn) = 0;
|
virtual struct timidity_file* open_timidityplus_file(const char* fn) = 0;
|
||||||
virtual void timidityplus_add_path(const char* path) = 0;
|
virtual void timidityplus_add_path(const char* path) = 0;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue