5 files changed, 67 insertions, 14 deletions

diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index 78ffd94..cafcd4c 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -6,7 +6,8 @@ if (STANDALONE)
 
   pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
   pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
-elseif (LINUX)
+endif (STANDALONE)
+
   use_prebuilt_binary(gstreamer)
   # possible libxml should have its own .cmake file instead
   use_prebuilt_binary(libxml)
@@ -17,6 +18,21 @@ elseif (LINUX)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
+      
+if (WINDOWS)
+  # We don't need to explicitly link against gstreamer itself, because
+  # LLMediaImplGStreamer probes for the system's copy at runtime.
+    set(GSTREAMER010_LIBRARIES
+         libgstvideo
+         libgstaudio
+         libgstbase-0.10
+         libgstreamer-0.10
+         gobject-2.0
+         gmodule-2.0
+         gthread-2.0
+         glib-2.0
+         )
+else (WINDOWS)
   # We don't need to explicitly link against gstreamer itself, because
   # LLMediaImplGStreamer probes for the system's copy at runtime.
     set(GSTREAMER010_LIBRARIES
@@ -31,13 +47,16 @@ elseif (LINUX)
          rt
          glib-2.0
          )
-endif (STANDALONE)
+
+
+endif (WINDOWS)
+
 
 if (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
   set(GSTREAMER010 ON CACHE BOOL "Build with GStreamer-0.10 streaming media support.")
+  add_definitions(-DLL_GSTREAMER010_ENABLED=1)
 endif (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
 
-if (GSTREAMER010)
-  add_definitions(-DLL_GSTREAMER010_ENABLED=1)
-endif (GSTREAMER010)
+  
+
 
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
index f5da637..0ea096a 100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
@@ -40,18 +40,29 @@
 
 extern "C" {
 #include <sys/types.h>
-#include <unistd.h>
+//#include <unistd.h> //fiuxme
 }
 
+#define MSGMODULEFOO "(media plugin)"
+
+#ifdef LL_LINUX
 /////////////////////////////////////////////////////////////////////////
 // Debug/Info/Warning macros.
-#define MSGMODULEFOO "(media plugin)"
+
 #define STDERRMSG(...) do{\
     fprintf(stderr, " pid:%d: ", (int)getpid());\
     fprintf(stderr, MSGMODULEFOO " %s:%d: ", __FUNCTION__, __LINE__);\
     fprintf(stderr, __VA_ARGS__);\
     fputc('\n',stderr);\
   }while(0)
+#else
+#define STDERRMSG(...) do{\
+    fprintf(stderr, MSGMODULEFOO " %s:%d: ", __FUNCTION__, __LINE__);\
+    fprintf(stderr, __VA_ARGS__);\
+    fputc('\n',stderr);\
+  }while(0)
+#endif
+
 #define NULLMSG(...) do{}while(0)
 
 #define DEBUGMSG NULLMSG
diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 4dd182e..44bc32e 100755
--- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -35,6 +35,13 @@
 
 #include "linden_common.h"
 
+// Needed for _getcwd() RC 
+#ifdef LL_WINDOWS
+#include <direct.h>
+#include <stdlib.h>
+#include <stdio.h>
+#endif
+
 #include "llgl.h"
 
 #include "llplugininstance.h"
@@ -84,7 +91,7 @@ private:
         bool play(double rate);
         bool getTimePos(double &sec_out);
 
-        static const double MIN_LOOP_SEC = 1.0F;
+        #define MIN_LOOP_SEC 1.0F
 
         bool mIsLooping;
 
@@ -689,7 +696,7 @@ MediaPluginGStreamer010::load()
         DEBUGMSG("setting up media...");
 
         mIsLooping = false;
-        mVolume = 0.1234567; // minor hack to force an initial volume update
+        mVolume = (float) 0.1234567; // minor hack to force an initial volume update
 
         // Create a pumpable main-loop for this media
         mPump = g_main_loop_new (NULL, FALSE);
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 3dabb3b..8b1d59a 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1336,7 +1336,7 @@ if (WINDOWS)
         DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
 
-    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit)
+    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer)
 
     if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
@@ -1456,7 +1456,7 @@ if (DARWIN)
     DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
     
-  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit)
+  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
 
   if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME}) 
@@ -1481,7 +1481,7 @@ if (DARWIN)
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
 
-      add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit)
+      add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
       add_custom_command(
         TARGET package POST_BUILD
         COMMAND ${PYTHON_EXECUTABLE}
@@ -1534,7 +1534,19 @@ if (WINDOWS)
           ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
         COMMENT "Copying WebKit Plugin to the runtime folder."
         )
-
+        
+   get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION)
+    add_custom_command(
+        TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_if_different
+          ${BUILT_GSTREAMER_PLUGIN}
+          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
+        COMMENT "Copying Gstreamer Plugin to the runtime folder."
+        )
+        
   get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
     add_custom_command(
         TARGET ${VIEWER_BINARY_NAME} POST_BUILD
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 4c95f00..9c2dbed 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -257,7 +257,6 @@ class WindowsManifest(ViewerManifest):
             self.path("alut.dll")
             self.end_prefix()           
 
-
         # Media plugins - QuickTime
         if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
             self.path("media_plugin_quicktime.dll")
@@ -268,6 +267,11 @@ class WindowsManifest(ViewerManifest):
             self.path("media_plugin_webkit.dll")
             self.end_prefix()
             
+        # Media plugins - Gstreamer
+        if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"):
+            self.path("media_plugin_gstreamer010.dll")
+            self.end_prefix()
+            
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
             self.path("libeay32.dll")