Skip to content

[4.7.0] MuseSampler: send breath marks #32932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RomanPudashkin merged 1 commit into from
Apr 8, 2026
Merged

[4.7.0] MuseSampler: send breath marks #32932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions src/engraving/playback/metaparsers/chordarticulationsparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "chordarticulationsparser.h"

#include "dom/arpeggio.h"
#include "dom/breath.h"
#include "dom/chord.h"
#include "dom/chordline.h"
#include "dom/score.h"
Expand Down Expand Up @@ -88,6 +89,7 @@ void ChordArticulationsParser::doParse(const EngravingItem* item, const Renderin
parseChordLine(chord, ctx, result);
parseArticulationSymbols(chord, ctx, result);
parseTapping(chord, ctx, result);
parseBreath(chord, ctx, result);
}

void ChordArticulationsParser::parseSpanners(const Chord* chord, const RenderingContext& ctx, mpe::ArticulationMap& result)
Expand Down Expand Up @@ -231,3 +233,20 @@ void ChordArticulationsParser::parseTapping(const Chord* chord, const RenderingC

appendArticulationData(mpe::ArticulationMeta(type, pattern, ctx.nominalTimestamp, ctx.nominalDuration), result);
}

void ChordArticulationsParser::parseBreath(const Chord* chord, const RenderingContext& ctx, mpe::ArticulationMap& result)
{
const mpe::ArticulationPattern& pattern = ctx.profile->pattern(ArticulationType::Breath);
if (pattern.empty()) {
return;
}

const Breath* breath = chord->hasBreathMark();
if (!breath) {
return;
}

const mpe::timestamp_t timestamp = timestampFromTicks(ctx.score, breath->tick().ticks() + ctx.positionTickOffset);
const mpe::duration_t duration = breath->pause() * 1000000;
appendArticulationData(mpe::ArticulationMeta(ArticulationType::Breath, pattern, timestamp, duration), result);
}
1 change: 1 addition & 0 deletions src/engraving/playback/metaparsers/chordarticulationsparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class ChordArticulationsParser : public MetaParserBase<ChordArticulationsParser>
static void parseGraceNotes(const Chord* chord, const RenderingContext& ctx, muse::mpe::ArticulationMap& result);
static void parseChordLine(const Chord* chord, const RenderingContext& ctx, muse::mpe::ArticulationMap& result);
static void parseTapping(const Chord* chord, const RenderingContext& ctx, muse::mpe::ArticulationMap& result);
static void parseBreath(const Chord* chord, const RenderingContext& ctx, muse::mpe::ArticulationMap& result);
};
}

