aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-02 03:12:02 -0500
committerJacek Antonelli2009-04-02 03:27:26 -0500
commit42670a609d842affb26bf1dd1ed6b69958655ea9 (patch)
tree026265cb8bbff3801d59c8f0e471d1ea1d84a5f4
parentImplemented LLMediaImplGStreamer::gstreamer_log(). (diff)
downloadmeta-impy-42670a609d842affb26bf1dd1ed6b69958655ea9.zip
meta-impy-42670a609d842affb26bf1dd1ed6b69958655ea9.tar.gz
meta-impy-42670a609d842affb26bf1dd1ed6b69958655ea9.tar.bz2
meta-impy-42670a609d842affb26bf1dd1ed6b69958655ea9.tar.xz
Plugged in LLMediaImplGStreamer::gstreamer_log().
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index d0f2f6c..c680f42 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
12009-04-02 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-04-02 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/llmedia/llmediaimplgstreamer.cpp: 3 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 Plugged in LLMediaImplGStreamer::gstreamer_log().
5
6
7 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 Implemented LLMediaImplGStreamer::gstreamer_log(). 8 Implemented LLMediaImplGStreamer::gstreamer_log().
5 * linden/indra/llmedia/llmediaimplgstreamer.h: 9 * linden/indra/llmedia/llmediaimplgstreamer.h:
6 Ditto. 10 Ditto.
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 8cbfb60..532ec00 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -176,7 +176,11 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
176 return false; 176 return false;
177 } 177 }
178 setlocale(LC_ALL, saved_locale.c_str() ); 178 setlocale(LC_ALL, saved_locale.c_str() );
179 179
180 // Set up logging facilities
181 gst_debug_remove_log_function( gst_debug_log_default );
182 gst_debug_add_log_function( gstreamer_log, NULL );
183
180 // Init our custom plugins - only really need do this once. 184 // Init our custom plugins - only really need do this once.
181 gst_slvideo_init_class(); 185 gst_slvideo_init_class();
182 186