Changeset 20868

Timestamp:

09/26/07 13:40:33 (1 year ago)

Author:

patrick

Message:

MFT r20867: Catch any Boost.Filesystem exceptions being thrown while

constructing the plug-in search path.

Files:

• juggler/branches/2.2/modules/sonix/snx/SoundFactory.cpp (modified) (2 diffs)

juggler/branches/2.2/modules/sonix/snx/SoundFactory.cpp

@@ -95 +95 @@
-   }
-
-
+
+
+
+
+
-
-#if defined(VPR_OS_IRIX) && defined(_ABIN32)
-
+   
-#elif defined(VPR_OS_IRIX) && defined(_ABI64) || \
-      defined(VPR_OS_Linux) && defined(__x86_64__)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#if defined(VPR_OS_Windows)
@@ -113 +173 @@
-   const std::string driver_ext("so");
-#endif
-
-   const std::string sonix_subdir_base("sonix");
-
-   // If versioning is enabled, then the name of the directory containing the
-   // Sonix plug-ins must contain version information.
-#if defined(SNX_USE_VERSIONING)
-   std::string sonix_ver_str;
-   const std::string sonix_version("SNX_VERSION");
-
-   // If $SNX_VERSION is set, use the value of that environment variable
-   // as the version component of the plug-in subdirectory name. Otherwise,
-   // use the compile-time value provided by SNX_VERSION_DOT.
-   if ( ! vpr::System::getenv(sonix_version, sonix_ver_str) )
-   {
-      sonix_ver_str = SNX_VERSION_DOT;
-   }
-
-   fs::path sonix_subdir(
-      snx_lib_dir / (sonix_subdir_base + "-" + sonix_ver_str) / "plugins"
-   );
-
-   // If versioning is not enabled, then the directory containing the
-   // Sonix plug-ins will not incorporate version information.
-#else
-   fs::path sonix_subdir(snx_lib_dir / sonix_subdir_base / "plugins");
-#endif
-
-#if defined(SNX_DEBUG)
-#if defined(_DEBUG)
-   sonix_subdir /= "dbgrt";
-#else
-   sonix_subdir /= "dbg";
-#endif
-#else
-   sonix_subdir /= "opt";
-#endif
-
-   std::vector<fs::path> search_paths;
-   search_paths.push_back(sonix_subdir);
-
-   std::string home_dir;
-   if ( vpr::System::getenv("HOME", home_dir) )
-   {
-      search_paths.push_back(
-         fs::path(home_dir, fs::native) / ".sonix" / "plugins"
-      );
-   }
-
-   typedef std::vector<fs::path>::iterator iter_type;