Merge pull request #18802 from Eism/18471-rename_aux_channels_4.1.1

Fix #18471: Rename Aux channels. 4.1.1
musescore · Jul 25, 2023 · e4d1ddf · e4d1ddf
2 parents 29aee24 + 287a112
commit e4d1ddf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/playback/internal/playbackcontroller.cpp b/src/playback/internal/playbackcontroller.cpp
@@ -63,9 +63,9 @@ static AudioOutputParams makeReverbOutputParams()
     return result;
 }
 
-static std::string resolveAuxTrackTitle(aux_channel_idx_t index, const AudioOutputParams& params)
+static std::string resolveAuxTrackTitle(aux_channel_idx_t index, const AudioOutputParams& params, bool considerFx = true)
 {
-    if (params.fxChain.size() == 1) {
+    if (considerFx && params.fxChain.size() == 1) {
         const AudioResourceMeta& meta = params.fxChain.cbegin()->second.resourceMeta;
         if (meta.id == MUSE_REVERB_ID) {
             return mu::trc("playback", "Reverb");
@@ -859,7 +859,7 @@ void PlaybackController::addAuxTrack(aux_channel_idx_t index, const TrackAddFini
         outParams = makeReverbOutputParams();
     }
 
-    std::string title = resolveAuxTrackTitle(index, outParams);
+    std::string title = resolveAuxTrackTitle(index, outParams, false);
     uint64_t playbackKey = notationPlaybackKey();
 
     playback()->tracks()->addAuxTrack(m_currentSequenceId, title, outParams)