aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2b3727a..34b4c39 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,9 @@
12009-02-27 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-02-27 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 Initialize gstreamer (if needed) when making LLMediaImplGStreamer.
5 Lets us find gstreamer version for "About Imprudence" before login.
6
3 * linden/indra/newview/llfloaterabout.cpp: 7 * linden/indra/newview/llfloaterabout.cpp:
4 Get gstreamer reference from media manager. 8 Get gstreamer reference from media manager.
5 Eliminates the need to include llmediaimplgstreamer.h, 9 Eliminates the need to include llmediaimplgstreamer.h,
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index af089bc..30706f1 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -75,6 +75,8 @@ LLMediaImplGStreamer () :
75 mVideoSink ( NULL ), 75 mVideoSink ( NULL ),
76 mState( GST_STATE_NULL ) 76 mState( GST_STATE_NULL )
77{ 77{
78 startup( NULL ); // Startup gstreamer if it hasn't been already.
79
78 LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL; 80 LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL;
79 mVolume = -1.0; // XXX Hack to make the vould change happend first time 81 mVolume = -1.0; // XXX Hack to make the vould change happend first time
80 82