Commit: 8f32db1188fa2fe5a495b983301e41700cb6ace3 - timidity41 (git)

Commit MetaInfo

• Revision: 8f32db1188fa2fe5a495b983301e41700cb6ace3 (tree)
• Zeit: 2018-07-28 01:09:27
• Autor: Starg <starg@user...>
• Commiter: Starg

Log Message

[dls] Enhance connection block support

Ändern Zusammenfassung

• modified: timidity/dls.cpp

Diff

--- a/timidity/dls.cpp
+++ b/timidity/dls.cpp
@@ -439,6 +439,9 @@ public:
                 pSample->hpf[0] = -1;
                 pSample->hpf[1] = 10;
 
+                pSample->tremolo_freq = 5000;
+                pSample->vibrato_freq = 5000;
+
                 double attackTime = 0.0;
                 double holdTime = 0.0;
                 double decayTime = 0.0;
@@ -468,6 +471,11 @@ public:
                                 attackTime = TimeCentToSecond(b.Scale);
                                 continue;
                             }
+                            else if (b.Source == DLSConnectionBlock::SourceKind::KeyOnVelocity && b.Control == DLSConnectionBlock::SourceKind::None && b.Transform == DLSConnectionBlock::TransformKind::None)
+                            {
+                                pSample->envelope_velf[0] = static_cast<int16>(b.Scale / 65536);
+                                continue;
+                            }
                             break;
 
                         case DLSConnectionBlock::DestinationKind::EG1DecayTime:
@@ -476,6 +484,12 @@ public:
                                 decayTime = TimeCentToSecond(b.Scale);
                                 continue;
                             }
+                            else if (b.Source == DLSConnectionBlock::SourceKind::KeyNumber && b.Control == DLSConnectionBlock::SourceKind::None && b.Transform == DLSConnectionBlock::TransformKind::None)
+                            {
+                                // this is probably incorrect
+                                pSample->envelope_keyf[1] = static_cast<int16>(b.Scale / 65536);
+                                continue;
+                            }
                             break;
 
                         case DLSConnectionBlock::DestinationKind::EG1SustainLevel:
@@ -494,6 +508,45 @@ public:
                             }
                             break;
 
+                        case DLSConnectionBlock::DestinationKind::LFOFrequency:
+                            if (b.Source == DLSConnectionBlock::SourceKind::None && b.Control == DLSConnectionBlock::SourceKind::None && b.Transform == DLSConnectionBlock::TransformKind::None)
+                            {
+                                // mHz ?
+                                int16 freq = static_cast<int16>(std::lround(std::pow(2.0, (b.Scale / 65536.0 - 6900.0) / 1200.0) * 440.0 * 1000.0));
+                                pSample->tremolo_freq = freq;
+                                pSample->vibrato_freq = freq;
+                                continue;
+                            }
+                            break;
+
+                        case DLSConnectionBlock::DestinationKind::LFOStartDelay:
+                            if (b.Source == DLSConnectionBlock::SourceKind::None && b.Control == DLSConnectionBlock::SourceKind::None && b.Transform == DLSConnectionBlock::TransformKind::None)
+                            {
+                                int16 delay = static_cast<int16>(std::lround(TimeCentToSecond(b.Scale) * ::play_mode->rate * 1000.0));
+                                pSample->tremolo_delay = delay;
+                                pSample->vibrato_delay = delay;
+                                continue;
+                            }
+                            break;
+
+                        case DLSConnectionBlock::DestinationKind::Attenuation:
+                            if (b.Source == DLSConnectionBlock::SourceKind::LFO && b.Control == DLSConnectionBlock::SourceKind::None && b.Transform == DLSConnectionBlock::TransformKind::None)
+                            {
+                                double gain = b.Scale / 655360.0;   // dB
+                                double rate = std::pow(10.0, gain * 0.1);
+                                pSample->tremolo_to_amp = static_cast<int16>(std::lround((rate - 1.0) * 10000.0));
+                                continue;
+                            }
+                            break;
+
+                        case DLSConnectionBlock::DestinationKind::Pitch:
+                            if (b.Source == DLSConnectionBlock::SourceKind::LFO && b.Control == DLSConnectionBlock::SourceKind::None && b.Transform == DLSConnectionBlock::TransformKind::None)
+                            {
+                                pSample->vibrato_to_pitch = static_cast<int16>(b.Scale / 65536);
+                                continue;
+                            }
+                            break;
+
                         default:
                             break;
                         }