mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 15:21:51 +00:00
- commented out the noisy debug messages in Timidity++ so that they do not waste execution time and memory for nothing - there are almost 300 of them.
This commit is contained in:
Christoph Oelckers
parent
d72b87f469
commit
5ce3b00b90
9 changed files with 283 additions and 306 deletions
|
|
@ -836,7 +836,6 @@ set( FASTMATH_SOURCES
|
|||
r_data/models/models.cpp
|
||||
r_data/matrix.cpp
|
||||
# These will be removed later.
|
||||
sound/timiditypp/timidity.cpp
|
||||
sound/timiditypp/w32_a.cpp
|
||||
|
||||
)
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ bool Instruments::load(const char *config)
|
|||
{
|
||||
init_load_soundfont();
|
||||
set_default_instrument();
|
||||
configFileName = config;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#ifndef ___INSTRUM_H_
|
||||
#define ___INSTRUM_H_
|
||||
|
||||
#include <string>
|
||||
#include "common.h"
|
||||
#include "sysdep.h"
|
||||
#include "sffile.h"
|
||||
|
|
@ -230,6 +231,7 @@ struct SampleImporter;
|
|||
|
||||
class Instruments
|
||||
{
|
||||
std::string configFileName;
|
||||
PathList pathlist;
|
||||
|
||||
ToneBank standard_tonebank, standard_drumset;
|
||||
|
|
@ -553,6 +555,11 @@ public:
|
|||
if (def_instr_name) set_default_instrument(def_instr_name);
|
||||
}
|
||||
|
||||
bool checkConfig(const char *filename)
|
||||
{
|
||||
return configFileName.compare(filename) == 0;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -70,7 +70,6 @@ static int current_read_track;
|
|||
static int karaoke_format, karaoke_title_flag;
|
||||
static MidiEvent timesig[256];
|
||||
extern Instruments *instruments;
|
||||
static int32_t midi_restart_time = 0;
|
||||
|
||||
|
||||
extern void free_readmidi(void);
|
||||
|
|
@ -439,8 +438,7 @@ MidiEvent *groom_list(int32_t divisions, int32_t *eventsp, int32_t *samplesp)
|
|||
break;
|
||||
case ME_RESET:
|
||||
gplayer->change_system_mode(meep->event.a);
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "MIDI reset at %d sec",
|
||||
(int)((double)st / playback_rate + 0.5));
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"MIDI reset at %d sec", (int)((double)st / playback_rate + 0.5));
|
||||
for (j = 0; j < MAX_CHANNELS; j++)
|
||||
{
|
||||
if (play_system_mode == XG_SYSTEM_MODE && j % 16 == 9)
|
||||
|
|
@ -1532,38 +1530,27 @@ Instruments *instruments;
|
|||
CRITICAL_SECTION critSect;
|
||||
|
||||
|
||||
int load_midi_file(FileReader *fr)
|
||||
int load_midi_file(FileReader *fr, TimidityPlus::Instruments *inst)
|
||||
{
|
||||
int rc;
|
||||
static int last_rc = RC_OK;
|
||||
MidiEvent *event;
|
||||
int32_t nsamples;
|
||||
|
||||
|
||||
InitializeCriticalSection(&critSect);
|
||||
if (play_mode->open_output() < 0)
|
||||
{
|
||||
return RC_ERROR;
|
||||
}
|
||||
|
||||
instruments = new Instruments;
|
||||
if (instruments->load("timidity.cfg"))
|
||||
{
|
||||
return RC_ERROR;
|
||||
}
|
||||
|
||||
instruments = inst;
|
||||
gplayer = new Player;
|
||||
|
||||
|
||||
/* Set current file information */
|
||||
auto current_file_info = gplayer->get_midi_file_info("zdoom", 1);
|
||||
|
||||
rc = RC_OK;
|
||||
|
||||
|
||||
/* Reset restart offset */
|
||||
midi_restart_time = 0;
|
||||
|
||||
|
||||
rc = play_midi_load_file(fr, &event, &nsamples);
|
||||
if (RC_IS_SKIP_FILE(rc))
|
||||
return RC_ERROR; /* skip playing */
|
||||
|
|
@ -1592,7 +1579,6 @@ void run_midi(int msec)
|
|||
void timidity_close()
|
||||
{
|
||||
delete gplayer;
|
||||
delete instruments;
|
||||
play_mode->close_output();
|
||||
DeleteCriticalSection(&critSect);
|
||||
free_global_mblock();
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ static int set_xg_reverb_type(int msb, int lsb)
|
|||
(msb >= 0x05 && msb <= 0x0F) ||
|
||||
(msb >= 0x14)) /* NO EFFECT */
|
||||
{
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "XG Set Reverb Type (NO EFFECT %d %d)", msb, lsb);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"XG Set Reverb Type (NO EFFECT %d %d)", msb, lsb);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ static int set_xg_reverb_type(int msb, int lsb)
|
|||
if (lsb == 0x02 && msb == 0x02)
|
||||
type = 2; /* Room 3 */
|
||||
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "XG Set Reverb Type (%d)", type);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"XG Set Reverb Type (%d)", type);
|
||||
return type;
|
||||
}
|
||||
|
||||
|
|
@ -173,7 +173,7 @@ static int set_xg_chorus_type(int msb, int lsb)
|
|||
(msb >= 0x45 && msb <= 0x47) ||
|
||||
(msb >= 0x49)) /* NO EFFECT */
|
||||
{
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "XG Set Chorus Type (NO EFFECT %d %d)", msb, lsb);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"XG Set Chorus Type (NO EFFECT %d %d)", msb, lsb);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -235,7 +235,7 @@ static int set_xg_chorus_type(int msb, int lsb)
|
|||
}
|
||||
}
|
||||
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "XG Set Chorus Type (%d)", type);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"XG Set Chorus Type (%d)", type);
|
||||
return type;
|
||||
}
|
||||
|
||||
|
|
@ -555,7 +555,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
for (ent = addlow; body <= body_end; body++, ent++) {
|
||||
switch (ent) {
|
||||
case 0x00: /* Element Reserve */
|
||||
/* ctl_cmsg(CMSG_INFO, VERB_NOISY, "Element Reserve is not supported. (CH:%d VAL:%d)", p, *body); */
|
||||
/* //ctl_cmsg(CMSG_INFO,VERB_NOISY,"Element Reserve is not supported. (CH:%d VAL:%d)", p, *body); */
|
||||
break;
|
||||
|
||||
case 0x01: /* bank select MSB */
|
||||
|
|
@ -941,7 +941,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
break;
|
||||
|
||||
case 0x59: /* AC1 Controller Number */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "AC1 Controller Number is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"AC1 Controller Number is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
break;
|
||||
|
||||
case 0x5A: /* AC1 Pitch Control */
|
||||
|
|
@ -975,7 +975,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
break;
|
||||
|
||||
case 0x60: /* AC2 Controller Number */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "AC2 Controller Number is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"AC2 Controller Number is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
break;
|
||||
|
||||
case 0x61: /* AC2 Pitch Control */
|
||||
|
|
@ -1017,19 +1017,19 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events++;
|
||||
|
||||
case 0x69: /* Pitch EG Initial Level */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Pitch EG Initial Level is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Pitch EG Initial Level is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
break;
|
||||
|
||||
case 0x6A: /* Pitch EG Attack Time */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Pitch EG Attack Time is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Pitch EG Attack Time is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
break;
|
||||
|
||||
case 0x6B: /* Pitch EG Release Level */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Pitch EG Release Level is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Pitch EG Release Level is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
break;
|
||||
|
||||
case 0x6C: /* Pitch EG Release Time */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Pitch EG Release Time is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Pitch EG Release Time is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
break;
|
||||
|
||||
case 0x6D: /* Velocity Limit Low */
|
||||
|
|
@ -1043,11 +1043,11 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
break;
|
||||
|
||||
case 0x70: /* Bend Pitch Low Control */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Bend Pitch Low Control is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Bend Pitch Low Control is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
break;
|
||||
|
||||
case 0x71: /* Filter EG Depth */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Filter EG Depth is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Filter EG Depth is not supported. (CH:%d VAL:%d)", p, *body);
|
||||
break;
|
||||
|
||||
case 0x72: /* EQ BASS */
|
||||
|
|
@ -1079,7 +1079,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
break;
|
||||
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported XG Bulk Dump SysEx. (ADDR:%02X %02X %02X VAL:%02X)", addhigh, addlow, ent, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported XG Bulk Dump SysEx. (ADDR:%02X %02X %02X VAL:%02X)", addhigh, addlow, ent, *body);
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
|
|
@ -1144,7 +1144,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events += 3;
|
||||
break;
|
||||
case 0x03: /* Alternate Group */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Alternate Group is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Alternate Group is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
break;
|
||||
case 0x04: /* Pan */
|
||||
SETMIDIEVENT(evm[num_events], 0, ME_NRPN_MSB, dp, 0x1C, SYSEX_TAG);
|
||||
|
|
@ -1171,7 +1171,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events += 3;
|
||||
break;
|
||||
case 0x08: /* Key Assign */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Key Assign is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Key Assign is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
break;
|
||||
case 0x09: /* Rcv Note Off */
|
||||
SETMIDIEVENT(evm[num_events], 0, ME_SYSEX_MSB, dp, note, 0);
|
||||
|
|
@ -1234,16 +1234,16 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events += 3;
|
||||
break;
|
||||
case 0x50: /* High Pass Filter Cutoff Frequency */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "High Pass Filter Cutoff Frequency is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"High Pass Filter Cutoff Frequency is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
break;
|
||||
case 0x60: /* Velocity Pitch Sense */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Velocity Pitch Sense is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Velocity Pitch Sense is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
break;
|
||||
case 0x61: /* Velocity LPF Cutoff Sense */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Velocity LPF Cutoff Sense is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Velocity LPF Cutoff Sense is not supported. (CH:%d NOTE:%d VAL:%d)", dp, note, *body);
|
||||
break;
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported XG Bulk Dump SysEx. (ADDR:%02X %02X %02X VAL:%02X)", addhigh, addmid, ent, *body);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported XG Bulk Dump SysEx. (ADDR:%02X %02X %02X VAL:%02X)", addhigh, addmid, ent, *body);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1276,7 +1276,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
checksum += val[i];
|
||||
}
|
||||
if (((128 - (checksum & 0x7F)) & 0x7F) != val[gslen - 1]) {
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "GS SysEx: Checksum Error.");
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"GS SysEx: Checksum Error.");
|
||||
return num_events;
|
||||
}
|
||||
|
||||
|
|
@ -1439,10 +1439,10 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events++;
|
||||
break;
|
||||
case 0x1F: /* CC1 Controller Number */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "CC1 Controller Number is not supported. (CH:%d VAL:%d)", p, val[7]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"CC1 Controller Number is not supported. (CH:%d VAL:%d)", p, val[7]);
|
||||
break;
|
||||
case 0x20: /* CC2 Controller Number */
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "CC2 Controller Number is not supported. (CH:%d VAL:%d)", p, val[7]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"CC2 Controller Number is not supported. (CH:%d VAL:%d)", p, val[7]);
|
||||
break;
|
||||
case 0x21: /* Chorus Send Level */
|
||||
SETMIDIEVENT(evm[0], 0, ME_CHORUS_EFFECT, p, val[7], SYSEX_TAG);
|
||||
|
|
@ -1527,7 +1527,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events += 12;
|
||||
break;
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1801,7 +1801,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events++;
|
||||
break;
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1918,7 +1918,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events++;
|
||||
break;
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1941,7 +1941,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events++;
|
||||
break;
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -2065,7 +2065,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events++;
|
||||
break;
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -2088,7 +2088,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events++;
|
||||
break;
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -2141,7 +2141,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
num_events += 3;
|
||||
break;
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
|
@ -2216,7 +2216,7 @@ int SysexConvert::parse_sysex_event_multi(uint8_t *val, int32_t len, MidiEvent *
|
|||
break;
|
||||
#endif
|
||||
default:
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Unsupported GS SysEx. (ADDR:%02X %02X %02X VAL:%02X %02X)", addr_h, addr_m, addr_l, val[7], val[8]);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -2117,7 +2117,7 @@ void Reverb::alloc_effect(EffectList *ef)
|
|||
ef->info = safe_malloc(ef->engine->info_size);
|
||||
memset(ef->info, 0, ef->engine->info_size);
|
||||
|
||||
/* ctl_cmsg(CMSG_INFO, VERB_NOISY, "Effect Engine: %s", ef->engine->name); */
|
||||
/* //ctl_cmsg(CMSG_INFO,VERB_NOISY,"Effect Engine: %s", ef->engine->name); */
|
||||
}
|
||||
|
||||
/*! allocate new effect item and add it into the tail of effect list.
|
||||
|
|
@ -4153,7 +4153,7 @@ void Reverb::set_effect_param_xg(struct effect_xg_t *st, int type_msb, int type_
|
|||
for (j = 0; j < 10; j++) {
|
||||
st->param_msb[j] = effect_parameter_xg[i].param_msb[j];
|
||||
}
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "XG EFX: %s", effect_parameter_xg[i].name);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"XG EFX: %s", effect_parameter_xg[i].name);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -4167,7 +4167,7 @@ void Reverb::set_effect_param_xg(struct effect_xg_t *st, int type_msb, int type_
|
|||
for (j = 0; j < 10; j++) {
|
||||
st->param_msb[j] = effect_parameter_xg[i].param_msb[j];
|
||||
}
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "XG EFX: %s", effect_parameter_xg[i].name);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"XG EFX: %s", effect_parameter_xg[i].name);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -4346,7 +4346,7 @@ void Reverb::set_effect_param_gs(struct insertion_effect_gs_t *st, int msb, int
|
|||
for (j = 0; j < 20; j++) {
|
||||
st->parameter[j] = effect_parameter_gs[i].param[j];
|
||||
}
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "GS EFX: %s", effect_parameter_gs[i].name);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"GS EFX: %s", effect_parameter_gs[i].name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ int Instruments::import_wave_load(char *sample_file, Instrument *inst)
|
|||
close_file(tf);
|
||||
return 1;
|
||||
}
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Loading WAV: %s", sample_file);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Loading WAV: %s", sample_file);
|
||||
state = chunk_flags = 0;
|
||||
type_index = 4, type_size = 8;
|
||||
for(;;) {
|
||||
|
|
@ -349,8 +349,7 @@ int Instruments::import_wave_load(char *sample_file, Instrument *inst)
|
|||
frames = chunk_size / format.wBlockAlign;
|
||||
inst->samples = samples = format.wChannels;
|
||||
inst->sample = (Sample *)safe_malloc(sizeof(Sample) * samples);
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Format: %d-bits %dHz %dch, %d frames",
|
||||
format.wBitsPerSample, format.dwSamplesPerSec, samples, frames);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Format: %d-bits %dHz %dch, %d frames", format.wBitsPerSample, format.dwSamplesPerSec, samples, frames);
|
||||
initialize_sample(inst, frames, format.wBitsPerSample, format.dwSamplesPerSec);
|
||||
/* load waveform data */
|
||||
for(i = 0; i < samples; i++)
|
||||
|
|
@ -489,8 +488,7 @@ static int read_WAVSamplerChunk(struct timidity_file *tf, WAVSamplerChunk *smpl,
|
|||
ctl_cmsg(CMSG_WARNING, VERB_NOISY, "Bad sampler chunk length");
|
||||
if (tf_seek(tf, psize, SEEK_CUR) == -1)
|
||||
goto fail;
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Sampler: %dns/frame, note=%d, loops=%d",
|
||||
smpl->dwSamplePeriod, smpl->dwMIDIUnityNote, loopCount);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Sampler: %dns/frame, note=%d, loops=%d", smpl->dwSamplePeriod, smpl->dwMIDIUnityNote, loopCount);
|
||||
return 1;
|
||||
fail:
|
||||
ctl_cmsg(CMSG_WARNING, VERB_VERBOSE, "Unable to read sampler chunk");
|
||||
|
|
@ -603,7 +601,7 @@ int Instruments::import_aiff_load(char *sample_file, Instrument *inst)
|
|||
return 1;
|
||||
}
|
||||
compressed = buf[8 + 3] == 'C';
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Loading AIFF: %s", sample_file);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Loading AIFF: %s", sample_file);
|
||||
type_index = 4, type_size = 8;
|
||||
chunk_flags = 0;
|
||||
sound.inst = inst;
|
||||
|
|
@ -750,8 +748,7 @@ int Instruments::import_aiff_load(char *sample_file, Instrument *inst)
|
|||
goto fail;
|
||||
comm->sampleRate = ConvertFromIeeeExtended(sampleRate);
|
||||
csize -= 8 + 10;
|
||||
ctl_cmsg(CMSG_INFO, VERB_NOISY, "Format: %d-bits %dHz %dch, %d frames",
|
||||
comm->sampleSize, (int)comm->sampleRate, comm->numChannels, comm->numSampleFrames);
|
||||
//ctl_cmsg(CMSG_INFO,VERB_NOISY,"Format: %d-bits %dHz %dch, %d frames", comm->sampleSize, (int)comm->sampleRate, comm->numChannels, comm->numSampleFrames);
|
||||
if (compressed)
|
||||
{
|
||||
READ_LONG_BE(compressionType);
|
||||
|
|
|
|||
|
|
@ -44,11 +44,10 @@ namespace TimidityPlus
|
|||
#define BE_LONG(x) BigLong(x)
|
||||
|
||||
/* max_channels is defined in "timidity.h" */
|
||||
#if MAX_CHANNELS <= 32
|
||||
typedef struct _ChannelBitMask
|
||||
{
|
||||
uint32_t b; /* 32-bit bitvector */
|
||||
} ChannelBitMask;
|
||||
typedef struct _ChannelBitMask
|
||||
{
|
||||
uint32_t b; /* 32-bit bitvector */
|
||||
} ChannelBitMask;
|
||||
#define CLEAR_CHANNELMASK(bits) ((bits).b = 0)
|
||||
#define FILL_CHANNELMASK(bits) ((bits).b = ~0)
|
||||
#define IS_SET_CHANNELMASK(bits, c) ((bits).b & (1u << (c)))
|
||||
|
|
@ -58,7 +57,6 @@ namespace TimidityPlus
|
|||
#define COPY_CHANNELMASK(dest, src) ((dest).b = (src).b)
|
||||
#define REVERSE_CHANNELMASK(bits) ((bits).b = ~(bits).b)
|
||||
#define COMPARE_CHANNELMASK(bitsA, bitsB) ((bitsA).b == (bitsB).b)
|
||||
#endif
|
||||
|
||||
typedef int16_t sample_t;
|
||||
typedef int32_t final_volume_t;
|
||||
|
|
|
|||
Loading…
Reference in a new issue