From 1b7dec80a55365ebda061319a134cf87a1aaa61a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 18 Feb 2009 07:07:31 -0700
Subject: Added GStreamer version info to About > Imprudence

---
 linden/indra/llmedia/llmediaimplgstreamer.cpp          |  8 +++++---
 linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc |  1 +
 linden/indra/newview/llfloaterabout.cpp                | 10 ++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index d821bcd..c7f2b4a 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -127,10 +127,12 @@ LLMediaImplGStreamer::
 // virtual
 std::string LLMediaImplGStreamer::getVersion()
 {
-	std::string rtn;
-	rtn = "[" + sLLMediaImplGStreamerReg.getImplName() + "] - GStreamer 0.10.x";
-	return rtn;
+	guint major, minor, micro, nano;
+	llgst_version(&major, &minor, &micro, &nano);
+	std::string version = llformat("%d.%d.%d.%d",major,minor,micro,nano);
+	return version;
 }
+
 //
 //THIS IS THE METHOD THAT'S BREAKING STUFF
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
index 9996ba4..fcee823 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
@@ -37,6 +37,7 @@ LL_GST_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value);
 LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value);
 LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure);
 LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64);
+LL_GST_SYM(true, gst_version, void, guint *major, guint *minor, guint *micro, guint *nano);
 
 // optional symbols to grab
 LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled);
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 4953410..aeca4b5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -42,6 +42,7 @@
 #include "llcurl.h"
 #include "llimagej2c.h"
 #include "audioengine.h"
+#include "llmediaimplgstreamer.h"
 
 #include "llviewertexteditor.h"
 #include "llviewercontrol.h"
@@ -208,6 +209,15 @@ LLFloaterAbout::LLFloaterAbout()
 	LLMediaManager *mgr = LLMediaManager::getInstance();
 	if (mgr)
 	{
+		LLMediaBase *gstreamer = new LLMediaImplGStreamer();
+		if (gstreamer)
+		{
+			support.append("GStreamer Version: ");
+			support.append( gstreamer->getVersion() );
+			support.append("\n");
+		} 
+		delete gstreamer;
+
 		LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html");
 		if (media_source)
 		{
-- 
cgit v1.1