Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
da1ce7f
refactor(native-mv14): extract Player v1-v3 setlist archive codec fro…
masarray Nov 18, 2026
a565269
test(native-mv14): resolve PlayerTrackSettings owner after archive ex…
masarray Nov 18, 2026
8247cf6
fix(native-mv14): keep saved setlist schema round-trip lossless
masarray Nov 18, 2026
8820b49
perf(native-mv14): enforce duplicate-path safety in O(n log n) save p…
masarray Nov 18, 2026
dd883f7
fix(native-mv14): keep setlist creation unique after delete/recreate
masarray Nov 18, 2026
92991ea
test(native-mv14): prove reused setlist number remains unique across …
masarray Nov 18, 2026
9210ab3
fix(native-mv14): match JUCE File identity for portable duplicate checks
masarray Nov 18, 2026
97a4a01
test(native-mv14): contract-lock unique native setlist creation policy
masarray Nov 18, 2026
718742d
test(native-mv14): correct literal native contract regex escaping
masarray Nov 18, 2026
fbf693c
fix(native-mv14): prevent full-setlist Undo from invalidating archive
masarray Nov 18, 2026
cfceb86
test(native-mv14): pin full-library Undo policy at native action and …
masarray Nov 18, 2026
875eb02
test(native-mv14): exercise real 2000-song Save/Remove/Import/Undo ar…
masarray Nov 18, 2026
72b7680
fix(native-mv14): validate rounded Player cues before native/deck or …
masarray Nov 18, 2026
5c05d45
fix(native-mv14): reject OUT marker quantized to media-end sentinel
masarray Nov 18, 2026
705ccc5
perf(native-nmod): O(n log n) Player archive import with JUCE file id…
masarray Nov 18, 2026
46ee0b4
merge(main): N-MOD-14 Player archive + cue rules on approved N-MOD-13
masarray Nov 18, 2026
10906be
refactor(native N-MOD-15): isolate atomic Player setlist disk repository
masarray Nov 18, 2026
d78985e
merge(main): reconcile N-MOD-14 Player archive and G-MV hardware owne…
masarray Nov 19, 2026
ffd7464
merge(native): reconcile N-MOD-15 Player persistence with G-MV main a…
masarray Nov 19, 2026
95f40e7
merge(main): preserve N-MOD-14 Player archive and latest G-MV channel…
masarray Nov 19, 2026
475ca9b
merge(native): align N-MOD-15 Player repository with latest G-MV main
masarray Nov 19, 2026
94672b2
merge(main): consolidate N-MOD-14 archive and N-MOD-15 atomic repository
masarray Nov 19, 2026
c19c34d
merge(main): reconcile N-MOD-14/15 with G-MV-25 without source overlap
masarray Nov 19, 2026
89c76e6
refactor(native N-MOD-16): durable-first Player setlist metadata tran…
masarray Nov 19, 2026
632983e
refactor(native N-MOD-16): stage track edits and imports before atomi…
masarray Nov 19, 2026
c054ae3
test(native N-MOD-16): assert real transaction alias and invoke site
masarray Nov 19, 2026
658cbc2
fix(native N-MOD-16): include transaction under standalone JUCE CTest
masarray Nov 19, 2026
08b6eeb
merge(main): reconcile native Player setlist archive with G-MV contract
masarray Nov 19, 2026
529b298
merge(native): integrate N-MOD-16 durable Player edits with N-MOD-14/15
masarray Nov 19, 2026
2eba5e7
refactor(native N-MOD-17): compensate live metadata edits and persist…
masarray Nov 19, 2026
1cae6de
merge(main): preserve G-MV-27 bridge while carrying N-MOD-14/15/16
masarray Nov 19, 2026
0a3e6c2
merge(native): integrate N-MOD-17 Player metadata rollback and durabl…
masarray Nov 19, 2026
818ae6c
refactor(native N-MOD-18): isolate Player library edit/import/relink …
masarray Nov 19, 2026
87503bf
refactor(native N-MOD-18): extract authoritative Player snapshot proj…
masarray Nov 19, 2026
258ea2b
test(native N-MOD-18): fix Player projection source-contract regex
masarray Nov 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,18 @@ if(BUILD_TESTING)
add_dependencies(ARMixMixerRoutingTests
ARMixPlayerShowEditTests ARMixPlayerWaveformTests
ARMixPlayerCrossfadeTests ARMixPlayerShowTransitionTests)
# MV-N14: isolated archive codec regression, no extra CI workflow,
# playback owner, audio callback or device requirement.
juce_add_console_app(ARMixPlayerSetlistArchiveTests
PRODUCT_NAME "ArSonMix Player Setlist Archive Contract")
target_sources(ARMixPlayerSetlistArchiveTests PRIVATE
tests/player_setlist_archive_test.cpp)
target_link_libraries(ARMixPlayerSetlistArchiveTests PRIVATE
juce::juce_core juce::juce_recommended_config_flags)
target_compile_features(ARMixPlayerSetlistArchiveTests PRIVATE cxx_std_20)
add_test(NAME ArSonPlayerV1V2V3SetlistArchiveMigrationAndPersistence
COMMAND ARMixPlayerSetlistArchiveTests)
add_dependencies(ARMixMixerRoutingTests ARMixPlayerSetlistArchiveTests)
juce_add_console_app(ARMixPlayerDecodeTests PRODUCT_NAME "ArSon Player Native Decoder Integration")
target_sources(ARMixPlayerDecodeTests PRIVATE tests/player_native_decode_test.cpp)
target_link_libraries(ARMixPlayerDecodeTests PRIVATE
Expand Down
47 changes: 47 additions & 0 deletions engine/player/PlayerCueEditPolicy.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// SPDX-License-Identifier: AGPL-3.0-only
#pragma once
#include <cmath>
#include <optional>

// Pure Player metadata edit policy. CONTROL thread only; neither disk nor
// native deck/PCM is mutated until the live deck accepts the proposed range.
namespace armix::player {
struct PlayerCueEditPolicy final {
enum class Command { clear, markIn, markOut };
struct Range {
double in=0., out=0.;
};
// Match the v3 archive's loadable range, rather than admitting a cue
// that silently disappears when player-library.json is reopened.
static bool validArchive(Range range) noexcept {
return std::isfinite(range.in) && std::isfinite(range.out) &&
range.in>=0. && range.out>=0. &&
range.in<86400. && range.out<86400. &&
(range.out==0. || range.out>range.in+0.05);
}
static std::optional<Range> plan(Range existing,Command action,
double position,double duration) noexcept {
if(action==Command::clear)return Range{};
if(!validArchive(existing) ||
!std::isfinite(position)||!std::isfinite(duration)||
duration<=0.||position<0.||position>=duration)
return std::nullopt;
// Quantize BEFORE validating. A native time 1.059 must not create
// an unsavable OUT=1.05 when IN=1.00.
const double rounded=std::floor(position*100.)/100.;
Range candidate=existing;
if(action==Command::markIn) {
candidate.in=rounded;
if(candidate.out>0.&&candidate.out<=candidate.in+0.05)
candidate.out=0.;
} else {
// Mark OUT must never impersonate the OUT=0 media-end sentinel.
// In particular, positions below 10ms quantize to zero.
if(rounded<=candidate.in+0.05)return std::nullopt;
candidate.out=rounded;
}
if(!validArchive(candidate))return std::nullopt;
Comment thread
masarray marked this conversation as resolved.
Resolved
return candidate;
}
};
} // namespace armix::player
29 changes: 29 additions & 0 deletions engine/player/PlayerLiveMetadataCommitPolicy.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// SPDX-License-Identifier: AGPL-3.0-only
#pragma once

// N-MOD-17: compensation policy for durable Player metadata writes on the
// JUCE CONTROL thread. The existing LiveAudioEngine remains the sole deck
// owner. Native acceptance precedes disk I/O for responsive live KEY/TEMPO
// and Cue gestures; failed persistence attempts the exact previous values.
// An unrecoverable native rollback is handled by the caller's safe stop.
namespace armix::player {
struct PlayerLiveMetadataCommitPolicy final {
enum class Outcome {
accepted,
nativeRejected,
saveRejectedRecovered,
saveRejectedRollbackFailed
};
template<typename ApplyNative,typename Save,typename RestoreNative>
static Outcome run(bool requiresNative,ApplyNative&& apply,
Save&& save,RestoreNative&& restore) {
// Editing NEXT is metadata only. No native/PCM DSP mutation happens.
if(!requiresNative)
return save()?Outcome::accepted:Outcome::saveRejectedRecovered;
if(!apply())return Outcome::nativeRejected;
if(save())return Outcome::accepted;
return restore()?Outcome::saveRejectedRecovered:
Outcome::saveRejectedRollbackFailed;
}
};
} // namespace armix::player
Loading
Loading