@pro-gram/flux 1.6.2 → 1.6.4

package/source/Timeline.cs

@@ -13,7 +13,7 @@ namespace DrumBuddy
     {
         public string Name = "";
         public bool Mute, Solo;
-        public double GainDb;
+        public double GainDb, Pan;
         public EditorTrack Copy() { return (EditorTrack)MemberwiseClone(); }
     }
 
@@ -34,20 +34,29 @@ namespace DrumBuddy
         public int Version = 1;
         public string Name = "Untitled session";
         public TempoGridOptions Grid = new TempoGridOptions();
+        public double MasterGainDb;
+        public bool MasterMuted;
         public EditorTrack[] Tracks = Enumerable.Range(1, 16).Select(i => new EditorTrack { Name = "Track " + i }).ToArray();
         public List<TimelineRegion> Regions = new List<TimelineRegion>();
         [XmlIgnore] public long End { get { return Regions.Count == 0 ? 0 : Regions.Max(r => r.End); } }
         public EditorSession Copy()
-        { return new EditorSession { Version = Version, Name = Name, Grid = Grid.Copy(), Tracks = Tracks.Select(t => t.Copy()).ToArray(), Regions = Regions.Select(r => r.Copy()).ToList() }; }
+        { return new EditorSession { Version = Version, Name = Name, Grid = Grid.Copy(), MasterGainDb = MasterGainDb, MasterMuted = MasterMuted, Tracks = Tracks.Select(t => t.Copy()).ToArray(), Regions = Regions.Select(r => r.Copy()).ToList() }; }
+
+        public void ValidateMixer()
+        {
+            if (Tracks == null || Tracks.Length != 16 || double.IsNaN(MasterGainDb) || double.IsInfinity(MasterGainDb) || MasterGainDb < -60 || MasterGainDb > 12)
+                throw new IOException("The session has an invalid master level.");
+            foreach (var track in Tracks)
+                if (track == null || double.IsNaN(track.GainDb) || double.IsInfinity(track.GainDb) || track.GainDb < -60 || track.GainDb > 24 || double.IsNaN(track.Pan) || double.IsInfinity(track.Pan) || track.Pan < -1 || track.Pan > 1)
+                    throw new IOException("The session has an invalid track level or pan position.");
+        }
 
         public void Validate()
         {
             if (Grid == null) Grid = new TempoGridOptions(); Grid.Validate();
             if (Version != 1 || Tracks == null || Tracks.Length != 16 || Regions == null || Regions.Count > 20000)
                 throw new IOException("This is not a supported Flux 16-track editor session.");
-            foreach (var track in Tracks)
-                if (track == null || double.IsNaN(track.GainDb) || double.IsInfinity(track.GainDb) || track.GainDb < -60 || track.GainDb > 12)
-                    throw new IOException("The session has an invalid track level.");
+            ValidateMixer();
             foreach (var r in Regions)
                 if (r == null || r.Track < 0 || r.Track >= 16 || string.IsNullOrWhiteSpace(r.Source) ||
                     r.Start < 0 || r.SourceStart < 0 || r.Length <= 0 || r.Start > MaxFrame || r.SourceStart > MaxFrame || r.Length > MaxFrame || r.End > MaxFrame || r.FadeIn < 0 || r.FadeOut < 0 || r.FadeIn > MaxFrame || r.FadeOut > MaxFrame || r.FadeInOffset < 0 || r.FadeOutOffset < 0 || r.FadeInOffset > MaxFrame || r.FadeOutOffset > MaxFrame)
@@ -140,7 +149,7 @@ namespace DrumBuddy
     }
 
     // The edit model uses integer audio frames. Rendering does not modify source files.
