[Audacity-cvs] audacity-src/src/effects Effect.cpp, 1.50.2.1, 1.50.2.2 Effect.h, 1.33.2.1, 1.33.2.2

[Vaughan Johnson]

Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22712

Modified Files:
      Tag: Audacity_1_3_5-Camp_Jam
        Effect.cpp Effect.h 
Log Message:
GetEffectByName

Index: Effect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Effect.cpp,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.2
diff -u -d -r1.50.2.1 -r1.50.2.2
--- Effect.cpp  3 Nov 2008 05:23:37 -0000       1.50.2.1
+++ Effect.cpp  20 Nov 2008 22:48:05 -0000      1.50.2.2
@@ -101,33 +101,13 @@
    return NULL;
 }
 
-Effect* Effect::GetEffectByName(const wxString strTarget, const int kFlags /*= 
ALL_EFFECTS*/)
-{
-   for (unsigned int i = 0; i < mEffects.GetCount(); i++) 
-   {
-      int nFlags = mEffects[i]->GetEffectFlags();
-      if (((nFlags & kFlags) == nFlags) && 
-            strTarget.IsSameAs(mEffects[i]->GetEffectName()))
-      {
-         return mEffects[i];
-      }
-   }
-   return NULL;
-}
-
 Effect* Effect::GetEffectByIdentifier(const wxString strTarget, const int 
kFlags /*= ALL_EFFECTS*/)
 {
    for (unsigned int i = 0; i < mEffects.GetCount(); i++) 
    {
       int nFlags = mEffects[i]->GetEffectFlags();
-      //if (((nFlags & kFlags) == nFlags) && 
-      //      strTarget.IsSameAs(mEffects[i]->GetEffectIdentifier()))
-      //{
-      //   return mEffects[i];
-      //}
-         wxString strJunk = mEffects[i]->GetEffectIdentifier();
-         if (strTarget.IsSameAs(mEffects[i]->GetEffectIdentifier()))
-            return mEffects[i];
+      if (((nFlags & kFlags) == nFlags) && 
strTarget.IsSameAs(mEffects[i]->GetEffectIdentifier()))
+         return mEffects[i];
    }
    return NULL;
 }

Index: Effect.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Effect.h,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- Effect.h    3 Nov 2008 05:23:37 -0000       1.33.2.1
+++ Effect.h    20 Nov 2008 22:48:05 -0000      1.33.2.2
@@ -68,7 +68,6 @@
    static void RegisterEffect(Effect *f, int AdditionalFlags=0);
    static void UnregisterEffects();
    static Effect *GetEffect(int ID);
-   static Effect* GetEffectByName(const wxString strTarget, const int kFlags = 
ALL_EFFECTS);
    static Effect* GetEffectByIdentifier(const wxString strTarget, const int 
kFlags = ALL_EFFECTS);
    static int GetNumEffects();
 


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs