コミット: b9e532e6acd0b93a5960405adcc3eb1b6d959bb2 - timidity41 (git)

コミットメタ情報

• リビジョン: b9e532e6acd0b93a5960405adcc3eb1b6d959bb2 (tree)
• 日時: 2019-09-05 10:50:33
• 作者: Starg <starg@user...>
• コミッター: Starg

ログメッセージ

Add support for round robin

変更サマリ

• modified: timidity/instrum.c
• modified: timidity/instrum.h
• modified: timidity/playmidi.c
• modified: timidity/playmidi.h
• modified: timidity/sfz.cpp
• modified: timidity/smplfile.c
• modified: timidity/timidity.c

差分

--- a/timidity/instrum.c
+++ b/timidity/instrum.c
@@ -940,6 +940,14 @@ static void apply_bank_parameter(Instrument *ip, ToneBankElement *tone)
 				}
 			}
 	}
+	if (tone->seq_length > 0)
+		for (i = 0; i < ip->samples; i++) {
+			ip->sample[i].seq_length = tone->seq_length;
+		}
+	if (tone->seq_position > 0)
+		for (i = 0; i < ip->samples; i++) {
+			ip->sample[i].seq_position = tone->seq_position;
+		}
 }
 
 #define READ_CHAR(thing) { \
@@ -2458,6 +2466,8 @@ static void init_tone_bank_element(ToneBankElement *tone)
 	tone->sample_pan = -1;
 	tone->sample_width = -1;
 	tone->vfxe_num = 0;
+	tone->seq_length = 0;
+	tone->seq_position = 0;
 }
 
 ///r

--- a/timidity/instrum.h
+++ b/timidity/instrum.h
@@ -77,7 +77,10 @@ typedef struct _Sample {
   int vfx[VOICE_EFFECT_NUM][VOICE_EFFECT_PARAM_NUM];
   int8 keep_voice;
   int8 def_pan;
-  FLOAT_T sample_pan; 
+  FLOAT_T sample_pan;
+
+  int32 seq_length;	/* length of the round robin, 0 == disabled */
+  int32 seq_position;	/* 1-based position within the round robin, 0 == disabled */
 } Sample;
 
 ///r
@@ -203,6 +206,8 @@ typedef struct {
 	int8 element_num;
 	int8 def_pan;
 	int sample_pan, sample_width;
+	int32 seq_length;
+	int32 seq_position;
 } ToneBankElement;
 
 #define MAGIC_ERROR_INSTRUMENT ((Instrument *)(-1))

--- a/timidity/playmidi.c
+++ b/timidity/playmidi.c
@@ -377,7 +377,7 @@ static double compensation_ratio = 1.0; /* compensation ratio */
 static int32 compute_skip_count = -1; // def use do_compute_data_midi()
 
 static int find_samples(MidiEvent *, int *);
-static int select_play_sample(Sample *, int, int *, int *, MidiEvent *, int);
+static int select_play_sample(Sample *, int, int *, int *, MidiEvent *, int, int);
 static double get_play_note_ratio(int, int);
 static int find_voice(MidiEvent *);
 static void finish_note(int i);
@@ -719,6 +719,14 @@ void free_playmidi(void)
 		}
 	}
 #endif
+
+	for(i = 0; i < MAX_CHANNELS; i++){
+		for (int j = 0; j < MAX_ELEMENT; j++) {
+			safe_free(channel[i].seq_counters[j]);
+			channel[i].seq_counters[j] = NULL;
+			channel[i].seq_num_counters[j] = 0;
+		}
+	}
 	
 #ifdef VOICE_EFFECT
 	if (!voice)
@@ -1243,6 +1251,11 @@ static void initialize_controllers(int c)
 	memset(channel[c].reverb_part_param, 0, sizeof(channel[c].reverb_part_param));
 	channel[c].reverb_part_efx_level = 100;
 	
+	for (int i = 0; i < MAX_ELEMENT; i++) {
+		safe_free(channel[c].seq_counters[i]);
+		channel[c].seq_counters[i] = NULL;
+		channel[c].seq_num_counters[i] = 0;
+	}
 }
 
 /* Process the Reset All Controllers event CC#121 */
@@ -3138,7 +3151,7 @@ static int find_samples(MidiEvent *e, int *vlist)
 		}
 		note = e->a + channel[ch].key_shift + note_key_offset;
 		note = (note < 0) ? 0 : ((note > 127) ? 127 : note);
