From e2d3b7be4c0892bce0f1b0b2699bf35633173d51 Mon Sep 17 00:00:00 2001 From: jcm Date: Sun, 23 Jun 2024 09:21:55 -0500 Subject: [PATCH] improve effects warning names and descriptions --- plugins/mac-avcapture/OBSAVCapture.m | 12 ++++++------ plugins/mac-avcapture/data/locale/en-US.ini | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/mac-avcapture/OBSAVCapture.m b/plugins/mac-avcapture/OBSAVCapture.m index 860610fcb..9419758c6 100644 --- a/plugins/mac-avcapture/OBSAVCapture.m +++ b/plugins/mac-avcapture/OBSAVCapture.m @@ -634,26 +634,26 @@ NSString *effectWarning = nil; if (@available(macOS 12.0, *)) { if (device.portraitEffectActive) { - effectWarning = @"PortraitEffectWarning"; + effectWarning = @"Warning.Effect.Portrait"; effectsCount++; } } if (@available(macOS 12.3, *)) { if (device.centerStageActive) { - effectWarning = @"CenterStageWarning"; + effectWarning = @"Warning.Effect.CenterStage"; effectsCount++; } } if (@available(macOS 13.0, *)) { if (device.studioLightActive) { - effectWarning = @"StudioLightWarning"; + effectWarning = @"Warning.Effect.StudioLight"; effectsCount++; } } /* This property is currently unavailable due to an SDK issue: FB13948132 if (@available(macOS 14.0, *)) { if (device.reactionEffectGesturesEnabled) { - effectWarning = @"ReactionsWarning"; + effectWarning = @"Warning.Effect.Reactions"; effectsCount++; } } @@ -661,13 +661,13 @@ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 150000 if (@available(macOS 15.0, *)) { if (device.backgroundReplacementActive) { - effectWarning = @"BackgroundReplacementWarning"; + effectWarning = @"Warning.Effect.BackgroundReplacement"; effectsCount++; } } #endif if (effectsCount > 1) { - effectWarning = @"MultipleEffectsWarning"; + effectWarning = @"Warning.Effect.Multiple"; } return effectWarning; } diff --git a/plugins/mac-avcapture/data/locale/en-US.ini b/plugins/mac-avcapture/data/locale/en-US.ini index cbd15df2d..aefb63770 100644 --- a/plugins/mac-avcapture/data/locale/en-US.ini +++ b/plugins/mac-avcapture/data/locale/en-US.ini @@ -15,9 +15,9 @@ Auto="Auto" Unknown="Unknown (%1)" EnableAudio="Enable audio if supported by device" Resolution="Resolution" -PortraitEffectWarning="Portrait system effect is active on the selected device" -CenterStageWarning="Center Stage system effect is active on the selected device" -StudioLightWarning="Studio Light system effect is active on the selected device" -ReactionsWarning="Reaction effects are active for the selected device" -BackgroundReplacementWarning="Background replacement is active for the selected device" -MultipleEffectsWarning="Multiple system effects are active on the selected device" +Warning.Effect.Portrait="Portrait system effect is active on the selected device" +Warning.Effect.CenterStage="Center Stage system effect is active on the selected device" +Warning.Effect.StudioLight="Studio Light system effect is active on the selected device" +Warning.Effect.Reactions="Reactions system effect is active on the selected device" +Warning.Effect.BackgroundReplacement="Background replacement system effect is active on the selected device" +Warning.Effect.Multiple="Multiple system effects are active on the selected device"