diff --git a/client/utils/labels.ts b/client/utils/labels.ts index b4020687..53036c2f 100644 --- a/client/utils/labels.ts +++ b/client/utils/labels.ts @@ -30,18 +30,19 @@ export function getFaderLabel(faderIndex: number, defaultName = 'CH'): string { const channelLabel = getChannelLabel(state, faderIndex) switch (state.settings[0].labelType) { + case 'automation': + return automationLabel || defaultName + ' ' + (faderIndex + 1) + case 'user': + return userLabel || defaultName + ' ' + (faderIndex + 1) + case 'channel': + return channelLabel || defaultName + ' ' + (faderIndex + 1) case 'automatic': + default: return ( userLabel || automationLabel || channelLabel || defaultName + ' ' + (faderIndex + 1) ) - case 'automation': - return automationLabel || defaultName + ' ' + (faderIndex + 1) - case 'user': - return userLabel || defaultName + ' ' + (faderIndex + 1) - case 'channel': - return channelLabel || defaultName + ' ' + (faderIndex + 1) } } diff --git a/server/utils/labels.ts b/server/utils/labels.ts index 8630ce08..026f4609 100644 --- a/server/utils/labels.ts +++ b/server/utils/labels.ts @@ -31,18 +31,19 @@ export function getFaderLabel(faderIndex: number, defaultName = 'CH'): string { const channelLabel = getChannelLabel(state, faderIndex) switch (state.settings[0].labelType) { + case 'automation': + return automationLabel || defaultName + ' ' + (faderIndex + 1) + case 'user': + return userLabel || defaultName + ' ' + (faderIndex + 1) + case 'channel': + return channelLabel || defaultName + ' ' + (faderIndex + 1) case 'automatic': + default: return ( userLabel || automationLabel || channelLabel || defaultName + ' ' + (faderIndex + 1) ) - case 'automation': - return automationLabel || defaultName + ' ' + (faderIndex + 1) - case 'user': - return userLabel || defaultName + ' ' + (faderIndex + 1) - case 'channel': - return channelLabel || defaultName + ' ' + (faderIndex + 1) } }