Merge pull request #20529 from cbjeukendrup/porting/4.2.0/termolo_tic…

…k_position_offset Fix timestamps of tremolos during and after repeats
musescore · Dec 18, 2023 · f378202 · f378202
2 parents 7b62c7a + 9d4eb42
commit f378202
Show file tree

Hide file tree

Showing 8 changed files with 1,926 additions and 1 deletion.
diff --git a/src/engraving/playback/renderers/tremolorenderer.cpp b/src/engraving/playback/renderers/tremolorenderer.cpp
@@ -121,7 +121,8 @@ void TremoloRenderer::buildAndAppendEvents(const Chord* chord, const Articulatio
             continue;
         }
 
-        auto noteTnD = timestampAndDurationFromStartAndDurationTicks(chord->score(), startTick, stepDurationTicks);
+        auto noteTnD = timestampAndDurationFromStartAndDurationTicks(
+            chord->score(), startTick + context.positionTickOffset, stepDurationTicks);
 
         NominalNoteCtx noteCtx(note, context);
         noteCtx.duration = noteTnD.duration;

diff --git a/src/engraving/tests/playbackmodel_data/repeat_and_tremolo/META-INF/container.xml b/src/engraving/tests/playbackmodel_data/repeat_and_tremolo/META-INF/container.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container>
+  <rootfiles>
+    <rootfile full-path="score_style.mss"/>
+    <rootfile full-path="repeat_and_tremolo.mscx"/>
+    <rootfile full-path="Thumbnails/thumbnail.png"/>
+    <rootfile full-path="audiosettings.json"/>
+    <rootfile full-path="viewsettings.json"/>
+    </rootfiles>
+  </container>
diff --git a/src/engraving/tests/playbackmodel_data/repeat_and_tremolo/Thumbnails/thumbnail.png b/src/engraving/tests/playbackmodel_data/repeat_and_tremolo/Thumbnails/thumbnail.png
diff --git a/src/engraving/tests/playbackmodel_data/repeat_and_tremolo/audiosettings.json b/src/engraving/tests/playbackmodel_data/repeat_and_tremolo/audiosettings.json
@@ -0,0 +1,119 @@
+{
+    "activeSoundProfile": "Muse Sounds",
+    "aux": [
+        {
+            "out": {
+                "balance": 0,
+                "fxChain": {
+                    "0": {
+                        "active": true,
+                        "chainOrder": 0,
+                        "resourceMeta": {
+                            "attributes": {
+                            },
+                            "hasNativeEditorSupport": true,
+                            "id": "Muse Reverb",
+                            "type": "muse_plugin",
+                            "vendor": "Muse"
+                        },
+                        "unitConfiguration": {
+                        }
+                    }
+                },
+                "volumeDb": 0
+            },
+            "soloMuteState": {
+                "mute": false,
+                "solo": false
+            }
+        },
+        {
+            "out": {
+                "balance": 0,
+                "fxChain": {
+                },
+                "volumeDb": 0
+            },
+            "soloMuteState": {
+                "mute": false,
+                "solo": false
+            }
+        }
+    ],
+    "master": {
+        "balance": 0,
+        "fxChain": {
+        },
+        "volumeDb": 0
+    },
+    "tracks": [
+        {
+            "in": {
+                "resourceMeta": {
+                    "attributes": {
+                        "museCategory": "Muse Woodwinds",
+                        "museName": "Flute 1",
+                        "museUID": "118",
+                        "playbackSetupData": "winds.flute.primary"
+                    },
+                    "hasNativeEditorSupport": false,
+                    "id": "Muse Woodwinds\\Flute 1\\118",
+                    "type": "muse_sampler_sound_pack",
+                    "vendor": "Muse Woodwinds"
+                },
+                "unitConfiguration": {
+                }
+            },
+            "instrumentId": "flute",
+            "out": {
+                "auxSends": [
+                    {
+                        "active": true,
+                        "signalAmount": 0.4000000059604645
+                    },
+                    {
+                        "active": true,
+                        "signalAmount": 0.30000001192092896
+                    }
+                ],
+                "balance": 0,
+                "fxChain": {
+                },
+                "volumeDb": 0
+            },
+            "partId": "1",
+            "soloMuteState": {
+                "mute": false,
+                "solo": false
+            }
+        },
+        {
+            "in": {
+                "resourceMeta": {
+                    "attributes": {
+                        "playbackSetupData": "last.last.last",
+                        "soundFontName": "MS Basic"
+                    },
+                    "hasNativeEditorSupport": false,
+                    "id": "MS Basic",
+                    "type": "fluid_soundfont",
+                    "vendor": "Fluid"
+                },
+                "unitConfiguration": {
+                }
+            },
+            "instrumentId": "metronome",
+            "out": {
+                "balance": 0,
+                "fxChain": {
+                },
+                "volumeDb": 0
+            },
+            "partId": "999",
+            "soloMuteState": {
+                "mute": false,
+                "solo": false
+            }
+        }
+    ]
+}