aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp12
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.h2
3 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 82b6b28..12e827c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
12009-04-01 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-04-01 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 Implemented LLMediaImplGstreamer::setDebugLevel().
5 * linden/indra/llmedia/llmediaimplgstreamer.h:
6 Ditto.
7
8
3 * linden/indra/llmedia/llmediaimplcommon.cpp: 9 * linden/indra/llmedia/llmediaimplcommon.cpp:
4 Added LLMediaImplCommon::setDebugLevel(). 10 Added LLMediaImplCommon::setDebugLevel().
5 * linden/indra/llmedia/llmediaimplcommon.h: 11 * linden/indra/llmedia/llmediaimplcommon.h:
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 9a51b7f..82b1096 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -261,6 +261,18 @@ bool LLMediaImplGStreamer::closedown()
261} 261}
262 262
263 263
264bool LLMediaImplGStreamer::setDebugLevel( LLMediaBase::EDebugLevel level )
265{
266 // Do parent class stuff.
267 LLMediaImplCommon::setDebugLevel(level);
268
269 // Set GStreamer verbosity.
270 gst_debug_set_default_threshold( (GstDebugLevel)level );
271
272 return true;
273}
274
275
264/////////////////////////////////////////////////////////////////////////////// 276///////////////////////////////////////////////////////////////////////////////
265// 277//
266// Uncomment the line below to enable spammy debug data. 278// Uncomment the line below to enable spammy debug data.
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 2918416..282da08 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -69,6 +69,8 @@ class LLMediaImplGStreamer:
69 // Sets GST_PLUGIN_PATH env var for GStreamer. 69 // Sets GST_PLUGIN_PATH env var for GStreamer.
70 static void set_gst_plugin_path(); 70 static void set_gst_plugin_path();
71 71
72 /* virtual */ bool setDebugLevel( LLMediaBase::EDebugLevel level );
73
72 /* virtual */ std::string getVersion(); 74 /* virtual */ std::string getVersion();
73 /* virtual */ bool navigateTo( const std::string url ); 75 /* virtual */ bool navigateTo( const std::string url );
74 /* virtual */ bool updateMedia(); 76 /* virtual */ bool updateMedia();