@pro-gram/flux 1.6.1 → 1.6.4

package/source/Setup.cs

@@ -14,7 +14,7 @@ using System.Windows.Markup;
 using Microsoft.Win32;
 
 [assembly: AssemblyTitle("Flux Setup")]
-[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyVersion("1.6.4.0")]
 
 namespace DrumBuddySetup
 {
@@ -101,7 +101,7 @@ namespace DrumBuddySetup
                     Directory.CreateDirectory(Path.GetDirectoryName(destination));
                     File.Copy(source,destination,true);
                 }
-                File.WriteAllText(Path.Combine(InstallPath,".drumbuddy-installed"),"Flux 1.6.1\n" + InstallPath,Encoding.UTF8);
+                File.WriteAllText(Path.Combine(InstallPath,".drumbuddy-installed"),"Flux 1.6.4\n" + InstallPath,Encoding.UTF8);
                 string[] files = Directory.GetFiles(stage,"*",SearchOption.AllDirectories).Select(f => f.Substring(stage.Length + 1)).Concat(new[] { ".drumbuddy-installed","installed-files.txt" }).ToArray();
                 File.WriteAllLines(Path.Combine(InstallPath,"installed-files.txt"),files,Encoding.UTF8);
                 string exe = Path.Combine(InstallPath,"DrumBuddy.exe");
@@ -112,7 +112,7 @@ namespace DrumBuddySetup
                 RemoveLegacyShortcut(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu),"Programs","Drum Buddy.lnk"),exe);
                 RemoveLegacyShortcut(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),"Drum Buddy.lnk"),exe);
                 using (var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(RegistryKey)) {
-                    key.SetValue("DisplayName","Flux"); key.SetValue("DisplayVersion","1.6.1"); key.SetValue("Publisher","Flux");
+                    key.SetValue("DisplayName","Flux"); key.SetValue("DisplayVersion","1.6.4"); key.SetValue("Publisher","Flux");
                     key.SetValue("InstallLocation",InstallPath); key.SetValue("DisplayIcon",BrandIcon);
                     key.SetValue("UninstallString","\"" + Path.Combine(InstallPath,"Uninstall.exe") + "\"");
                     key.SetValue("NoModify",1); key.SetValue("NoRepair",1);
@@ -137,17 +137,18 @@ namespace DrumBuddySetup
                 foreach (var entry in zip.Entries) {
                     if (string.IsNullOrEmpty(entry.Name)) continue;
                     string relative = entry.FullName.Replace('/',Path.DirectorySeparatorChar);
+                    string manifestName = entry.FullName.Replace('\\','/');
                     string target = Path.GetFullPath(Path.Combine(root,relative));
                     if (!target.StartsWith(root,StringComparison.OrdinalIgnoreCase) || relative.Contains(":")) throw new IOException("Invalid installer file path.");
                     string expected;
-                    if (!hashes.TryGetValue(entry.FullName,out expected)) throw new IOException("An installer file is not in the integrity manifest.");
+                    if (!hashes.TryGetValue(manifestName,out expected)) throw new IOException("An installer file is not in the integrity manifest.");
                     Directory.CreateDirectory(Path.GetDirectoryName(target));
                     using (var input = entry.Open()) using (var output = new FileStream(target,FileMode.Create,FileAccess.Write)) input.CopyTo(output);
                     using (var sha = SHA256.Create()) using (var file = File.OpenRead(target)) {
                         string actual = BitConverter.ToString(sha.ComputeHash(file)).Replace("-","");
                         if (!string.Equals(actual,expected,StringComparison.OrdinalIgnoreCase)) throw new IOException("An installer file failed its integrity check. Please obtain a fresh copy.");
                     }
-                    hashes.Remove(entry.FullName);
+                    hashes.Remove(manifestName);
                     if (progress != null) progress((double)++count / zip.Entries.Count);
                 }
             }

package/source/ShellStyles.xaml

@@ -25,11 +25,17 @@
   </Style>
   <Style TargetType="Slider">
     <Setter Property="Height" Value="22"/>