-    public sealed class TimelineMix : ISampleProvider, IDisposable
+    public sealed partial class TimelineMix : ISampleProvider, IDisposable
     {
         private sealed class Asset : IDisposable
         {
@@ -187,11 +196,11 @@ namespace DrumBuddy
                 int frames = (int)Math.Min(count / 2, End - position);
                 if (frames == 0) return 0;
                 Array.Clear(output, offset, frames * 2);
+                PrepareTrackBuffers(frames * 2);
                 bool solo = session.Tracks.Any(t => t.Solo);
                 long blockEnd = position + frames;
                 foreach (var r in session.Regions) {
-                    var track = session.Tracks[r.Track];
-                    if (r.Muted || track.Mute || (solo && !track.Solo) || r.Start >= blockEnd || r.End <= position) continue;
+                    if (r.Muted || r.Start >= blockEnd || r.End <= position) continue;
                     long from = Math.Max(r.Start, position), to = Math.Min(r.End, blockEnd);
                     int take = (int)(to - from), skip = (int)(from - position);
                     var asset = assets[r.Source]; int channels = asset.Reader.WaveFormat.Channels;
@@ -202,18 +211,35 @@ namespace DrumBuddy
                     while (got < byteCount && (n = asset.Reader.Read(asset.Bytes, got, byteCount - got)) > 0) got += n;
                     if (got != byteCount) throw new IOException("An audio source changed while playing. Reopen the session.");
                     Buffer.BlockCopy(asset.Bytes, 0, asset.Samples, 0, got);
-                    float gain = (float)Math.Pow(10, track.GainDb / 20);
+                    var trackBuffer = trackBuffers[r.Track];
                     for (int f = 0; f < take; f++) {
                         float envelope = (float)EditorTools.Envelope(r, from + f - r.Start);
-                        float left = asset.Samples[f * channels] * gain * envelope;
-                        float right = asset.Samples[f * channels + (channels == 1 ? 0 : 1)] * gain * envelope;
-                        output[offset + (skip + f) * 2] += left; output[offset + (skip + f) * 2 + 1] += right;
-                        TrackPeaks[r.Track] = Math.Max(TrackPeaks[r.Track], Math.Max(Math.Abs(left), Math.Abs(right)));
+                        trackBuffer[(skip + f) * 2] += asset.Samples[f * channels] * envelope;
+                        trackBuffer[(skip + f) * 2 + 1] += asset.Samples[f * channels + (channels == 1 ? 0 : 1)] * envelope;
+                    }
+                }
+                for (int t = 0; t < 16; t++) {
+                    var track = session.Tracks[t]; var trackBuffer = trackBuffers[t];
+                    float gain = track.Mute || solo && !track.Solo ? 0 : (float)Math.Pow(10, track.GainDb / 20);
+                    float leftGain = track.Pan >= 1 ? 0 : gain * (track.Pan > 0 ? (float)Math.Cos(track.Pan * Math.PI / 2) : 1);
+                    float rightGain = track.Pan <= -1 ? 0 : gain * (track.Pan < 0 ? (float)Math.Cos(-track.Pan * Math.PI / 2) : 1);
+                    for (int f = 0; f < frames; f++) {
+                        float preLeft = trackBuffer[f * 2], preRight = trackBuffer[f * 2 + 1];
+                        if (float.IsNaN(preLeft) || float.IsInfinity(preLeft) || float.IsNaN(preRight) || float.IsInfinity(preRight)) throw new IOException("The mix contains invalid audio samples.");
+                        sourceMeterLeft[t] = Math.Max(sourceMeterLeft[t], Math.Abs(preLeft)); sourceMeterRight[t] = Math.Max(sourceMeterRight[t], Math.Abs(preRight));
+                        float left = preLeft * leftGain, right = preRight * rightGain;
+                        output[offset + f * 2] += left; output[offset + f * 2 + 1] += right;
+                        outputMeterLeft[t] = Math.Max(outputMeterLeft[t], Math.Abs(left)); outputMeterRight[t] = Math.Max(outputMeterRight[t], Math.Abs(right));
+                        TrackPeaks[t] = Math.Max(TrackPeaks[t], Math.Max(Math.Abs(left), Math.Abs(right)));
                     }
                 }
+                float masterGain = session.MasterMuted ? 0 : (float)Math.Pow(10, session.MasterGainDb / 20);
                 for (int i = offset; i < offset + frames * 2; i++) {
+                    output[i] *= masterGain;
                     if (float.IsNaN(output[i]) || float.IsInfinity(output[i])) throw new IOException("The mix contains invalid audio samples.");
                     Peak = Math.Max(Peak, Math.Abs(output[i]));
+                    if ((i - offset) % 2 == 0) masterMeterLeft = Math.Max(masterMeterLeft, Math.Abs(output[i]));
+                    else masterMeterRight = Math.Max(masterMeterRight, Math.Abs(output[i]));
                 }
                 position += frames; return frames * 2;
             }

package/source/TimelineMixer.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Linq;
+
+namespace DrumBuddy
+{
+    public sealed class TimelineMeterLevels
+    {
+        public readonly float[] SourceLeft = new float[16], SourceRight = new float[16], OutputLeft = new float[16], OutputRight = new float[16];
+        public float MasterLeft, MasterRight;
+    }
+    public sealed partial class TimelineMix
+    {
+        private readonly float[][] trackBuffers = Enumerable.Range(0, 16).Select(i => new float[0]).ToArray();
+        private readonly float[] sourceMeterLeft = new float[16], sourceMeterRight = new float[16], outputMeterLeft = new float[16], outputMeterRight = new float[16];
+        private float masterMeterLeft, masterMeterRight;
+        private void PrepareTrackBuffers(int samples)
+        {
+            for (int i = 0; i < 16; i++) {
+                if (trackBuffers[i].Length < samples) trackBuffers[i] = new float[samples];
+                else Array.Clear(trackBuffers[i], 0, samples);
+            }
+        }
+        public void UpdateMixer(EditorSession state)
+        {
+            state.ValidateMixer(); var tracks = state.Tracks.Select(t => t.Copy()).ToArray();
+            double master = state.MasterGainDb; bool muted = state.MasterMuted;
+            lock (gate) {
+                if (disposed) return;
+                session.Tracks = tracks; session.MasterGainDb = master; session.MasterMuted = muted;
+            }
+        }
+        public TimelineMeterLevels DrainMeters()
+        {
+            lock (gate) {
+                var result = new TimelineMeterLevels { MasterLeft = masterMeterLeft, MasterRight = masterMeterRight };
+                Array.Copy(sourceMeterLeft, result.SourceLeft, 16); Array.Copy(sourceMeterRight, result.SourceRight, 16);
+                Array.Copy(outputMeterLeft, result.OutputLeft, 16); Array.Copy(outputMeterRight, result.OutputRight, 16);
+                Array.Clear(sourceMeterLeft, 0, 16); Array.Clear(sourceMeterRight, 0, 16);
+                Array.Clear(outputMeterLeft, 0, 16); Array.Clear(outputMeterRight, 0, 16); masterMeterLeft = masterMeterRight = 0;
+                return result;
+            }
+        }
+    }
+}