From 29f7ae7e3ecfcde6c7a46d550f43954ac284b12f Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 16 Mar 2009 07:39:13 -0700
Subject: Visual Studio now ignores C4244 warnings in GStreamer

---
 ChangeLog.txt                                      | 12 ++++++++++++
 linden/indra/llmedia/llmediaimplgstreamer.cpp      | 15 +++++++++++++--
 linden/indra/llmedia/llmediaimplgstreamer_syms.cpp | 12 +++++++++++-
 linden/indra/llmedia/llmediamanager.cpp            | 14 +++++++++++++-
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6962554..aba05f6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+2009-03-16  McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* linden/indra/llmedia/llmediaimplgstreamer.cpp:
+	Visual Studio now ignores C4244 warnings in GStreamer.
+	Since the change was intentional, I thought it best to
+	continue using "treat warnings as errors" and ignore it.
+	* linden/indra/llmedia/llmediaimplgstreamer_syms.cpp:
+	Ditto.
+	* linden/indra/llmedia/llmediamanager.cpp:
+	Ditto.
+
+
 2009-03-10  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* linden/indra/llaudio/audioengine.cpp:
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 30706f1..b37deac 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -30,15 +30,26 @@
  * $/LicenseInfo$
  */
 
-#include "llmediaimplgstreamer.h"
-
 ///#if LL_GSTREAMER_ENABLED
 
+#if LL_WINDOWS
+	// GStreamer 0.10.22 - gstutils.h - conversion from 'guint64' to 'guint8'. 
+	// This was an intentional change to make GStreamer more threadsafe, and
+	// is okay. Delete this bit if GStreamer ever gets more VS-friendly -- McCabe
+	#pragma warning(disable : 4244)
+#endif
+
+#include "llmediaimplgstreamer.h"
+
 extern "C" {
 #include <gst/gst.h>
 #include <gst/gstelement.h>
 }
 
+#if LL_WINDOWS
+	#pragma warning(default : 4244)
+#endif
+
 #include "llmediamanager.h"
 #include "llmediaimplregister.h"
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
index fb1949a..2f6d09c 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
@@ -31,6 +31,13 @@
 
 ///#if LL_GSTREAMER_ENABLED
 
+#if LL_WINDOWS
+	// GStreamer 0.10.22 - gstutils.h - conversion from 'guint64' to 'guint8'. 
+	// This was an intentional change to make GStreamer more threadsafe, and
+	// is okay. Delete this bit if GStreamer ever gets more VS-friendly -- McCabe
+	#pragma warning(disable : 4244)
+#endif
+
 extern "C" {
 #include <gst/gst.h>
 
@@ -40,6 +47,10 @@ extern "C" {
 
 #include "llmediaimplgstreamer.h"
 
+#if LL_WINDOWS
+	#pragma warning(default : 4244)
+#endif
+
 #define LL_GST_SYM(REQ, GSTSYM, RTN, ...) RTN (*ll##GSTSYM)(__VA_ARGS__) = NULL
 #include "llmediaimplgstreamer_syms_raw.inc"
 #include "llmediaimplgstreamer_syms_rawa.inc"
@@ -184,5 +195,4 @@ void ungrab_gst_syms()
 	sSymsGrabbed = false;
 }
 
-
 ///#endif // LL_GSTREAMER_ENABLED
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index 5394b62..7fe0df3 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -30,12 +30,24 @@
  */
 
 #include "llmediamanager.h"
+
+#if LL_WINDOWS
+	// GStreamer 0.10.22 - gstutils.h - conversion from 'guint64' to 'guint8'. 
+	// This was an intentional change to make GStreamer more threadsafe, and
+	// is okay. Delete this bit if GStreamer ever gets more VS-friendly -- McCabe
+	#pragma warning(disable : 4244)
+#endif
+#include "llmediaimplgstreamer.h"
+#if LL_WINDOWS
+	#pragma warning(default : 4244)
+#endif
+
 #include "llmediaimplfactory.h"
 
 #include "llmediaimplexample1.h"
 #include "llmediaimplexample2.h"
 #include "llmediaimplquicktime.h"
-#include "llmediaimplgstreamer.h"
+
 #if LL_LLMOZLIB_ENABLED
 # include "llmediaimplllmozlib.h"
 #endif
-- 
cgit v1.1