-    <Setter Property="Template"><Setter.Value><ControlTemplate TargetType="Slider"><Track x:Name="PART_Track" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Value="{Binding Value,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" VerticalAlignment="Center">
-      <Track.DecreaseRepeatButton><RepeatButton Command="Slider.DecreaseLarge"><RepeatButton.Template><ControlTemplate TargetType="RepeatButton"><Border Background="{DynamicResource Theme006D68}" Height="3" CornerRadius="1"/></ControlTemplate></RepeatButton.Template></RepeatButton></Track.DecreaseRepeatButton>
-      <Track.Thumb><Thumb Width="12" Height="12"><Thumb.Template><ControlTemplate TargetType="Thumb"><Ellipse Fill="{DynamicResource Theme182C37}"/></ControlTemplate></Thumb.Template></Thumb></Track.Thumb>
-      <Track.IncreaseRepeatButton><RepeatButton Command="Slider.IncreaseLarge"><RepeatButton.Template><ControlTemplate TargetType="RepeatButton"><Border Background="{DynamicResource ThemeC3CED0}" Height="3" CornerRadius="1"/></ControlTemplate></RepeatButton.Template></RepeatButton></Track.IncreaseRepeatButton>
-    </Track></ControlTemplate></Setter.Value></Setter>
+    <Setter Property="Template"><Setter.Value><ControlTemplate TargetType="Slider"><Track x:Name="PART_Track" Orientation="{TemplateBinding Orientation}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Value="{Binding Value,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" VerticalAlignment="Center">
+      <Track.DecreaseRepeatButton><RepeatButton x:Name="Decrease" Command="Slider.DecreaseLarge" Height="3" Background="{DynamicResource Theme006D68}"><RepeatButton.Template><ControlTemplate TargetType="RepeatButton"><Border Background="{TemplateBinding Background}" CornerRadius="1"/></ControlTemplate></RepeatButton.Template></RepeatButton></Track.DecreaseRepeatButton>
+      <Track.Thumb><Thumb x:Name="SliderThumb" Width="12" Height="12"><Thumb.Template><ControlTemplate TargetType="Thumb"><Ellipse Fill="{DynamicResource Theme182C37}"/></ControlTemplate></Thumb.Template></Thumb></Track.Thumb>
+      <Track.IncreaseRepeatButton><RepeatButton x:Name="Increase" Command="Slider.IncreaseLarge" Height="3" Background="{DynamicResource ThemeC3CED0}"><RepeatButton.Template><ControlTemplate TargetType="RepeatButton"><Border Background="{TemplateBinding Background}" CornerRadius="1"/></ControlTemplate></RepeatButton.Template></RepeatButton></Track.IncreaseRepeatButton>
+    </Track><ControlTemplate.Triggers><Trigger Property="Orientation" Value="Vertical">
+      <Setter TargetName="PART_Track" Property="VerticalAlignment" Value="Stretch"/>
+      <Setter TargetName="Decrease" Property="Height" Value="Auto"/><Setter TargetName="Decrease" Property="Width" Value="3"/>
+      <Setter TargetName="Increase" Property="Height" Value="Auto"/><Setter TargetName="Increase" Property="Width" Value="3"/>
+      <Setter TargetName="SliderThumb" Property="Width" Value="22"/><Setter TargetName="SliderThumb" Property="Height" Value="12"/>
+      <Setter TargetName="SliderThumb" Property="Template"><Setter.Value><ControlTemplate TargetType="Thumb"><Border Background="{DynamicResource Theme182C37}" BorderBrush="{DynamicResource Theme006D68}" BorderThickness="1" CornerRadius="2"><Border Height="1" Margin="3,0" Background="{DynamicResource Theme526771}"/></Border></ControlTemplate></Setter.Value></Setter>
+    </Trigger></ControlTemplate.Triggers></ControlTemplate></Setter.Value></Setter>
   </Style>
   <Style TargetType="TextBox">
     <Setter Property="Background" Value="{DynamicResource ThemeFFFFFF}"/><Setter Property="Foreground" Value="{DynamicResource Theme182C37}"/>

package/source/TempoGrid.cs

@@ -34,6 +34,20 @@ namespace DrumBuddy
         public static double StepSeconds(TempoGridOptions options) { return 240.0 / options.Tempo / options.Division * (options.Triplet ? 2.0 / 3 : 1); }
         public static double BeatSeconds(TempoGridOptions options) { return 240.0 / options.Tempo / options.BeatUnit; }
         public static double BarSeconds(TempoGridOptions options) { return BeatSeconds(options) * options.BeatsPerBar; }
+        public static long AdjacentBar(long frame, TempoGridOptions options, int direction)
+        {
+            options.Validate();
+            if (direction != -1 && direction != 1) throw new ArgumentOutOfRangeException("direction");
+            frame = Math.Max(0, Math.Min(EditorSession.MaxFrame, frame));
+            if (direction < 0 && frame == 0 || direction > 0 && frame == EditorSession.MaxFrame) return frame;
+            double framesPerBar = BarSeconds(options) * Audio.Rate;
+            long index = (long)Math.Floor(frame / framesPerBar);
+            if (direction > 0) {
+                do { index++; } while (FrameAt(index * framesPerBar) <= frame);
+            }
+            else while (index > 0 && FrameAt(index * framesPerBar) >= frame) index--;
+            return FrameAt(index * framesPerBar);
+        }
         public static long Snap(long frame, TempoGridOptions options)
         {
             double seconds = Math.Max(0, frame) / (double)Audio.Rate, bar = BarSeconds(options), step = StepSeconds(options);
@@ -86,7 +100,7 @@ namespace DrumBuddy
             int count = 0;
             for (long index = first; index <= last && count++ < 5000; index += stride) {
                 double frame = index * seconds * Audio.Rate; if (frame > EditorSession.MaxFrame) break;
-                string label = kind == 2 && index % labelStride == 0 ? (index + 1).ToString(CultureInfo.InvariantCulture) + ".1" : null;
+                string label = kind == 2 && index % labelStride == 0 ? (index + 1).ToString(CultureInfo.InvariantCulture) : null;
                 if (kind == 1 && spacing >= 58 && index % options.BeatsPerBar != 0) label = (index / options.BeatsPerBar + 1) + "." + (index % options.BeatsPerBar + 1);
                 yield return new TempoGridTick { Frame = FrameAt(frame), Kind = kind, Label = label };
             }

package/source/TempoGridTests.cs

@@ -35,6 +35,32 @@ namespace DrumBuddy
             try {
                 InterfacePreferences.Current = InterfacePreferences.Defaults();
                 var grid = new TempoGridOptions(); grid.Validate();
+                Check(InterfacePreferences.Resolve(Key.Left, ModifierKeys.Control) == "previousBar" && InterfacePreferences.Resolve(Key.Right, ModifierKeys.Control) == "nextBar", "Resolve Ctrl+Left and Ctrl+Right to bar navigation");
+                Check(InterfacePreferences.Resolve(Key.Enter, ModifierKeys.None) == "startAlternate" && InterfacePreferences.Resolve(Key.Return, ModifierKeys.None) == "startAlternate" && InterfacePreferences.Resolve(Key.Home, ModifierKeys.None) == "start" && InterfacePreferences.Gesture("startAlternate") == "Enter", "Resolve Enter and Return to the beginning while retaining Home and showing Enter in keybind settings");
+                Check(TempoGrid.AdjacentBar(Audio.Rate * 3L, grid, -1) == Audio.Rate * 2L && TempoGrid.AdjacentBar(Audio.Rate * 3L, grid, 1) == Audio.Rate * 4L, "Jump from within a bar to the nearest bar strictly left or right");
+                Check(TempoGrid.AdjacentBar(Audio.Rate * 2L, grid, -1) == 0 && TempoGrid.AdjacentBar(Audio.Rate * 2L, grid, 1) == Audio.Rate * 4L, "Jump a full bar when already exactly on a bar line");
+                Check(TempoGrid.AdjacentBar(Audio.Rate * 2L - 1, grid, 1) == Audio.Rate * 2L && TempoGrid.AdjacentBar(Audio.Rate * 2L + 1, grid, -1) == Audio.Rate * 2L, "Find the neighboring bar from one sample on either side of its boundary");
+                Check(TempoGrid.AdjacentBar(0, grid, -1) == 0 && TempoGrid.AdjacentBar(EditorSession.MaxFrame, grid, 1) == EditorSession.MaxFrame && TempoGrid.AdjacentBar(EditorSession.MaxFrame - 1, grid, 1) == EditorSession.MaxFrame, "Clamp bar navigation at the beginning and timeline limit");
+                var oddMeter = new TempoGridOptions { Tempo = 123, BeatsPerBar = 7, BeatUnit = 8, Division = 256, Triplet = true };
+                double barFrames = TempoGrid.BarSeconds(oddMeter) * Audio.Rate;
+                foreach (int barIndex in new[] { 1, 2, 13, 10000, 50000 }) {
+                    long barFrame = (long)Math.Round(barIndex * barFrames, MidpointRounding.AwayFromZero);
+                    Check(TempoGrid.AdjacentBar(barFrame, oddMeter, -1) == (long)Math.Round((barIndex - 1) * barFrames, MidpointRounding.AwayFromZero)
+                        && TempoGrid.AdjacentBar(barFrame, oddMeter, 1) == (long)Math.Round((barIndex + 1) * barFrames, MidpointRounding.AwayFromZero)
+                        && TempoGrid.AdjacentBar(barFrame + 1, oddMeter, -1) == barFrame && TempoGrid.AdjacentBar(barFrame - 1, oddMeter, 1) == barFrame,
+                        "Avoid rounded-frame drift with fractional bar lengths in 7/8 at bar " + barIndex);
+                }
+                var oldKeys = InterfacePreferences.Defaults(); oldKeys.Keybinds.RemoveAll(b => new[] { "previousBar", "nextBar", "startAlternate" }.Contains(b.Action));
+                InterfacePreferences.Upgrade(oldKeys); InterfacePreferences.Validate(oldKeys);
+                Check(oldKeys.Keybinds.Any(b => b.Action == "previousBar" && b.Key == "Left" && b.Modifiers == (int)ModifierKeys.Control) && oldKeys.Keybinds.Any(b => b.Action == "startAlternate" && b.Key == "Return"), "Add new navigation shortcuts to existing saved keymaps");
+                var customNavigation = InterfacePreferences.Defaults(); customNavigation.Keybinds.RemoveAll(b => new[] { "previousBar", "nextBar", "startAlternate" }.Contains(b.Action));
+                var customLeft = customNavigation.Keybinds.First(b => b.Action == "split"); customLeft.Key = "Left"; customLeft.Modifiers = (int)ModifierKeys.Control;
+                customNavigation.Keybinds.First(b => b.Action == "play").Key = "Enter";
+                InterfacePreferences.Upgrade(customNavigation); InterfacePreferences.Validate(customNavigation);
+                Check(customNavigation.Keybinds.First(b => b.Action == "previousBar").Key == "None" && customNavigation.Keybinds.First(b => b.Action == "startAlternate").Key == "None" && customNavigation.Keybinds.First(b => b.Action == "play").Key == "Enter", "Preserve customized Ctrl+Left and Enter bindings when upgrading a keymap");
+                var duplicateEnter = InterfacePreferences.Defaults(); duplicateEnter.Keybinds.First(b => b.Action == "play").Key = "Enter"; bool aliasRejected = false;
+                try { InterfacePreferences.Validate(duplicateEnter); } catch (IOException) { aliasRejected = true; }
+                Check(aliasRejected, "Treat Enter and Return as the same key when checking shortcut conflicts");
                 Check(Math.Abs(TempoGrid.StepSeconds(grid) - .125) < 1e-12, "At 120 BPM, a sixteenth note lasts 0.125 seconds");
                 grid.Division = 32; Check(Math.Abs(TempoGrid.StepSeconds(grid) - .0625) < 1e-12, "At 120 BPM, a thirty-second note lasts 0.0625 seconds");
                 grid.Division = 256; Check(Math.Abs(TempoGrid.StepSeconds(grid) - .0078125) < 1e-12, "Allow fine divisions through 1/256");
@@ -49,6 +75,8 @@ namespace DrumBuddy
                 long distant = (long)Math.Round(100000 * 240.0 / 123 / 128 * Audio.Rate);
                 Check(Math.Abs(TempoGrid.Snap(distant, grid) - distant) <= 1, "Avoid accumulated frame rounding drift far into a fine grid");
                 grid = new TempoGridOptions { Division = 32 };
+                var bars = TempoGrid.VisibleTicks(grid, 0, 400, 40).Where(t => t.Kind == 2 && t.Label != null).ToArray();
+                Check(bars.Length >= 2 && bars[0].Label == "1" && bars[1].Label == "2", "Show whole bar numbers on the musical ruler");
                 long first = TimelineGesture.FrameAt(2.5, 40, new long[] { 0 }, false, grid, true, true);
                 Check(first == 2756, "Do not swallow the first 1/32 grid line with the start-of-track magnet");
                 Check(TimelineGesture.FrameAt(21.4, 40, new long[0], false, new TempoGridOptions(), true, false) == 22050, "Snap a playhead gesture to the nearest sixteenth-note frame");
@@ -97,6 +125,18 @@ namespace DrumBuddy
                     editor.ApplyGridOptions(new TempoGridOptions { Tempo = 150, Division = 32 }); RunUi(() => editor.ExecuteAction("undo"));
                     Check(editor.GridOptions.Tempo == 120 && editor.SessionForTest.Regions.Any(r => r.Start == 88200), "Undo a tempo-grid change without undoing the audio paste");
                     Check(original.SequenceEqual(File.ReadAllBytes(source)), "Keep the original float audio unchanged through grid editing and copy/delete/paste");
+                    editor.PlayheadForTest(Audio.Rate * 3L);
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Left, ModifierKeys.Control)));
+                    Check(editor.PlayheadFrame == Audio.Rate * 2L, "Move the actual editor playhead to the left bar line");
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Left, ModifierKeys.Control)));
+                    Check(editor.PlayheadFrame == 0, "Repeated Ctrl+Left moves to the preceding bar from an exact boundary");
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Right, ModifierKeys.Control)));
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Right, ModifierKeys.Control)));
+                    Check(editor.PlayheadFrame == Audio.Rate * 4L, "Repeated Ctrl+Right moves the editor forward by complete bars");
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Enter, ModifierKeys.None)));
+                    Check(editor.PlayheadFrame == 0, "Enter returns the actual editor playhead to the beginning");
+                    editor.PlayheadForTest(Audio.Rate * 3L); RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Home, ModifierKeys.None)));
+                    Check(editor.PlayheadFrame == 0 && original.SequenceEqual(File.ReadAllBytes(source)), "Home still returns to the beginning and transport navigation preserves original audio");
                 }
                 owner.Content = null; owner.Close();
                 File.WriteAllLines(Path.Combine(root, "grid-test-results.txt"), log, Encoding.UTF8); return 0;