-		return select_play_sample(s->sample, s->samples, &note, vlist, e, nv);
+		return select_play_sample(s->sample, s->samples, &note, vlist, e, nv, 0);
 	}
 	bank = channel[ch].bank;
 	if (ISDRUMCHANNEL(ch)) {
@@ -3164,7 +3177,7 @@ static int find_samples(MidiEvent *e, int *vlist)
 			if (ip->sample->note_to_use)
 				note = ip->sample->note_to_use;
 			nvo = nv;
-			nv = select_play_sample(ip->sample, ip->samples, &note, vlist, e, nv);
+			nv = select_play_sample(ip->sample, ip->samples, &note, vlist, e, nv, elm);
 			nvt += nv;
 			/* Replace the sample if the sample is cached. */
 			if (! prescanning_flag) {
@@ -3189,7 +3202,7 @@ static int find_samples(MidiEvent *e, int *vlist)
 		ip = default_instrument;
 		note = ((ip->sample->note_to_use) ? ip->sample->note_to_use : e->a) + channel[ch].key_shift + note_key_offset;
 		note = (note < 0) ? 0 : ((note > 127) ? 127 : note);
-		nv = select_play_sample(ip->sample, ip->samples, &note, vlist, e, nv);
+		nv = select_play_sample(ip->sample, ip->samples, &note, vlist, e, nv, 0);
 		nvt += nv;
 	} else {
 		instrument_map(channel[ch].mapID, &bank, &prog);
@@ -3206,7 +3219,7 @@ static int find_samples(MidiEvent *e, int *vlist)
 			note = ((ip->sample->note_to_use) ? ip->sample->note_to_use : e->a) + channel[ch].key_shift + note_key_offset;
 			note = (note < 0) ? 0 : ((note > 127) ? 127 : note);
 			nvo = nv;
-			nv = select_play_sample(ip->sample, ip->samples, &note, vlist, e, nv);
+			nv = select_play_sample(ip->sample, ip->samples, &note, vlist, e, nv, elm);
 			nvt += nv;
 			/* Replace the sample if the sample is cached. */
 			if (! prescanning_flag) {
@@ -3257,7 +3270,7 @@ elm_max : 
 }
 ///r
 static int select_play_sample(Sample *splist,
-		int nsp, int *note, int *vlist, MidiEvent *e, int nv)
+		int nsp, int *note, int *vlist, MidiEvent *e, int nv, int elm)
 {
 	int ch = e->channel, kn = e->a & 0x7f, vel = e->b;
 	int32 f, fs, ft, fst, fc, fr, cdiff, diff, sample_link;
@@ -3340,6 +3353,15 @@ static int select_play_sample(Sample *splist,
 		vel = rvel;
 	}
 #endif
+
+	// allocate round robin counters
+	if (channel[ch].seq_num_counters[elm] == 0) {
+		channel[ch].seq_num_counters[elm] = nsp;
+		channel[ch].seq_counters[elm] = (int32 *)safe_malloc(sizeof(int32) * nsp);
+		for (int i = 0; i < nsp; i++)
+			channel[ch].seq_counters[elm][i] = 1;
+	}
+
 #if 1
 /*
 ƒTƒ“ƒvƒ‹Žw’è‚Í ƒm[ƒiƒ“ƒo[,ƒxƒƒVƒeƒB ‚ªŠeƒŒƒ“ƒW“à‚É‚ ‚é‚à‚Ì‘S‚Ä
@@ -3348,6 +3370,18 @@ static int select_play_sample(Sample *splist,
 	for (i = 0, sp = splist; i < nsp; i++, sp++) {
 		if (((sp->low_key <= *note && sp->high_key >= *note))
 			&& sp->low_vel <= vel && sp->high_vel >= vel) {	
+
+			if (sp->seq_length > 0) {
+				int32 seq_count = channel[ch].seq_counters[elm][i];
+				channel[ch].seq_counters[elm][i]++;
+
+				if (channel[ch].seq_counters[elm][i] > sp->seq_length)
+					channel[ch].seq_counters[elm][i] = 1;
+
+				if (seq_count != sp->seq_position)
+					continue;
+			}
+
 			/* GUS/SF2 - Scale Tuning */
 			if ((sf = sp->scale_factor) != 1024) {
 				sn = sp->scale_freq;
@@ -5855,6 +5889,13 @@ void midi_program_change(int ch, int prog)
 		newbank = channel[ch].bank_msb;
 		break;
 	}
+
+	for (int i = 0; i < MAX_ELEMENT; i++) {
+		safe_free(channel[ch].seq_counters[i]);
+		channel[ch].seq_counters[i] = NULL;
+		channel[ch].seq_num_counters[i] = 0;
+	}
+
 	if (dr) {
 		channel[ch].bank = prog;	// newbank is ignored
 		channel[ch].program = prog;

--- a/timidity/playmidi.h
+++ b/timidity/playmidi.h
@@ -484,6 +484,8 @@ typedef struct {
   uint8 detune_param;
   FLOAT_T detune; /* in Hz */
 
+  int32 *seq_counters[MAX_ELEMENT];
+  int seq_num_counters[MAX_ELEMENT];
 } Channel;
 
 /* Causes the instrument's default panning to be used. */

--- a/timidity/sfz.cpp
+++ b/timidity/sfz.cpp
@@ -827,6 +827,8 @@ enum class OpCodeKind
     Pan,
     PitchKeyCenter,
     Sample,
+    SequenceLength,
+    SequencePosition,
     Transpose,
     Trigger,
     Tune,
@@ -989,6 +991,8 @@ public:
                         case OpCodeKind::LoVelocity:
                         case OpCodeKind::Offset:
                         case OpCodeKind::Pan:
+                        case OpCodeKind::SequenceLength:
+                        case OpCodeKind::SequencePosition:
                         case OpCodeKind::Transpose:
                         case OpCodeKind::Tune:
                         case OpCodeKind::Volume:
@@ -1136,6 +1140,8 @@ private:
             {"pan"sv, OpCodeKind::Pan},
             {"pitch_keycenter"sv, OpCodeKind::PitchKeyCenter},
             {"sample"sv, OpCodeKind::Sample},
+            {"seq_length"sv, OpCodeKind::SequenceLength},
+            {"seq_position"sv, OpCodeKind::SequencePosition},
             {"transpose"sv, OpCodeKind::Transpose},
             {"trigger"sv, OpCodeKind::Trigger},
             {"tune"sv, OpCodeKind::Tune},
@@ -1609,6 +1615,50 @@ private:
                     // convert percent to rate
                     std::fill(std::begin(s.envelope_velf), std::end(s.envelope_velf), std::clamp(ampVelTrack.value() * 0.01, -1.0, 1.0) * 1200.0 / 127.0);
                 }
+
+                if (auto seqLen = flatSection.GetAs<double>(OpCodeKind::SequenceLength))
+                {
+                    s.seq_length = std::clamp(static_cast<int32>(std::round(seqLen.value())), 1, 100);
+
+                    if (auto seqPos = flatSection.GetAs<double>(OpCodeKind::SequencePosition))
+                    {
+                        s.seq_position = std::clamp(static_cast<int32>(std::round(seqPos.value())), 1, 100);
+
+                        if (s.seq_length < s.seq_position)
+                        {
+                            auto loc = flatSection.GetLocationForOpCode(OpCodeKind::SequencePosition);
+                            ctl->cmsg(
+                                CMSG_WARNING,
+                                VERB_VERBOSE,
+                                "%s(%u): 'seq_position' is larger than 'seq_length'; this region will never be played",
+                                std::string(m_Parser.GetPreprocessor().GetFileNameFromID(loc.FileID)).c_str(),
+                                loc.Line
+                            );
+                        }
+                    }
+                    else
+                    {
+                        auto loc = flatSection.GetLocationForOpCode(OpCodeKind::SequenceLength);
+                        ctl->cmsg(
+                            CMSG_WARNING,
+                            VERB_VERBOSE,
+                            "%s(%u): 'seq_length' was specified but 'seq_position' was not; this region will never be played",
+                            std::string(m_Parser.GetPreprocessor().GetFileNameFromID(loc.FileID)).c_str(),
+                            loc.Line
+                        );
+                    }
+                }
+                else if (auto seqPos = flatSection.GetAs<double>(OpCodeKind::SequencePosition))
+                {
+                    auto loc = flatSection.GetLocationForOpCode(OpCodeKind::SequencePosition);
+                    ctl->cmsg(
+                        CMSG_WARNING,
+                        VERB_VERBOSE,
+                        "%s(%u): 'seq_position' was specified but 'seq_length' was not",
+                        std::string(m_Parser.GetPreprocessor().GetFileNameFromID(loc.FileID)).c_str(),
+                        loc.Line
+                    );
+                }
             }
 
             return pSampleInstrument;

--- a/timidity/smplfile.c
+++ b/timidity/smplfile.c
@@ -1496,6 +1496,9 @@ static void initialize_sample(Instrument *inst, int frames, int sample_bits, int
 		sample->modenv_rate[4] = convert_envelope_rate(64);
 		sample->modenv_offset[5] = 0;
 		sample->modenv_rate[5] = convert_envelope_rate(64);
+
+		sample->seq_length = 0;
+		sample->seq_position = 0;
 	}
 	if (samples <= 6 && (panning = gen_pan_list[samples - 1]) != NULL)
 	{

--- a/timidity/timidity.c
+++ b/timidity/timidity.c
@@ -1705,6 +1705,10 @@ static int set_gus_patchconf_opts(const char *name,
 		tone->rx_note_off = atoi(cp);
 	else if (! strcmp(opts, "lpf"))		/* lpf type */
 		tone->lpf_type = atoi(cp);
+	else if (! strcmp(opts, "seqlen"))
+		tone->seq_length = atoi(cp);
+	else if (! strcmp(opts, "seqpos"))
+		tone->seq_position = atoi(cp);
 	else if (! strcmp(opts, "hpf")){		/* hpf */
 		if(tone->hpfnum)
 			free_ptr_list(tone->hpf, tone->hpfnum);