Skip to content

Commit 71c72ee

Browse files
Merge pull request #31357 from RomanPudashkin/inf_audio_samples_loading_fix
Fix #30966: Loading audio samples never ends on score opening if you use a soundfont preset other than "Choose automatically"
2 parents ac90b3a + 2c65945 commit 71c72ee

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/framework/audio/engine/internal/enginerpccontroller.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,17 @@ void EngineRpcController::init()
201201
}
202202
// Fluid
203203
else {
204-
AudioResourceId sfname = params.in.resourceMeta.id;
204+
std::string sfname = params.in.resourceMeta.attributeVal(SOUNDFONT_NAME_ATTRIBUTE).toStdString();
205+
if (sfname.empty()) {
206+
sfname = params.in.resourceMeta.id;
207+
}
208+
205209
if (soundFontRepository()->isSoundFontLoaded(sfname)) {
206210
addTrackAndSendResponce(msg, seqId, trackName, playbackData, params);
207211
}
208212
// Waiting for SF to load
209213
else {
210-
LOGI() << "Waiting for SF to load, trackName: " << trackName;
214+
LOGI() << "Waiting for SF to load, trackName: " << trackName << ", SF name: " << sfname;
211215
m_pendingTracks[sfname].emplace_back(PendingTrack { msg, seqId, trackName, playbackData, params });
212216

213217
//! NOTE We subscribe for the first track for which a soundfont is not found.

0 commit comments

Comments
 (0)