Merge remote-tracking branch 'audacity/release-3.4.0' into master

crsib · Oct 24, 2023 · fa0fbb2 · fa0fbb2
2 parents 0f6767c + 44ca53e
commit fa0fbb2
Show file tree

Hide file tree

Showing 16 changed files with 11,095 additions and 14,359 deletions.
diff --git a/libraries/lib-effects/Effect.cpp b/libraries/lib-effects/Effect.cpp
@@ -66,13 +66,6 @@ TranslatableString Effect::GetDescription() const
    return {};
 }
 
-// EffectDefinitionInterface implementation
-
-EffectType Effect::GetType() const
-{
-   return EffectTypeNone;
-}
-
 EffectFamilySymbol Effect::GetFamily() const
 {
    // Unusually, the internal and visible strings differ for the built-in

diff --git a/libraries/lib-effects/Effect.h b/libraries/lib-effects/Effect.h
@@ -56,7 +56,6 @@ class EFFECTS_API Effect /* not final */
 
    // EffectDefinitionInterface implementation
 
-   EffectType GetType() const override;
    EffectFamilySymbol GetFamily() const override;
    bool IsInteractive() const override;
    bool IsDefault() const override;