Phase S FB1 (r11): Sample-view recomposition — knob deck + elastic full-width hero + curve popup w/ right-click delete + post-mixer master gain (ComponentState v8)

src/vst/sample_map.cpp

@@ -5,9 +5,12 @@
 
 #include <algorithm>  // std::min
 #include <cassert>    // assert
+#include <cmath>      // std::isfinite (v8 master-gain validation)
 #include <cstring>    // std::memcpy
 #include <utility>    // std::move
 
+#include "master_gain.h"  // masterGainMaxLinear — the v8 master-gain wire cap
+
 namespace reasampler {
 
 namespace {
@@ -615,6 +618,17 @@ std::vector<std::uint8_t> serializeComponentState(const ComponentState& state) {
     out.push_back(static_cast<std::uint8_t>(vc));
     out.push_back(state.voiceMode == VoiceMode::Mono ? 1 : 0);
     out.push_back(state.monoTrigger == MonoTrigger::Legato ? 1 : 0);
+    // v8 envelope addition (FB1 master gain): the post-mixer LINEAR gain as an IEEE-754 double
+    // (bit-cast to u64 LE), following the voice bytes so a v7 blob is a strict prefix up to
+    // here (see the v7 lift). The WRITER never emits an out-of-range value: non-finite or
+    // negative falls back to unity; above the +24 dB cap clamps to the cap.
+    {
+        double g = state.masterGainLinear;
+        const double maxLin = vst::masterGainMaxLinear();
+        if (!std::isfinite(g) || g < 0.0) g = 1.0;
+        if (g > maxLin) g = maxLin;
+        putU64le(out, doubleToBits(g));
+    }
     // Length-prefixed selection id (it precedes the zones payload, so it MUST be framed —
     // unlike the v1 selection blob where the id ran to end-of-stream).
     putU32le(out, static_cast<std::uint32_t>(state.selectionId.size()));
@@ -691,11 +705,12 @@ ComponentState deserializeComponentState(const std::vector<std::uint8_t>& bytes,
         return out;                    // previewVelocity stays at the mid default (pre-S-VIEW-4)
     }
     if (version != kComponentStateVersion &&
+        version != kSelectionZonesModeMarkerVelVoiceV7Version &&
         version != kSelectionZonesModeMarkerVelV6Version) {
         return out;  // unknown -> empty
     }
 
-    // v6/v7 shared prefix: the channel-mode byte, then the 8-byte consumed-assignment marker,
+    // v6/v7/v8 shared prefix: the channel-mode byte, then the 8-byte consumed-assignment marker,
     // then the 1-byte preview velocity, precede the v3 body. A non-{0,1} mode byte is treated
     // as mono (conservative default) rather than rejected — a corrupt mode never silences the
     // instance.
@@ -711,9 +726,9 @@ ComponentState deserializeComponentState(const std::vector<std::uint8_t>& bytes,
     out.previewVelocity = (previewVel >= 1 && previewVel <= 127)
                               ? previewVel
                               : kPreviewVelocityDefault;
-    // v7 (Phase S): the three voice-system bytes. A v6 blob (pre-Phase-S) skips them — the
+    // v7+ (Phase S): the three voice-system bytes. A v6 blob (pre-Phase-S) skips them — the
     // construction defaults {16, Poly, Retrigger} hold, reproducing pre-Phase-S behavior.
-    if (version == kComponentStateVersion) {
+    if (version >= kSelectionZonesModeMarkerVelVoiceV7Version) {
         const std::uint8_t vc = r.u8();
         const std::uint8_t vm = r.u8();
         const std::uint8_t mt = r.u8();
@@ -726,6 +741,17 @@ ComponentState deserializeComponentState(const std::vector<std::uint8_t>& bytes,
         out.voiceMode = (vm == 1) ? VoiceMode::Mono : VoiceMode::Poly;
         out.monoTrigger = (mt == 1) ? MonoTrigger::Legato : MonoTrigger::Retrigger;
     }
+    // v8 (FB1): the master-gain LINEAR double. A v7 blob (pre-FB1) skips it — the construction
+    // default (unity) holds, reproducing pre-FB1 output exactly. A non-finite, negative, or
+    // above-cap value (a corrupt blob) falls back to unity rather than silencing/blasting.
+    if (version == kComponentStateVersion) {
+        const double g = bitsToDouble(asU64(r.i64()));
+        if (!r.ok) return out;  // truncated inside the gain double -> empty (unity holds)
+        out.masterGainLinear =
+            (std::isfinite(g) && g >= 0.0 && g <= vst::masterGainMaxLinear() * (1.0 + 1e-9))
+                ? g
+                : 1.0;
+    }
     const std::uint32_t idLen = r.u32();
     out.selectionId = r.str(idLen);
     if (!r.ok) { out.selectionId.clear(); return out; }  // truncated id -> empty