[Audacity-cvs] audacity-src/src/effects/VST VSTEffect.cpp, 1.45, 1.46

[Leland Lucius]

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

Modified Files:
        VSTEffect.cpp 
Log Message:
Prevent error dialogs when load DLLs and they aren't VSTs.

Index: VSTEffect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/VST/VSTEffect.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- VSTEffect.cpp       3 Aug 2009 17:14:21 -0000       1.45
+++ VSTEffect.cpp       21 Aug 2009 14:50:45 -0000      1.46
@@ -1436,21 +1436,22 @@
    mModule = bundleRef;
 
 #else
-   // Try to load the library
-   wxDynamicLibrary *lib = new wxDynamicLibrary(mPath);
-   if (!lib) {
-      return false;
-   }
+   {
+      wxLogNull nolog;
 
-   // Bail if it wasn't successful
-   if (!lib->IsLoaded()) {
-      delete lib;
-      return false;
-   }
+      // Try to load the library
+      wxDynamicLibrary *lib = new wxDynamicLibrary(mPath);
+      if (!lib) {
+         return false;
+      }
 
-   // Try to find the entry point, while suppressing error messages
-   {
-      wxLogNull logNo;
+      // Bail if it wasn't successful
+      if (!lib->IsLoaded()) {
+         delete lib;
+         return false;
+      }
+
+      // Try to find the entry point, while suppressing error messages
       pluginMain = (vstPluginMain) lib->GetSymbol(wxT("VSTPluginMain"));
       if (pluginMain == NULL) {
          pluginMain = (vstPluginMain) lib->GetSymbol(wxT("main"));
@@ -1459,10 +1460,10 @@
             return false;
          }
       }
-   }
 
-   // Save the library reference
-   mModule = lib;
+      // Save the library reference
+      mModule = lib;
+   }
 
 #endif
 


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs