capture: refuse the multi-track ranged item render, silence the track's children and receives for it, and gate every exact-bounds capture on its frame count
This commit is contained in:
+1
-1
@@ -2127,7 +2127,7 @@ internal-drag path").
|
|||||||
|
|
||||||
| Track | Owns |
|
| Track | Owns |
|
||||||
|---|---|
|
|---|---|
|
||||||
| **T1** `capture-range-exactness` | `core/capture/render_settings`, `shell/capture/capture.cpp`'s render-configuration block, `shell/capture/scope_resolve` (source-mode selection only), `tests/test_render_settings.cpp` |
|
| **T1** `capture-range-exactness` | `core/capture/render_settings`, `shell/capture/capture.cpp`'s render-configuration block, `shell/capture/scope_resolve` (source-mode selection only), `tests/test_render_settings.cpp` — **plus, as landed:** the new pure `core/capture/render_window` + `core/capture/track_topology`, the new shells `shell/capture/render_selection` + `shell/capture/render_isolation`, and `renderOffline`'s guard block in `shell/capture/capture_orchestrator.cpp` (the one seam a fresh capture and a recipe replay both cross, so the refusal and the transient guards had to live there rather than in `scope_resolve`) |
|
||||||
| **T2** `mode-switch-discipline` | `core/view/view_mode_model` (solo cache), `shell/view/view.cpp` (`applyMode` seams + WANT block), `shell/actions/design_view_actions.cpp` (refusal feedback), `shell/panel/panel_input.cpp` **footer mode-segment block only** (`:300-309`), the mode segment's disabled state in `core/ui/footer_bar` + `shell/panel/panel_render.cpp` |
|
| **T2** `mode-switch-discipline` | `core/view/view_mode_model` (solo cache), `shell/view/view.cpp` (`applyMode` seams + WANT block), `shell/actions/design_view_actions.cpp` (refusal feedback), `shell/panel/panel_input.cpp` **footer mode-segment block only** (`:300-309`), the mode segment's disabled state in `core/ui/footer_bar` + `shell/panel/panel_render.cpp` |
|
||||||
| **T3** `media-explorer-section` | `shell/actions/ingest.cpp` (register/dispatch/unregister), **the registration block in `src/app/main.cpp`** (the `hookcommand2` hook + unload mirror), the root-`CLAUDE.md` contract amendment |
|
| **T3** `media-explorer-section` | `shell/actions/ingest.cpp` (register/dispatch/unregister), **the registration block in `src/app/main.cpp`** (the `hookcommand2` hook + unload mirror), the root-`CLAUDE.md` contract amendment |
|
||||||
| **T4** `drop-target-resolution` | `core/ui/drag_out`, `core/wire/instrument_drop`, `shell/panel/panel_drag.cpp`, `shell/actions/instrument_drop_win.cpp`, `shell/actions/drag_out_win.cpp` (hand-off timing), `tests/test_drag_out.cpp` |
|
| **T4** `drop-target-resolution` | `core/ui/drag_out`, `core/wire/instrument_drop`, `shell/panel/panel_drag.cpp`, `shell/actions/instrument_drop_win.cpp`, `shell/actions/drag_out_win.cpp` (hand-off timing), `tests/test_drag_out.cpp` |
|
||||||
|
|||||||
@@ -445,3 +445,70 @@ today.
|
|||||||
bitmap and confirmed to place the stroke correctly, or it is redesigned to rasterize at
|
bitmap and confirmed to place the stroke correctly, or it is redesigned to rasterize at
|
||||||
physical rather than logical resolution once `IPlugViewContentScaleSupport` (or
|
physical rather than logical resolution once `IPlugViewContentScaleSupport` (or
|
||||||
equivalent) makes scaling real.
|
equivalent) makes scaling real.
|
||||||
|
|
||||||
|
## A multi-track TRACK capture renders one file per track and lands one of them
|
||||||
|
|
||||||
|
**Context (surfaced by Ψ-W1-T1, capture-range-exactness).** Track scope has always
|
||||||
|
rendered through `RENDER_SETTINGS &128` ("selected tracks via master"), and the
|
||||||
|
ranged item capture now joins it there. The SDK header (~3041) documents the
|
||||||
|
single-file bit `&(4<<16)` for "rendering selected items or razor edits" only, so it
|
||||||
|
does not apply to `&128`: the reading is that N selected tracks produce N files.
|
||||||
|
`capture.cpp` sets `RENDER_PATTERN` to one literal stem and detects success by
|
||||||
|
`std::filesystem::exists`, so N stems collapse onto one name and whichever file
|
||||||
|
survives lands as a successful capture carrying one track's audio.
|
||||||
|
|
||||||
|
**The wart.** `renderOffline` refuses this shape for the ranged ITEM capture
|
||||||
|
(`render_settings::isMultiTrackRangedItemRender`) because that path was newly routed
|
||||||
|
into it. Track scope with two or more tracks selected has the same exposure and is
|
||||||
|
deliberately untouched — changing a shipped action from "produces a file" to
|
||||||
|
"refuses" is a behavioral-contract change, and it was out of that track's surface.
|
||||||
|
|
||||||
|
**Intended fix.** Not proposed. Three shapes exist and the choice is a product call,
|
||||||
|
not a mechanical one: refuse (matching the item path), render each track and land N
|
||||||
|
bank entries (that is batch capture's meaning, not this action's), or sum the
|
||||||
|
selected tracks into one file (needs a summing render source `&128` does not offer).
|
||||||
|
|
||||||
|
**The constraint the fix MUST handle.** The per-track-output reading of `&128` is
|
||||||
|
INFERRED from the header's single-file wording, never observed in a DAW. Verify it
|
||||||
|
first — including what REAPER actually writes when N stems share one literal
|
||||||
|
`RENDER_PATTERN` — because the answer decides whether this is a defect at all.
|
||||||
|
|
||||||
|
**Priority / risk.** Unknown until the DAW check above runs. If the reading is right,
|
||||||
|
a silently-wrong capture on an ordinary two-track selection; if wrong, nothing.
|
||||||
|
|
||||||
|
**Done looks like.** The `&128` multi-track output shape is DAW-confirmed, and track
|
||||||
|
scope either produces defined correct output for a multi-track selection or refuses
|
||||||
|
it with a message naming the reason.
|
||||||
|
|
||||||
|
## A `SelectedItems` recipe replays against whatever items are selected then
|
||||||
|
|
||||||
|
**Context (surfaced by Ψ-W1-T1, capture-range-exactness).** `RunRecaptureFromSource`
|
||||||
|
rebuilds a `CaptureRequest` from the recorded `CaptureRecipe` and resolves its source
|
||||||
|
tracks by GUID. `renderOffline` engages `RenderTrackSelection` only when the recipe's
|
||||||
|
source mode is `SelectedTracks`, which is what makes a ranged item capture and a
|
||||||
|
track capture replay against their recorded tracks rather than the live selection.
|
||||||
|
|
||||||
|
**The wart.** A recipe whose source mode is `SelectedItems` — every pre-fix item-scope
|
||||||
|
capture, and every post-fix full-extent one — renders `&32`, which prints whatever
|
||||||
|
items happen to be selected when the replay fires. The recorded recipe therefore does
|
||||||
|
not fully determine the audio it reproduces, which is what "recapture from source"
|
||||||
|
promises.
|
||||||
|
|
||||||
|
**Intended fix.** Not proposed. The recipe stores tracks and a range; it carries no
|
||||||
|
item GUIDs, so no guard on the shell side can reconstruct the item selection from
|
||||||
|
what is recorded. Closing it means widening `CaptureRecipe` (a wire-format change with
|
||||||
|
a version rung) or re-sourcing full-extent item captures through the tracks render too,
|
||||||
|
which would drag them onto the isolation path for no gain.
|
||||||
|
|
||||||
|
**The constraint the fix MUST handle.** Widening the recipe must keep every already-
|
||||||
|
persisted recipe readable, and must not make a replay depend on items that no longer
|
||||||
|
exist — a deleted source item has to degrade to a stated refusal, not a silent
|
||||||
|
substitution.
|
||||||
|
|
||||||
|
**Priority / risk.** Pre-existing; not introduced or worsened by the range-exactness
|
||||||
|
work. Harmless when the user re-runs a recapture with the same items still selected,
|
||||||
|
wrong when they do not.
|
||||||
|
|
||||||
|
**Done looks like.** A `SelectedItems` recapture either reproduces its recorded audio
|
||||||
|
from the recipe alone, or refuses with a message naming what the recipe cannot pin
|
||||||
|
down.
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ add_library(reaper_reasampler MODULE
|
|||||||
${REASAMPLER_SRC_DIR}/shell/capture/bake_land.cpp
|
${REASAMPLER_SRC_DIR}/shell/capture/bake_land.cpp
|
||||||
${REASAMPLER_SRC_DIR}/shell/capture/scope_resolve.cpp
|
${REASAMPLER_SRC_DIR}/shell/capture/scope_resolve.cpp
|
||||||
${REASAMPLER_SRC_DIR}/shell/capture/render_selection.cpp
|
${REASAMPLER_SRC_DIR}/shell/capture/render_selection.cpp
|
||||||
|
${REASAMPLER_SRC_DIR}/shell/capture/render_isolation.cpp
|
||||||
${REASAMPLER_SRC_DIR}/shell/capture/realtime_lifecycle.cpp
|
${REASAMPLER_SRC_DIR}/shell/capture/realtime_lifecycle.cpp
|
||||||
${REASAMPLER_SRC_DIR}/shell/capture/capture_realtime_shell.cpp
|
${REASAMPLER_SRC_DIR}/shell/capture/capture_realtime_shell.cpp
|
||||||
${REASAMPLER_SRC_DIR}/shell/capture/capture_realtime_finalize.cpp
|
${REASAMPLER_SRC_DIR}/shell/capture/capture_realtime_finalize.cpp
|
||||||
@@ -46,7 +47,7 @@ add_library(reaper_reasampler MODULE
|
|||||||
${REASAMPLER_SRC_DIR}/shell/actions/instrument_drop_win.cpp
|
${REASAMPLER_SRC_DIR}/shell/actions/instrument_drop_win.cpp
|
||||||
${REASAMPLER_SRC_DIR}/shell/persist/usage_scan.cpp
|
${REASAMPLER_SRC_DIR}/shell/persist/usage_scan.cpp
|
||||||
)
|
)
|
||||||
target_link_libraries(reaper_reasampler PRIVATE json wire file_bytes bank_model capture_paths peaks bank_grid mode_switch tab_strip view_mode_model view_tree guid_diff lane_keys insert_plan render_settings render_window batch_capture tail_control capture_realtime bank_book wav_codec origin_ledger tracking_authority prune_reconcile prune_button app_version provenance drag_out instrument_drop theme component_geometry action_bar footer_bar overflow_menu mode_enable tooltip card_meta card_drag assignment_request bank_sync sample_usage bake_wire resample_name)
|
target_link_libraries(reaper_reasampler PRIVATE json wire file_bytes bank_model capture_paths peaks bank_grid mode_switch tab_strip view_mode_model view_tree guid_diff lane_keys insert_plan render_settings render_window track_topology batch_capture tail_control capture_realtime bank_book wav_codec origin_ledger tracking_authority prune_reconcile prune_button app_version provenance drag_out instrument_drop theme component_geometry action_bar footer_bar overflow_menu mode_enable tooltip card_meta card_drag assignment_request bank_sync sample_usage bake_wire resample_name)
|
||||||
# NOT linked here, deliberately: sampler_core / pitch_shift / the filter. The instrument
|
# NOT linked here, deliberately: sampler_core / pitch_shift / the filter. The instrument
|
||||||
# renders its own bake in its own process, which is what keeps the extension's link graph
|
# renders its own bake in its own process, which is what keeps the extension's link graph
|
||||||
# free of the voice engine — a link edge to it here means the design drifted.
|
# free of the voice engine — a link edge to it here means the design drifted.
|
||||||
|
|||||||
@@ -51,7 +51,8 @@ Detail specific to these pure modules:
|
|||||||
- `capture_paths` — the REAPER-free path arithmetic behind offline capture: bank-subfolder + unique-filename derivation (`deriveBankPaths`, forward-slash form, no filesystem touch), the absolute-render-dir vs. project-relative-index-path split (`BankPaths`), the persist-side inverse (`resolveBankFile`, `projectDirOfRpp`), the Save-As bank-relocation plan (`deriveRelocationPlan`), and the GUID-primary project-identity classifier (`classifyProjectTransition` → `NoOp`/`Load`/`SaveAsRelocate`) the persist-poll timer drives.
|
- `capture_paths` — the REAPER-free path arithmetic behind offline capture: bank-subfolder + unique-filename derivation (`deriveBankPaths`, forward-slash form, no filesystem touch), the absolute-render-dir vs. project-relative-index-path split (`BankPaths`), the persist-side inverse (`resolveBankFile`, `projectDirOfRpp`), the Save-As bank-relocation plan (`deriveRelocationPlan`), and the GUID-primary project-identity classifier (`classifyProjectTransition` → `NoOp`/`Load`/`SaveAsRelocate`) the persist-poll timer drives.
|
||||||
- `insert_plan` — the REAPER-free logic behind the `insert` shell (M6): computes the `InsertMedia` `mode` bitmask from an `InsertOptions` struct (placement target, tempo-conform ratio, preserve-pitch flag), guaranteeing the &4 stretch-to-time-selection bit is never set and that no tempo bits are set when `conform == None`.
|
- `insert_plan` — the REAPER-free logic behind the `insert` shell (M6): computes the `InsertMedia` `mode` bitmask from an `InsertOptions` struct (placement target, tempo-conform ratio, preserve-pitch flag), guaranteeing the &4 stretch-to-time-selection bit is never set and that no tempo bits are set when `conform == None`.
|
||||||
- `render_settings` — the REAPER-free logic behind the capture action family: `SourceMode` → `RENDER_SETTINGS` bit mapping, `P_RAZOREDITS` string parsing + range-union bounds, razor-else-time range inference, the FX-scope bypass plan (`fxBypassPlanFor`), the tail-mode → `RENDER_TAILFLAG`/`RENDER_NORMALIZE`/`RENDER_TRIMEND` mapping (`tailRenderSettingsFor`) and its realtime-window analog (`realtimeRecordWindowEnd`), and the capture-action taxonomy table (`captureActionTable`) `main.cpp` iterates to register the CAPTURE_ITEM/CAPTURE_TRACK family.
|
- `render_settings` — the REAPER-free logic behind the capture action family: `SourceMode` → `RENDER_SETTINGS` bit mapping, `P_RAZOREDITS` string parsing + range-union bounds, razor-else-time range inference, the FX-scope bypass plan (`fxBypassPlanFor`), the tail-mode → `RENDER_TAILFLAG`/`RENDER_NORMALIZE`/`RENDER_TRIMEND` mapping (`tailRenderSettingsFor`) and its realtime-window analog (`realtimeRecordWindowEnd`), and the capture-action taxonomy table (`captureActionTable`) `main.cpp` iterates to register the CAPTURE_ITEM/CAPTURE_TRACK family.
|
||||||
- `render_window` — the REAPER-free frame arithmetic behind exact capture bounds: `frameCountFor` (the frame count a project-time window occupies at the project rate — the number a capture's file must match) and `itemExtentPrintsWindow`, the predicate `render_settings::sourceModeForScope` consults to decide whether REAPER's selected-items render source can express a requested window at all.
|
- `render_window` — the REAPER-free frame arithmetic behind exact capture bounds: `frameCountFor` (the frame count a project-time window occupies at the project rate — the number the offline backend checks the rendered file against before landing it, so a widened render is refused rather than banked) and `itemExtentPrintsWindow`, the predicate `render_settings::sourceModeForScope` consults to decide whether REAPER's selected-items render source can express a requested window at all.
|
||||||
|
- `track_topology` — the REAPER-free folder arithmetic over a project's flat `I_FOLDERDEPTH` delta list: `directChildIndices` names a folder parent's DIRECT children, the set `shell/capture/render_isolation` silences so a ranged item capture does not print its track's children. Grandchildren are excluded by construction — they reach the parent only through the child that owns them.
|
||||||
- `tail_control` — the REAPER-free logic behind the docked `bank_panel`'s tail-mode toggle: the cycle order (None → Auto → Manual → None), the Manual-length clamp/scroll-wheel fine-adjust (`clampManualMs`/`adjustManualMs`, 250 ms/notch, 2000 ms default), the toggle's label text (e.g. "Tail: Manual 2.0s"), and the `TailSetting` JSON round-trip persist stores per-project.
|
- `tail_control` — the REAPER-free logic behind the docked `bank_panel`'s tail-mode toggle: the cycle order (None → Auto → Manual → None), the Manual-length clamp/scroll-wheel fine-adjust (`clampManualMs`/`adjustManualMs`, 250 ms/notch, 2000 ms default), the toggle's label text (e.g. "Tail: Manual 2.0s"), and the `TailSetting` JSON round-trip persist stores per-project.
|
||||||
|
|
||||||
## Gotchas
|
## Gotchas
|
||||||
@@ -68,7 +69,15 @@ Detail specific to these pure modules:
|
|||||||
item captured the whole item), NOT a header-confirmed fact. It is why
|
item captured the whole item), NOT a header-confirmed fact. It is why
|
||||||
`sourceModeForScope` routes item scope to `&32` only when the item extent
|
`sourceModeForScope` routes item scope to `&32` only when the item extent
|
||||||
already IS the requested window — do not re-point item scope unconditionally at
|
already IS the requested window — do not re-point item scope unconditionally at
|
||||||
`&32`, and do not widen the `&32` branch to windows it cannot express.
|
`&32`, and do not widen the `&32` branch to windows it cannot express. This is the
|
||||||
|
one home for that inference; the sites that act on it point here rather than
|
||||||
|
restating it.
|
||||||
|
- **The re-source changes the CONTENT, not the FX scope.** `fxBypassPlanFor` is keyed
|
||||||
|
on `CaptureScope`, so a ranged item capture still hears take/item FX only — but the
|
||||||
|
selected-tracks source prints everything upstream of the track. The shell answers
|
||||||
|
that with a transient silencing (`shell/capture/render_isolation`) whose child-set
|
||||||
|
walk lives here in `track_topology`; the item-vs-track asymmetry behind it is in
|
||||||
|
`src/shell/capture/CLAUDE.md`.
|
||||||
- `kRenderPreFaderStems` (&8192) is deliberately **not** used — REAPER offline
|
- `kRenderPreFaderStems` (&8192) is deliberately **not** used — REAPER offline
|
||||||
render has no true pre-FX "dry" bit; FX scoping is done entirely by the
|
render has no true pre-FX "dry" bit; FX scoping is done entirely by the
|
||||||
FX-bypass-around-render mechanism, never by a render bit.
|
FX-bypass-around-render mechanism, never by a render bit.
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ reasampler_test(render_settings LINK render_settings)
|
|||||||
reasampler_pure_library(render_window SOURCES render_window.cpp)
|
reasampler_pure_library(render_window SOURCES render_window.cpp)
|
||||||
reasampler_test(render_window LINK render_window)
|
reasampler_test(render_window LINK render_window)
|
||||||
|
|
||||||
|
reasampler_pure_library(track_topology SOURCES track_topology.cpp)
|
||||||
|
reasampler_test(track_topology LINK track_topology)
|
||||||
|
|
||||||
reasampler_pure_library(batch_capture SOURCES batch_capture.cpp)
|
reasampler_pure_library(batch_capture SOURCES batch_capture.cpp)
|
||||||
reasampler_test(batch_capture LINK batch_capture)
|
reasampler_test(batch_capture LINK batch_capture)
|
||||||
|
|
||||||
|
|||||||
@@ -112,6 +112,13 @@ SourceMode sourceModeForScope(CaptureScope scope, bool itemExtentIsWindow) {
|
|||||||
return SourceMode::SelectedTracks;
|
return SourceMode::SelectedTracks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isMultiTrackRangedItemRender(CaptureScope scope, SourceMode mode,
|
||||||
|
int sourceTrackCount) {
|
||||||
|
return scope == CaptureScope::Item
|
||||||
|
&& mode == SourceMode::SelectedTracks
|
||||||
|
&& sourceTrackCount > 1;
|
||||||
|
}
|
||||||
|
|
||||||
RangeSource inferRangeSource(bool hasRazorArea) {
|
RangeSource inferRangeSource(bool hasRazorArea) {
|
||||||
// Razor wins when present; otherwise the time selection. Orthogonal to scope.
|
// Razor wins when present; otherwise the time selection. Orthogonal to scope.
|
||||||
return hasRazorArea ? RangeSource::Razor : RangeSource::TimeSelection;
|
return hasRazorArea ? RangeSource::Razor : RangeSource::TimeSelection;
|
||||||
|
|||||||
@@ -110,14 +110,34 @@ enum class CaptureScope {
|
|||||||
//
|
//
|
||||||
// Item scope captures the selected items ONLY when `itemExtentIsWindow` — i.e.
|
// Item scope captures the selected items ONLY when `itemExtentIsWindow` — i.e.
|
||||||
// when those items' own extent already prints the requested window (see
|
// when those items' own extent already prints the requested window (see
|
||||||
// render_window::itemExtentPrintsWindow). REAPER's selected-items render source
|
// render_window::itemExtentPrintsWindow). REAPER's selected-items render source is
|
||||||
// derives the render's bounds from the item extents, so a window strictly inside
|
// INFERRED to derive its bounds from the item extents, so a window strictly inside
|
||||||
// (or wider than) a selected item cannot be expressed through it; that case
|
// (or wider than) a selected item cannot be expressed through it; that case renders
|
||||||
// renders time-bounded through the items' own tracks. The FX scope is unaffected
|
// time-bounded through the items' own tracks. The inference is unverified — see
|
||||||
// either way — fxBypassPlanFor is keyed on CaptureScope, not on the source mode,
|
// src/core/capture/CLAUDE.md §Gotchas for what it rests on.
|
||||||
// so an item capture still hears take/item FX only.
|
//
|
||||||
|
// The FX SCOPE is unaffected by the swap (fxBypassPlanFor is keyed on CaptureScope,
|
||||||
|
// not on the source mode, so an item capture still hears take/item FX only), but the
|
||||||
|
// CONTENT reaching the render is not: the selected-tracks source prints everything
|
||||||
|
// upstream of the track — its folder children and its receives — which the shell
|
||||||
|
// transiently silences (shell/capture/render_isolation). An overlapping item on the
|
||||||
|
// track ITSELF is deliberately not isolated; see src/shell/capture/CLAUDE.md.
|
||||||
SourceMode sourceModeForScope(CaptureScope scope, bool itemExtentIsWindow);
|
SourceMode sourceModeForScope(CaptureScope scope, bool itemExtentIsWindow);
|
||||||
|
|
||||||
|
// True for the one render shape that cannot land as a single capture: an item-scope
|
||||||
|
// capture re-sourced to the selected-tracks render (its window is not the item
|
||||||
|
// extent) whose selected items span more than one track. That source is read as
|
||||||
|
// rendering one file per selected track — the single-file bit is documented for
|
||||||
|
// item/razor sources only (SDK header ~3041), which is the whole basis for the
|
||||||
|
// reading and is DAW-unverified. If it holds, N tracks collapse N stems onto one
|
||||||
|
// literal render pattern and whichever file survived would land as a successful
|
||||||
|
// capture carrying one track's audio. The caller refuses instead.
|
||||||
|
//
|
||||||
|
// Track scope is deliberately NOT covered here even though it renders through the
|
||||||
|
// same source — see src/shell/capture/CLAUDE.md §Gotchas.
|
||||||
|
bool isMultiTrackRangedItemRender(CaptureScope scope, SourceMode mode,
|
||||||
|
int sourceTrackCount);
|
||||||
|
|
||||||
// --- Range inference: razor-else-time (orthogonal to scope) -------------------
|
// --- Range inference: razor-else-time (orthogonal to scope) -------------------
|
||||||
//
|
//
|
||||||
// Razor-present -> razor union; otherwise time selection. Razor is a range
|
// Razor-present -> razor union; otherwise time selection. Razor is a range
|
||||||
|
|||||||
@@ -11,15 +11,21 @@ namespace reasampler::capture {
|
|||||||
// is a difference of frame indices rather than a rounded duration — two windows
|
// is a difference of frame indices rather than a rounded duration — two windows
|
||||||
// of equal length at different offsets can legitimately differ by one frame.
|
// of equal length at different offsets can legitimately differ by one frame.
|
||||||
// Returns 0 for a non-positive rate or an empty/inverted window.
|
// Returns 0 for a non-positive rate or an empty/inverted window.
|
||||||
|
//
|
||||||
|
// The offline backend compares this against the rendered file's own frame count, so
|
||||||
|
// exact-bounds failures surface as a refused capture rather than a wrong file. That
|
||||||
|
// REAPER resolves the two edges the same way is UNVERIFIED — a DAW pass decides
|
||||||
|
// whether the equality is exact or off by a frame.
|
||||||
long long frameCountFor(double startSeconds, double endSeconds, int sampleRate);
|
long long frameCountFor(double startSeconds, double endSeconds, int sampleRate);
|
||||||
|
|
||||||
// True when a render bounded by the selected items' own extent
|
// True when a render bounded by the selected items' own extent
|
||||||
// [itemStart, itemEnd) already prints exactly the requested
|
// [itemStart, itemEnd) already prints exactly the requested
|
||||||
// [reqStart, reqEnd) window — the one case where REAPER's selected-items render
|
// [reqStart, reqEnd) window — the one case where REAPER's selected-items render
|
||||||
// source needs no correction. Compared at frame resolution, because a sub-frame
|
// source is believed to need no correction (the bounds-override inference behind
|
||||||
// difference prints the same frames. An unknown rate (<= 0) falls back to exact
|
// that is unverified; src/core/capture/CLAUDE.md §Gotchas states what it rests on).
|
||||||
// equality, which can only send a window to the time-bounded render, never widen
|
// Compared at frame resolution, because a sub-frame difference prints the same
|
||||||
// one.
|
// frames. An unknown rate (<= 0) falls back to exact equality, which can only send
|
||||||
|
// a window to the time-bounded render, never widen one.
|
||||||
bool itemExtentPrintsWindow(double reqStart, double reqEnd,
|
bool itemExtentPrintsWindow(double reqStart, double reqEnd,
|
||||||
double itemStart, double itemEnd,
|
double itemStart, double itemEnd,
|
||||||
int sampleRate);
|
int sampleRate);
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
// track_topology.cpp — see the header.
|
||||||
|
|
||||||
|
#include "core/capture/track_topology.h"
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
|
||||||
|
namespace reasampler::capture {
|
||||||
|
|
||||||
|
std::vector<int> directChildIndices(const std::vector<int>& folderDepths,
|
||||||
|
int parentIndex) {
|
||||||
|
std::vector<int> children;
|
||||||
|
const int count = static_cast<int>(folderDepths.size());
|
||||||
|
if (parentIndex < 0 || parentIndex >= count) return children;
|
||||||
|
if (folderDepths[static_cast<std::size_t>(parentIndex)] != 1) return children;
|
||||||
|
|
||||||
|
// Depth relative to the parent: 1 immediately after it (inside its folder), and
|
||||||
|
// 0 once the folder closes. Only tracks sitting at relative depth 1 are direct
|
||||||
|
// children; a child that opens its own folder pushes the level to 2, which is
|
||||||
|
// what excludes its descendants.
|
||||||
|
int level = 1;
|
||||||
|
for (int i = parentIndex + 1; i < count && level > 0; ++i) {
|
||||||
|
if (level == 1) children.push_back(i);
|
||||||
|
level += folderDepths[static_cast<std::size_t>(i)];
|
||||||
|
}
|
||||||
|
return children;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace reasampler::capture
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
#pragma once
|
||||||
|
// track_topology — pure folder arithmetic over a project's track list: which tracks
|
||||||
|
// are the DIRECT children of a folder parent, derived from the I_FOLDERDEPTH deltas
|
||||||
|
// alone. NO REAPER types (the shell reads the deltas); unit-tested by
|
||||||
|
// tests/test_track_topology.cpp.
|
||||||
|
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace reasampler::capture {
|
||||||
|
|
||||||
|
// Indices of `parentIndex`'s DIRECT children, given every track's I_FOLDERDEPTH in
|
||||||
|
// track order. I_FOLDERDEPTH is a DELTA applied AFTER its own track (SDK header
|
||||||
|
// ~2215: 0 = normal, 1 = opens a folder, -n = closes n folders), so the depth walk
|
||||||
|
// below is the only way to recover the tree from the flat list.
|
||||||
|
//
|
||||||
|
// Empty when `parentIndex` is out of range or its track does not open a folder.
|
||||||
|
// Grandchildren are deliberately excluded: their audio reaches the parent only
|
||||||
|
// through the direct child that owns them, so a caller silencing each direct child's
|
||||||
|
// send-to-parent silences the whole subtree. An unterminated folder (no closing
|
||||||
|
// negative delta) treats every remaining track as inside it, matching REAPER.
|
||||||
|
std::vector<int> directChildIndices(const std::vector<int>& folderDepths,
|
||||||
|
int parentIndex);
|
||||||
|
|
||||||
|
} // namespace reasampler::capture
|
||||||
@@ -25,6 +25,18 @@ detail not covered there:
|
|||||||
resolved range (`core/capture/render_window`) and hands the answer to
|
resolved range (`core/capture/render_window`) and hands the answer to
|
||||||
`sourceModeForScope` on `ResolvedSource`. Why, in
|
`sourceModeForScope` on `ResolvedSource`. Why, in
|
||||||
`src/core/capture/CLAUDE.md`.
|
`src/core/capture/CLAUDE.md`.
|
||||||
|
- **A ranged item capture isolates TRACKS, not ITEMS.** Routing it through the
|
||||||
|
selected-tracks source widens what the render hears, and the two widenings are
|
||||||
|
answered differently. Folder children and receives are cut for the render's
|
||||||
|
duration (`render_isolation`) because they are tracks, and a recipe carrying
|
||||||
|
tracks can recompute that plan at replay time. An overlapping item on the source
|
||||||
|
track itself is NOT isolated: the recipe stores tracks and a range, never item
|
||||||
|
GUIDs, so a mute plan over items could not be replayed and the capture would stop
|
||||||
|
reproducing itself. Do not "fix" the second by muting items.
|
||||||
|
- **`renderOffline` is the one seam both a fresh capture and a recipe replay
|
||||||
|
cross**, which is why the refusal and both transient guards live there rather
|
||||||
|
than in the action bodies — anything placed in `ResolveScopeSource` alone would
|
||||||
|
miss `RunRecaptureFromSource` entirely.
|
||||||
- **FX-bypass guard ordering.** `scope_resolve` reads the M10 provenance-assembly
|
- **FX-bypass guard ordering.** `scope_resolve` reads the M10 provenance-assembly
|
||||||
inputs (track/item selection, FX-chain identity) BEFORE the FX-bypass guard
|
inputs (track/item selection, FX-chain identity) BEFORE the FX-bypass guard
|
||||||
neutralizes the in-scope chain — provenance must see the chain as it really is,
|
neutralizes the in-scope chain — provenance must see the chain as it really is,
|
||||||
@@ -41,7 +53,8 @@ detail not covered there:
|
|||||||
|
|
||||||
- `capture` — two CONCRETE backends with deliberately different lifecycles (no shared interface — the former `ICaptureBackend` was deleted in Q-W3, T4-26: one deriver, zero polymorphic call sites): `OfflineRenderBackend` (deterministic default, synchronous) and `RealtimeRecordBackend` (async begin/tick/abort). Input: `CaptureRequest`. Output: finished file + populated `Sample` handed to `bank_model`.
|
- `capture` — two CONCRETE backends with deliberately different lifecycles (no shared interface — the former `ICaptureBackend` was deleted in Q-W3, T4-26: one deriver, zero polymorphic call sites): `OfflineRenderBackend` (deterministic default, synchronous) and `RealtimeRecordBackend` (async begin/tick/abort). Input: `CaptureRequest`. Output: finished file + populated `Sample` handed to `bank_model`.
|
||||||
- `scope_resolve` (`shell/capture`) — scope/source resolution shared by every capture entry point (Q-W3 hoist out of `main.cpp`): razor-else-time range inference, selected-track/selected-item-owning-track collection with canonical GUIDs, and the M10 provenance-assembly inputs (read BEFORE the FX-bypass guard neutralizes the in-scope chain).
|
- `scope_resolve` (`shell/capture`) — scope/source resolution shared by every capture entry point (Q-W3 hoist out of `main.cpp`): razor-else-time range inference, selected-track/selected-item-owning-track collection with canonical GUIDs, and the M10 provenance-assembly inputs (read BEFORE the FX-bypass guard neutralizes the in-scope chain).
|
||||||
- `render_selection` (`shell/capture`) — the transient track selection a selected-tracks render (`&128`) requires, as a stack RAII guard: REAPER prints whatever tracks are selected, so `renderOffline` makes the request's own tracks BE the selection for the render's duration and restores the user's set on every exit path. Engaged only for that source mode; a ranged item capture and re-capture-from-source both name tracks the user has not selected.
|
- `render_selection` (`shell/capture`) — the transient track selection a selected-tracks render (`&128`) requires, as a stack RAII guard: REAPER prints whatever tracks are selected, so `renderOffline` makes the request's own tracks BE the selection for the render's duration and restores the user's set on every exit path. Engaged ONLY for that source mode, which leaves a stated residual: a `&32` selected-items render still prints whatever ITEMS the user has selected. Live captures are unaffected (that selection is the source), but a recipe replay of a `SelectedItems` capture renders against whatever happens to be selected then — the recipe stores tracks and a range, never item GUIDs, so this guard cannot close it. Filed in `docs/TODO.md`.
|
||||||
|
- `render_isolation` (`shell/capture`) — the transient upstream silencing a ranged ITEM render needs, as a stack RAII guard alongside the two above: the selected-tracks source prints everything flowing INTO the track, so each direct folder child's `B_MAINSEND` and each of the track's receives' `B_MUTE` are cut for the render and restored on every exit path. Direct children only — a grandchild reaches the track through the child that owns it. The child-set walk is pure (`core/capture/track_topology`).
|
||||||
- `capture_orchestrator` (`shell/capture`) — single-capture orchestration + the realtime/insert action bodies (Q-W3 hoist, T4-02): `renderOffline` (one offline render under the scope's FX-bypass guard), `captureAndIndexOne` (render + provenance stamp + bank add + tracking-ledger record, unpersisted), `RunCapture`/`RunCaptureItemAssign`, `RunCaptureRealtimeTrack`/`RunCancelRealtime` (the realtime action bodies — the in-flight state lives in `realtime_lifecycle`), and `RunInsertSelected` (the ONE deliberate exception to capture-never-places).
|
- `capture_orchestrator` (`shell/capture`) — single-capture orchestration + the realtime/insert action bodies (Q-W3 hoist, T4-02): `renderOffline` (one offline render under the scope's FX-bypass guard), `captureAndIndexOne` (render + provenance stamp + bank add + tracking-ledger record, unpersisted), `RunCapture`/`RunCaptureItemAssign`, `RunCaptureRealtimeTrack`/`RunCancelRealtime` (the realtime action bodies — the in-flight state lives in `realtime_lifecycle`), and `RunInsertSelected` (the ONE deliberate exception to capture-never-places).
|
||||||
- `bake_land` (`shell/capture`) — the EXTENSION's half of the resample chain: scans every open project tab for pending `rsbake_*` requests, lands the ones belonging to the project this session has loaded, and refuses the rest with `WrongProject` — one undo point for the batch, each answered over its own key inside the invoking instance's synchronous action call. It RENDERS NOTHING — the instrument already did, through its own engine in its own process, which is what makes the baked audio the sound the user approved and what keeps the voice engine out of the extension's link graph. Replace-vs-add comes from `tracking::resampleLanding`; a replace keeps the entry's id and slot and never deletes the superseded file. Hash-dedup applies on the add path only, before the disk write, matching `updateSampleInPlace`'s "an in-place refresh is not an insert". A refused index withdraws the bytes this call had just written — the self-cleanup carve-out from prune's deletion authority, stated in `prune_fs.cpp`'s header.
|
- `bake_land` (`shell/capture`) — the EXTENSION's half of the resample chain: scans every open project tab for pending `rsbake_*` requests, lands the ones belonging to the project this session has loaded, and refuses the rest with `WrongProject` — one undo point for the batch, each answered over its own key inside the invoking instance's synchronous action call. It RENDERS NOTHING — the instrument already did, through its own engine in its own process, which is what makes the baked audio the sound the user approved and what keeps the voice engine out of the extension's link graph. Replace-vs-add comes from `tracking::resampleLanding`; a replace keeps the entry's id and slot and never deletes the superseded file. Hash-dedup applies on the add path only, before the disk write, matching `updateSampleInPlace`'s "an in-place refresh is not an insert". A refused index withdraws the bytes this call had just written — the self-cleanup carve-out from prune's deletion authority, stated in `prune_fs.cpp`'s header.
|
||||||
- `capture_batch` (`shell/capture`) — the batch-capture family + re-capture-from-source (Q-W3 hoist, T4-02): `RunBatchCaptureItems` (one sample per selected item), `RunBatchCaptureRazor` (one sample per razor area), `RunRecaptureFromSource` (regenerate a provenanced sample from its recorded source's current state, bank-only). Every unit routes through `capture_orchestrator` so every precision invariant holds; persist is batched to one ext-state write per action.
|
- `capture_batch` (`shell/capture`) — the batch-capture family + re-capture-from-source (Q-W3 hoist, T4-02): `RunBatchCaptureItems` (one sample per selected item), `RunBatchCaptureRazor` (one sample per razor area), `RunRecaptureFromSource` (regenerate a provenanced sample from its recorded source's current state, bank-only). Every unit routes through `capture_orchestrator` so every precision invariant holds; persist is batched to one ext-state write per action.
|
||||||
@@ -60,3 +73,12 @@ detail not covered there:
|
|||||||
- `capture` and `capture_realtime_shell` deliberately share NO common interface with
|
- `capture` and `capture_realtime_shell` deliberately share NO common interface with
|
||||||
each other (the former `ICaptureBackend` was removed) — do not reintroduce one
|
each other (the former `ICaptureBackend` was removed) — do not reintroduce one
|
||||||
without a real second polymorphic call site.
|
without a real second polymorphic call site.
|
||||||
|
- **The selected-tracks render (`&128`) is read as emitting one file per selected
|
||||||
|
track** — the single-file bit is documented for item/razor sources only (SDK header
|
||||||
|
~3041), and that is the whole basis for the reading; it is DAW-unverified. If it
|
||||||
|
holds, then since `RENDER_PATTERN` is one literal stem and success is a file-exists
|
||||||
|
check, N tracks would land one track's audio as a successful capture.
|
||||||
|
`renderOffline` refuses that shape for the RANGED ITEM capture only
|
||||||
|
(`render_settings::isMultiTrackRangedItemRender`). Track scope renders through the
|
||||||
|
same source with the same exposure and is deliberately untouched here — filed in
|
||||||
|
`docs/TODO.md`.
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
#include "core/capture/wav_codec.h" // hashWavContent — the one WAV/RIFF owner
|
#include "core/capture/wav_codec.h" // hashWavContent — the one WAV/RIFF owner
|
||||||
#include "core/util/file_bytes.h"
|
#include "core/util/file_bytes.h"
|
||||||
#include "core/capture/render_settings.h"
|
#include "core/capture/render_settings.h"
|
||||||
|
#include "core/capture/render_window.h" // frameCountFor — the exact-bounds number
|
||||||
|
|
||||||
#define REAPERAPI_MINIMAL
|
#define REAPERAPI_MINIMAL
|
||||||
#define REAPERAPI_WANT_EnumProjects
|
#define REAPERAPI_WANT_EnumProjects
|
||||||
@@ -394,6 +395,35 @@ CaptureResult OfflineRenderBackend::capture(const CaptureRequest& request) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Exact bounds, made structural: with no tail requested the file must contain
|
||||||
|
// exactly the requested window's frames, so a source mode that silently widened
|
||||||
|
// the render fails loudly here instead of landing as a successful capture. Auto
|
||||||
|
// and Manual add frames by design and are skipped. UNVERIFIED: that REAPER
|
||||||
|
// resolves the window's two edges to frame indices the same way frameCountFor
|
||||||
|
// does — a DAW pass decides whether this equality is exact or off by a frame.
|
||||||
|
// (The file is read again by stampCaptureSample below; the duplicate read is a
|
||||||
|
// once-per-capture cost on an already-warm file.)
|
||||||
|
if (request.tailMode == TailMode::None) {
|
||||||
|
const WavLayout layout =
|
||||||
|
parseWavLayout(util::readFileBytes(expectedPath));
|
||||||
|
const long long expectedFrames = layout.valid
|
||||||
|
? frameCountFor(request.startSeconds, request.endSeconds,
|
||||||
|
static_cast<int>(layout.sampleRate))
|
||||||
|
: 0;
|
||||||
|
const long long actualFrames = static_cast<long long>(layout.frameCount());
|
||||||
|
if (expectedFrames > 0 && actualFrames != expectedFrames) {
|
||||||
|
result.status = CaptureStatus::BoundsMismatch;
|
||||||
|
result.message = "Render produced " + std::to_string(actualFrames) +
|
||||||
|
" frames but the requested range is " +
|
||||||
|
std::to_string(expectedFrames) + " at " +
|
||||||
|
std::to_string(layout.sampleRate) +
|
||||||
|
" Hz -- the render did not honor the requested bounds. "
|
||||||
|
"Nothing was added to the bank; the file is at: " +
|
||||||
|
expectedPath;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Record the request's own bounds (exact) rather than re-measuring the file.
|
// Record the request's own bounds (exact) rather than re-measuring the file.
|
||||||
Sample s;
|
Sample s;
|
||||||
// Same uniqueTag that named the file — calling makeUniqueTag() again could
|
// Same uniqueTag that named the file — calling makeUniqueTag() again could
|
||||||
|
|||||||
@@ -71,6 +71,8 @@ enum class CaptureStatus {
|
|||||||
UnsupportedFormat, // requested bit depth has no known REAPER blob (Float32 only)
|
UnsupportedFormat, // requested bit depth has no known REAPER blob (Float32 only)
|
||||||
RenderFailed, // the render action ran but produced no output file
|
RenderFailed, // the render action ran but produced no output file
|
||||||
TransportBusy, // realtime backend: transport already playing/recording — refused
|
TransportBusy, // realtime backend: transport already playing/recording — refused
|
||||||
|
MultiTrackRange, // a ranged item capture whose items span >1 track — would render N files
|
||||||
|
BoundsMismatch, // the rendered file's frame count is not the requested window's
|
||||||
};
|
};
|
||||||
|
|
||||||
struct CaptureResult {
|
struct CaptureResult {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
#include "shell/capture/insert.h" // runInsert / InsertRequest
|
#include "shell/capture/insert.h" // runInsert / InsertRequest
|
||||||
#include "shell/capture/realtime_lifecycle.h" // the in-flight realtime state
|
#include "shell/capture/realtime_lifecycle.h" // the in-flight realtime state
|
||||||
#include "shell/capture/render_selection.h" // RenderTrackSelection
|
#include "shell/capture/render_selection.h" // RenderTrackSelection
|
||||||
|
#include "shell/capture/render_isolation.h" // UpstreamIsolation
|
||||||
|
|
||||||
#include "reaper_plugin.h" // UNDO_STATE_MISCCFG
|
#include "reaper_plugin.h" // UNDO_STATE_MISCCFG
|
||||||
|
|
||||||
@@ -181,15 +182,41 @@ CaptureResult renderOffline(CaptureScope scope,
|
|||||||
const std::vector<MediaTrack*>& sourceTracks,
|
const std::vector<MediaTrack*>& sourceTracks,
|
||||||
const CaptureRequest& req)
|
const CaptureRequest& req)
|
||||||
{
|
{
|
||||||
|
// Refused BEFORE anything is touched, so the refusal path has nothing to
|
||||||
|
// restore. This is the seam BOTH a fresh capture and a recipe replay cross, so
|
||||||
|
// neither can land the multi-stem render the predicate names.
|
||||||
|
if (isMultiTrackRangedItemRender(scope, req.sourceMode,
|
||||||
|
static_cast<int>(sourceTracks.size())))
|
||||||
|
{
|
||||||
|
CaptureResult refused;
|
||||||
|
refused.status = CaptureStatus::MultiTrackRange;
|
||||||
|
refused.message =
|
||||||
|
"This range is narrower than the selected items, so it renders through "
|
||||||
|
"their tracks -- and those items span more than one track, which renders "
|
||||||
|
"one file per track. Capture one track's items at a time, or make the "
|
||||||
|
"range match the items' extent.";
|
||||||
|
return refused;
|
||||||
|
}
|
||||||
|
|
||||||
ReaProject* proj = EnumProjects(-1, nullptr, 0);
|
ReaProject* proj = EnumProjects(-1, nullptr, 0);
|
||||||
// A selected-tracks render prints the DAW's track selection, so the request's
|
// A selected-tracks render prints the DAW's track selection, so the request's
|
||||||
// own tracks must BE that selection for the render — the plain track scope
|
// own tracks must BE that selection for the render — the plain track scope
|
||||||
// already resolved them from the live selection (identity), but a ranged item
|
// already resolved them from the live selection (identity), but a ranged item
|
||||||
// capture and a re-capture-from-source both name tracks the user has not
|
// capture and a re-capture-from-source both name tracks the user has not
|
||||||
// selected. Both guards outlive the render call and restore on every path.
|
// selected. Every guard below outlives the render call and restores on every path.
|
||||||
std::optional<RenderTrackSelection> selection;
|
std::optional<RenderTrackSelection> selection;
|
||||||
|
std::optional<UpstreamIsolation> isolation;
|
||||||
if (req.sourceMode == SourceMode::SelectedTracks)
|
if (req.sourceMode == SourceMode::SelectedTracks)
|
||||||
|
{
|
||||||
selection.emplace(sourceTracks);
|
selection.emplace(sourceTracks);
|
||||||
|
// An ITEM capture routed through the tracks source would otherwise print
|
||||||
|
// everything upstream of the track — folder children, receives — which the
|
||||||
|
// selected-items source excluded. The refusal above is what makes the single
|
||||||
|
// source track here the whole set. Track scope is left alone: a folder
|
||||||
|
// parent's own output IS its children summed.
|
||||||
|
if (scope == CaptureScope::Item && !sourceTracks.empty())
|
||||||
|
isolation.emplace(sourceTracks.front());
|
||||||
|
}
|
||||||
FxBypassGuard fxGuard(scope, sourceTracks, proj);
|
FxBypassGuard fxGuard(scope, sourceTracks, proj);
|
||||||
OfflineRenderBackend backend;
|
OfflineRenderBackend backend;
|
||||||
return backend.capture(req);
|
return backend.capture(req);
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
// render_isolation.cpp — see the header.
|
||||||
|
//
|
||||||
|
// Compiled into the reaper_reasampler module. Includes reaper_plugin_functions.h
|
||||||
|
// WITHOUT REAPERAPI_IMPLEMENT — main.cpp is the one TU that defines the API
|
||||||
|
// pointers; here they are extern.
|
||||||
|
|
||||||
|
#include "shell/capture/render_isolation.h"
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
|
||||||
|
#include "core/capture/track_topology.h" // directChildIndices
|
||||||
|
|
||||||
|
#define REAPERAPI_MINIMAL
|
||||||
|
#define REAPERAPI_WANT_CountTracks
|
||||||
|
#define REAPERAPI_WANT_GetTrack
|
||||||
|
#define REAPERAPI_WANT_GetMediaTrackInfo_Value
|
||||||
|
#define REAPERAPI_WANT_SetMediaTrackInfo_Value
|
||||||
|
#define REAPERAPI_WANT_GetTrackNumSends
|
||||||
|
#define REAPERAPI_WANT_GetTrackSendInfo_Value
|
||||||
|
#define REAPERAPI_WANT_SetTrackSendInfo_Value
|
||||||
|
#include "reaper_plugin_functions.h"
|
||||||
|
|
||||||
|
namespace reasampler::capture {
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
// GetTrackNumSends / *TrackSendInfo_Value category: < 0 selects the RECEIVE list
|
||||||
|
// (SDK header ~3644, ~3676).
|
||||||
|
constexpr int kReceivesCategory = -1;
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
UpstreamIsolation::UpstreamIsolation(MediaTrack* track)
|
||||||
|
: track_(track)
|
||||||
|
{
|
||||||
|
if (!track_) return;
|
||||||
|
|
||||||
|
// One pass over the track list for both the depth deltas and this track's index;
|
||||||
|
// the pure walk turns the flat delta list into the direct-child set. The master
|
||||||
|
// is absent from GetTrack's index space (it is reached only via GetMasterTrack)
|
||||||
|
// and has no send-to-parent to cut, so nothing is missed by ignoring it.
|
||||||
|
const int total = CountTracks(nullptr);
|
||||||
|
std::vector<MediaTrack*> tracks;
|
||||||
|
std::vector<int> depths;
|
||||||
|
tracks.reserve(static_cast<std::size_t>(total < 0 ? 0 : total));
|
||||||
|
depths.reserve(static_cast<std::size_t>(total < 0 ? 0 : total));
|
||||||
|
int parentIndex = -1;
|
||||||
|
for (int i = 0; i < total; ++i)
|
||||||
|
{
|
||||||
|
MediaTrack* tr = GetTrack(nullptr, i);
|
||||||
|
tracks.push_back(tr);
|
||||||
|
depths.push_back(tr ? static_cast<int>(
|
||||||
|
GetMediaTrackInfo_Value(tr, "I_FOLDERDEPTH"))
|
||||||
|
: 0);
|
||||||
|
if (tr == track_) parentIndex = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int idx : directChildIndices(depths, parentIndex))
|
||||||
|
{
|
||||||
|
MediaTrack* child = tracks[static_cast<std::size_t>(idx)];
|
||||||
|
if (!child) continue;
|
||||||
|
// B_MAINSEND: "track sends audio to parent" (SDK header ~2238/~2957).
|
||||||
|
children_.push_back({child, GetMediaTrackInfo_Value(child, "B_MAINSEND")});
|
||||||
|
SetMediaTrackInfo_Value(child, "B_MAINSEND", 0.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
const int receives = GetTrackNumSends(track_, kReceivesCategory);
|
||||||
|
receiveMutes_.reserve(static_cast<std::size_t>(receives < 0 ? 0 : receives));
|
||||||
|
for (int i = 0; i < receives; ++i)
|
||||||
|
{
|
||||||
|
receiveMutes_.push_back(
|
||||||
|
GetTrackSendInfo_Value(track_, kReceivesCategory, i, "B_MUTE"));
|
||||||
|
SetTrackSendInfo_Value(track_, kReceivesCategory, i, "B_MUTE", 1.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
UpstreamIsolation::~UpstreamIsolation()
|
||||||
|
{
|
||||||
|
for (std::size_t i = 0; i < receiveMutes_.size(); ++i)
|
||||||
|
SetTrackSendInfo_Value(track_, kReceivesCategory, static_cast<int>(i),
|
||||||
|
"B_MUTE", receiveMutes_[i]);
|
||||||
|
for (const ChildSend& c : children_)
|
||||||
|
SetMediaTrackInfo_Value(c.track, "B_MAINSEND", c.mainSend);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace reasampler::capture
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
#pragma once
|
||||||
|
// The transient silencing a ranged ITEM render needs: REAPER's selected-tracks
|
||||||
|
// source prints everything upstream of the track — its folder children and its
|
||||||
|
// receives — which an item capture must not hear. Stack RAII, restored on every
|
||||||
|
// path. The .cpp includes reaper_plugin_functions.h WITHOUT REAPERAPI_IMPLEMENT.
|
||||||
|
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "shell/capture/capture.h" // MediaTrack fwd
|
||||||
|
|
||||||
|
namespace reasampler::capture {
|
||||||
|
|
||||||
|
// RAII: for one render, cuts every route by which audio that is not `track`'s own
|
||||||
|
// items reaches `track` — each direct folder child's send-to-parent (B_MAINSEND) and
|
||||||
|
// each of `track`'s own receives (that receive's B_MUTE). Both are per-route levers,
|
||||||
|
// so a child or a sender keeps its FX, its fader, and its routing elsewhere intact.
|
||||||
|
// Every touched value is restored on every exit path; nothing is created or removed,
|
||||||
|
// so the project is unchanged afterwards (non-destructive invariant).
|
||||||
|
//
|
||||||
|
// An overlapping item on `track` ITSELF is deliberately NOT isolated — the reason is
|
||||||
|
// in src/shell/capture/CLAUDE.md.
|
||||||
|
class UpstreamIsolation
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit UpstreamIsolation(MediaTrack* track);
|
||||||
|
~UpstreamIsolation();
|
||||||
|
|
||||||
|
UpstreamIsolation(const UpstreamIsolation&) = delete;
|
||||||
|
UpstreamIsolation& operator=(const UpstreamIsolation&) = delete;
|
||||||
|
|
||||||
|
private:
|
||||||
|
struct ChildSend {
|
||||||
|
MediaTrack* track = nullptr;
|
||||||
|
double mainSend = 0.0; // original B_MAINSEND
|
||||||
|
};
|
||||||
|
|
||||||
|
MediaTrack* track_ = nullptr;
|
||||||
|
std::vector<ChildSend> children_;
|
||||||
|
std::vector<double> receiveMutes_; // original B_MUTE, indexed by receive index
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace reasampler::capture
|
||||||
@@ -18,9 +18,11 @@ namespace reasampler::capture {
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
// Deselect every track in GetTrack's index space (which excludes the master, SDK
|
// Deselect every track in GetTrack's index space, then select exactly `tracks` — so
|
||||||
// ~2634), then select exactly `tracks` — so the resulting selection is the set,
|
// the resulting selection is the set, not the set unioned with whatever was already
|
||||||
// not the set unioned with whatever was already selected.
|
// selected. That index space holds no master track (the master is reached only via
|
||||||
|
// GetMasterTrack); the header states this nowhere, so treat it as behavior rather
|
||||||
|
// than a documented guarantee.
|
||||||
void selectOnly(const std::vector<MediaTrack*>& tracks)
|
void selectOnly(const std::vector<MediaTrack*>& tracks)
|
||||||
{
|
{
|
||||||
const int total = CountTracks(nullptr);
|
const int total = CountTracks(nullptr);
|
||||||
|
|||||||
@@ -86,9 +86,11 @@ bool collectSelectedItemTracks(ResolvedSource& out,
|
|||||||
return !out.sourceTracks.empty();
|
return !out.sourceTracks.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 0 when the project never pinned a rate (and nominal unless PROJECT_SRATE_USE is
|
// The header says only that PROJECT_SRATE is IGNORED unless PROJECT_SRATE_USE is set
|
||||||
// set, SDK ~3064) — passed through as "unknown", which the pure window comparison
|
// (SDK ~3064); that it READS 0 on a project which never pinned a rate is an
|
||||||
// handles by falling back to exact equality.
|
// inference, unverified. Either way a non-positive answer is passed through as
|
||||||
|
// "unknown", which the pure window comparison handles by falling back to exact
|
||||||
|
// equality.
|
||||||
int projectSampleRate()
|
int projectSampleRate()
|
||||||
{
|
{
|
||||||
ReaProject* proj = EnumProjects(-1, nullptr, 0);
|
ReaProject* proj = EnumProjects(-1, nullptr, 0);
|
||||||
|
|||||||
@@ -216,11 +216,12 @@ static void testScopeSourceModes() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void testRangedItemScopeRendersTimeBounded() {
|
static void testRangedItemScopeRendersTimeBounded() {
|
||||||
// The Ψ.7 defect pinned at the bit level. A window the item extent does NOT
|
// The widening defect pinned at the bit level. A window the item extent does NOT
|
||||||
// print must never reach the &32 selected-items source: that source takes its
|
// print must never reach the &32 selected-items source: that source is INFERRED
|
||||||
// bounds from the item extents, so RENDER_STARTPOS/ENDPOS cannot narrow it and
|
// (unverified — src/core/capture/CLAUDE.md §Gotchas) to take its bounds from the
|
||||||
// the capture widens to the whole item. The ranged item capture renders through
|
// item extents, so RENDER_STARTPOS/ENDPOS cannot narrow it and the capture widens
|
||||||
// the selected-tracks source instead, which IS time-bounded.
|
// to the whole item. The ranged item capture renders through the selected-tracks
|
||||||
|
// source instead, which IS time-bounded.
|
||||||
const SourceMode ranged = sourceModeForScope(CaptureScope::Item, false);
|
const SourceMode ranged = sourceModeForScope(CaptureScope::Item, false);
|
||||||
CHECK(ranged == SourceMode::SelectedTracks);
|
CHECK(ranged == SourceMode::SelectedTracks);
|
||||||
|
|
||||||
@@ -242,6 +243,41 @@ static void testRangedItemScopeRendersTimeBounded() {
|
|||||||
CHECK(fxBypassPlanFor(CaptureScope::Item).bypassSelfFx);
|
CHECK(fxBypassPlanFor(CaptureScope::Item).bypassSelfFx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void testMultiTrackRangedItemRenderIsNamedForRefusal() {
|
||||||
|
// The one shape that cannot land: a ranged item capture (item scope re-sourced to
|
||||||
|
// the selected-tracks render) whose items span more than one track. That source
|
||||||
|
// renders one file per track with no single-file bit available, so N stems would
|
||||||
|
// collapse onto one render pattern and one track's audio would land as a
|
||||||
|
// successful capture.
|
||||||
|
CHECK(isMultiTrackRangedItemRender(CaptureScope::Item,
|
||||||
|
SourceMode::SelectedTracks, 2));
|
||||||
|
CHECK(isMultiTrackRangedItemRender(CaptureScope::Item,
|
||||||
|
SourceMode::SelectedTracks, 7));
|
||||||
|
|
||||||
|
// One track is the whole point of the re-source — it must still render.
|
||||||
|
CHECK(!isMultiTrackRangedItemRender(CaptureScope::Item,
|
||||||
|
SourceMode::SelectedTracks, 1));
|
||||||
|
CHECK(!isMultiTrackRangedItemRender(CaptureScope::Item,
|
||||||
|
SourceMode::SelectedTracks, 0));
|
||||||
|
|
||||||
|
// A full-extent item capture keeps the selected-items source, whose single-file
|
||||||
|
// bit already sums a multi-track item selection into one file.
|
||||||
|
CHECK(!isMultiTrackRangedItemRender(CaptureScope::Item,
|
||||||
|
SourceMode::SelectedItems, 3));
|
||||||
|
|
||||||
|
// Track scope renders through the same source and is deliberately untouched here
|
||||||
|
// — that per-track output predates the item re-source and is filed in docs/TODO.md.
|
||||||
|
CHECK(!isMultiTrackRangedItemRender(CaptureScope::Track,
|
||||||
|
SourceMode::SelectedTracks, 3));
|
||||||
|
|
||||||
|
// The predicate is reachable from the mapping it guards: the ranged item capture's
|
||||||
|
// own source mode is the one it names.
|
||||||
|
CHECK(isMultiTrackRangedItemRender(CaptureScope::Item,
|
||||||
|
sourceModeForScope(CaptureScope::Item, false), 2));
|
||||||
|
CHECK(!isMultiTrackRangedItemRender(CaptureScope::Item,
|
||||||
|
sourceModeForScope(CaptureScope::Item, true), 2));
|
||||||
|
}
|
||||||
|
|
||||||
// --- inferRangeSource: razor-else-time (orthogonal to scope) -----------------
|
// --- inferRangeSource: razor-else-time (orthogonal to scope) -----------------
|
||||||
|
|
||||||
static void testRangeInference() {
|
static void testRangeInference() {
|
||||||
@@ -339,6 +375,7 @@ int main() {
|
|||||||
testRazorUnionBounds();
|
testRazorUnionBounds();
|
||||||
testScopeSourceModes();
|
testScopeSourceModes();
|
||||||
testRangedItemScopeRendersTimeBounded();
|
testRangedItemScopeRendersTimeBounded();
|
||||||
|
testMultiTrackRangedItemRenderIsNamedForRefusal();
|
||||||
testRangeInference();
|
testRangeInference();
|
||||||
testItemScopeBypassesEverythingButTake();
|
testItemScopeBypassesEverythingButTake();
|
||||||
testTrackScopeKeepsSelfBypassesAncestorsAndMaster();
|
testTrackScopeKeepsSelfBypassesAncestorsAndMaster();
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
// Standalone tests for reasampler::track_topology — no REAPER, no framework.
|
||||||
|
// Covers the direct-child walk over a flat I_FOLDERDEPTH delta list: the set a
|
||||||
|
// ranged item render must silence so a folder parent's children stay out of the
|
||||||
|
// capture.
|
||||||
|
|
||||||
|
#include "../src/core/capture/track_topology.h"
|
||||||
|
|
||||||
|
#include <cstdio>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
using namespace reasampler::capture;
|
||||||
|
|
||||||
|
static int g_fail = 0;
|
||||||
|
#define CHECK(cond) do { if(!(cond)) { \
|
||||||
|
std::printf("FAIL line %d: %s\n", __LINE__, #cond); ++g_fail; } } while(0)
|
||||||
|
|
||||||
|
static bool sameIndices(const std::vector<int>& got, const std::vector<int>& want) {
|
||||||
|
return got == want;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void testFlatProjectHasNoChildren() {
|
||||||
|
// No track opens a folder, so no track has children — including the one asked
|
||||||
|
// about. A flat project must produce an empty silence set, not a stray one.
|
||||||
|
const std::vector<int> depths{0, 0, 0};
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 0), {}));
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 1), {}));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void testFolderParentReturnsItsDirectChildren() {
|
||||||
|
// 0: folder parent, 1: child, 2: last child (closes the folder), 3: unrelated.
|
||||||
|
const std::vector<int> depths{1, 0, -1, 0};
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 0), {1, 2}));
|
||||||
|
// Track 3 sits outside the folder entirely and owns nothing.
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 3), {}));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void testGrandchildrenAreExcluded() {
|
||||||
|
// 0: outer folder, 1: inner folder (a direct child), 2: grandchild closing the
|
||||||
|
// inner folder, 3: second direct child closing the outer. The grandchild reaches
|
||||||
|
// track 0 only through track 1, so silencing track 1's send covers it — listing
|
||||||
|
// it too would be redundant, and the walk must not.
|
||||||
|
const std::vector<int> depths{1, 1, -1, -1};
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 0), {1, 3}));
|
||||||
|
// Asked about the inner folder, the grandchild IS the direct child.
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 1), {2}));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void testMultiLevelCloseEndsTheOuterFolderToo() {
|
||||||
|
// A -2 closes two folders at once (SDK: "last in the innermost and next-innermost
|
||||||
|
// folders"), so track 3 is outside track 0's folder even though no track between
|
||||||
|
// them closed it singly.
|
||||||
|
const std::vector<int> depths{1, 1, -2, 0};
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 0), {1}));
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 1), {2}));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void testNonFolderAndOutOfRangeReturnEmpty() {
|
||||||
|
const std::vector<int> depths{1, 0, -1};
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 1), {})); // a plain child
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 2), {})); // the folder's last track
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, -1), {})); // no such track
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 3), {})); // past the end
|
||||||
|
CHECK(sameIndices(directChildIndices({}, 0), {})); // empty project
|
||||||
|
}
|
||||||
|
|
||||||
|
static void testUnterminatedFolderSwallowsTheRest() {
|
||||||
|
// A folder that never closes owns every remaining track, which is how REAPER
|
||||||
|
// reads the same list — the walk must not stop early and leave a child audible.
|
||||||
|
const std::vector<int> depths{1, 0, 0};
|
||||||
|
CHECK(sameIndices(directChildIndices(depths, 0), {1, 2}));
|
||||||
|
}
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
testFlatProjectHasNoChildren();
|
||||||
|
testFolderParentReturnsItsDirectChildren();
|
||||||
|
testGrandchildrenAreExcluded();
|
||||||
|
testMultiLevelCloseEndsTheOuterFolderToo();
|
||||||
|
testNonFolderAndOutOfRangeReturnEmpty();
|
||||||
|
testUnterminatedFolderSwallowsTheRest();
|
||||||
|
|
||||||
|
if (g_fail == 0) std::printf("track_topology: all tests passed\n");
|
||||||
|
return g_fail == 0 ? 0 : 1;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user