Windows version sets its own gstreamer environment variable

1 files changed, 33 insertions, 0 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 9e68078..4bb235e 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -75,6 +75,9 @@
 
 #if LL_WINDOWS
         #include "llwindebug.h"
+        #include <direct.h>
+        #include <errno.h>
+        #include <stdlib.h>
 #endif
 
 #if LL_WINDOWS
@@ -316,6 +319,34 @@ std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
+
+void LLAppViewer::gst_plugin_path()
+{
+#ifdef LL_WINDOWS
+        char* buffer;
+
+        // Get the current working directory: 
+        if((buffer = _getcwd(NULL,0)) == NULL)
+        {
+                LL_INFOS("InitInfo") << "_getcwd error" << LL_ENDL;
+        }
+        else
+        {
+                LL_INFOS("InitInfo") << "Imprudence is installed at " << buffer << LL_ENDL;
+                
+                char plugin_path[255];
+                strcpy (plugin_path,"GST_PLUGIN_PATH=");
+                strcat (plugin_path,buffer);
+                strcat (plugin_path,"\\lib");
+
+                // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe
+                putenv(plugin_path);
+
+                LL_INFOS("InitInfo") << "GST_PLUGIN_PATH set to " << getenv("GST_PLUGIN_PATH") << LL_ENDL;
+        }
+#endif //LL_WINDOWS
+}
+
 void idle_afk_check()
 {
         // check idle timers
@@ -615,6 +646,8 @@ bool LLAppViewer::init()
         LL_VERSION_PATCH, 
         LL_VERSION_BUILD );
 
+        gst_plugin_path();
+
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////