Skip to content

Commit e4d1ddf

Browse files
authored
Merge pull request #18802 from Eism/18471-rename_aux_channels_4.1.1
Fix #18471: Rename Aux channels. 4.1.1
2 parents 29aee24 + 287a112 commit e4d1ddf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/playback/internal/playbackcontroller.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ static AudioOutputParams makeReverbOutputParams()
6363
return result;
6464
}
6565

66-
static std::string resolveAuxTrackTitle(aux_channel_idx_t index, const AudioOutputParams& params)
66+
static std::string resolveAuxTrackTitle(aux_channel_idx_t index, const AudioOutputParams& params, bool considerFx = true)
6767
{
68-
if (params.fxChain.size() == 1) {
68+
if (considerFx && params.fxChain.size() == 1) {
6969
const AudioResourceMeta& meta = params.fxChain.cbegin()->second.resourceMeta;
7070
if (meta.id == MUSE_REVERB_ID) {
7171
return mu::trc("playback", "Reverb");
@@ -859,7 +859,7 @@ void PlaybackController::addAuxTrack(aux_channel_idx_t index, const TrackAddFini
859859
outParams = makeReverbOutputParams();
860860
}
861861

862-
std::string title = resolveAuxTrackTitle(index, outParams);
862+
std::string title = resolveAuxTrackTitle(index, outParams, false);
863863
uint64_t playbackKey = notationPlaybackKey();
864864

865865
playback()->tracks()->addAuxTrack(m_currentSequenceId, title, outParams)

0 commit comments

Comments
 (0)