package/source/Third Party Notices.txt

@@ -1,4 +1,4 @@
-Flux 1.6.1 - third-party components
+Flux 1.6.4 - third-party components
 
 FFmpeg 9.0.2, release essentials build by Gyan Doshi
 Used as a separate command-line decoding process.

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;
+            }
+        }
+    }
+}

package/source/references/R16 Format Research.txt

@@ -1,16 +0,0 @@
-The independent C# R16 project container reader/writer uses file-format facts
-researched with zoomrlib 1.1.0 by Remy Taymans and Glenn Boysko:
-https://gitlab.com/remytms/zoomrlib
-https://pypi.org/project/zoomrlib/1.1.0/
-
-Its unchanged binary fixture projects were used for round-trip verification.
-The upstream Python implementation is not bundled or linked into Drum Buddy.
-Download the upstream release's tests/data to reproduce the native fixture tests:
-DrumBuddy.exe --control-self-test TEST_OUTPUT PATH_TO_TEST_FIXTURES
-
-Mackie control protocol reference (message assignments only):
-https://github.com/justinfrankel/reaper-sdk/blob/main/reaper-plugins/reaper_csurf/csurf_mcu.cpp
-
-Official R16 manuals:
-https://zoomcorp.com/media/documents/E_R16_.pdf
-https://zoomcorp.com/media/documents/E_R16_AIF_.pdf