Expand Down
1 change: 1 addition & 0 deletions src/framework/mpe/internal/articulationstringutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ static const std::unordered_map<ArticulationType, QString> ARTICULATION_TYPE_NAM
{ ArticulationType::Diminuendo, "Diminuendo" },
{ ArticulationType::DiscreteGlissando, "DiscreteGlissando" },
{ ArticulationType::ContinuousGlissando, "ContinuousGlissando" },
{ ArticulationType::Breath, "Breath" },
{ ArticulationType::Legato, "Legato" },
{ ArticulationType::Pedal, "Pedal" },
{ ArticulationType::Arpeggio, "Arpeggio" },
Expand Down
2 changes: 2 additions & 0 deletions src/framework/mpe/mpetypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ enum class ArticulationType : signed char {

ContinuousGlissando,

Breath,

// Handbells
MalletBellOnTable,
MalletBellSuspended,
Expand Down
105 changes: 105 additions & 0 deletions src/framework/mpe/resources/general_voice_articulations_profile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6472,6 +6472,111 @@
}
}
],
"Breath": [
{
"arrangementPattern": {
"durationFactor": 9900,
"timestampOffset": 0
},
"expressionPattern": {
"dynamicOffsets": [
{
"offsetPosition": 0,
"offsetValue": 0
},
{
"offsetPosition": 1000,
"offsetValue": 1500
},
{
"offsetPosition": 2000,
"offsetValue": 2500
},
{
"offsetPosition": 3000,
"offsetValue": 3500
},
{
"offsetPosition": 4000,
"offsetValue": 4500
},
{
"offsetPosition": 5000,
"offsetValue": 5000
},
{
"offsetPosition": 6000,
"offsetValue": 4500
},
{
"offsetPosition": 7000,
"offsetValue": 3500
},
{
"offsetPosition": 8000,
"offsetValue": 2500
},
{
"offsetPosition": 9000,
"offsetValue": 1500
},
{
"offsetPosition": 10000,
"offsetValue": 0
}
]
},
"patternPosition": 0,
"pitchPattern": {
"pitchOffsets": [
{
"offsetPosition": 0,
"offsetValue": 0
},
{
"offsetPosition": 1000,
"offsetValue": 0
},
{
"offsetPosition": 2000,
"offsetValue": 0
},
{
"offsetPosition": 3000,
"offsetValue": 0
},
{
"offsetPosition": 4000,
"offsetValue": 0
},
{
"offsetPosition": 5000,
"offsetValue": 0
},
{
"offsetPosition": 6000,
"offsetValue": 0
},
{
"offsetPosition": 7000,
"offsetValue": 0
},
{
"offsetPosition": 8000,
"offsetValue": 0
},
{
"offsetPosition": 9000,
"offsetValue": 0
},
{
"offsetPosition": 10000,
"offsetValue": 0
}
]
}
}
],
"WideVibrato": [
{
"arrangementPattern": {
Expand Down
105 changes: 105 additions & 0 deletions src/framework/mpe/resources/general_winds_articulations_profile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6595,6 +6595,111 @@
}
}
],
"Breath": [
{
"arrangementPattern": {
"durationFactor": 9900,
"timestampOffset": 0
},
"expressionPattern": {
"dynamicOffsets": [
{
"offsetPosition": 0,
"offsetValue": 0
},
{
"offsetPosition": 1000,
"offsetValue": 1500
},
{
"offsetPosition": 2000,
"offsetValue": 2500
},
{
"offsetPosition": 3000,
"offsetValue": 3500
},
{
"offsetPosition": 4000,
"offsetValue": 4500
},
{
"offsetPosition": 5000,
"offsetValue": 5000
},
{
"offsetPosition": 6000,
"offsetValue": 4500
},
{
"offsetPosition": 7000,
"offsetValue": 3500
},
{
"offsetPosition": 8000,
"offsetValue": 2500
},
{
"offsetPosition": 9000,
"offsetValue": 1500
},
{
"offsetPosition": 10000,
"offsetValue": 0
}
]
},
"patternPosition": 0,
"pitchPattern": {
"pitchOffsets": [
{
"offsetPosition": 0,
"offsetValue": 0
},
{
"offsetPosition": 1000,
"offsetValue": 0
},
{
"offsetPosition": 2000,
"offsetValue": 0
},
{
"offsetPosition": 3000,
"offsetValue": 0
},
{
"offsetPosition": 4000,
"offsetValue": 0
},
{
"offsetPosition": 5000,
"offsetValue": 0
},
{
"offsetPosition": 6000,
"offsetValue": 0
},
{
"offsetPosition": 7000,
"offsetValue": 0
},
{
"offsetPosition": 8000,
"offsetValue": 0
},
{
"offsetPosition": 9000,
"offsetValue": 0
},
{
"offsetPosition": 10000,
"offsetValue": 0
}
]
}
}
],
"WideVibrato": [
{
"arrangementPattern": {
Expand Down
1 change: 1 addition & 0 deletions src/framework/musesampler/internal/apitypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ enum ms_NoteArticulation2 : uint64_t
ms_NoteArticulation2_PlopRough = 1LL << 10,
ms_NoteArticulation2_DoitRough = 1LL << 11,
ms_NoteArticulation2_ScoopRough = 1LL << 12,
ms_NoteArticulation2_BreathMark = 1LL << 13,
};

// added in v0.6
Expand Down
1 change: 1 addition & 0 deletions src/framework/musesampler/internal/musesamplersequencer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ static const std::unordered_map<ArticulationType, ms_NoteArticulation2> ARTICULA
{ ArticulationType::SingingVibrate, ms_NoteArticulation2_SingingVibrate },
{ ArticulationType::Swing, ms_NoteArticulation2_HandbellSwing },
{ ArticulationType::Echo, ms_NoteArticulation2_Echo },
{ ArticulationType::Breath, ms_NoteArticulation2_BreathMark },
};

static const std::unordered_map<ArticulationType, ms_NoteHead> NOTEHEAD_TYPES {
Expand Down
Loading