26 files changed, 292 insertions, 175 deletions

diff --git a/linden/indra/llmedia/llmediabase.h b/linden/indra/llmedia/llmediabase.h
index 7f7f06f..68e6677 100644
--- a/linden/indra/llmedia/llmediabase.h
+++ b/linden/indra/llmedia/llmediabase.h
@@ -19,7 +19,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaemitter.h b/linden/indra/llmedia/llmediaemitter.h
index a5e0554..ef3caeb 100644
--- a/linden/indra/llmedia/llmediaemitter.h
+++ b/linden/indra/llmedia/llmediaemitter.h
@@ -19,7 +19,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplcommon.cpp b/linden/indra/llmedia/llmediaimplcommon.cpp
index b206618..87838f7 100644
--- a/linden/indra/llmedia/llmediaimplcommon.cpp
+++ b/linden/indra/llmedia/llmediaimplcommon.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplcommon.h b/linden/indra/llmedia/llmediaimplcommon.h
index 4985cba..2e60a1a 100644
--- a/linden/indra/llmedia/llmediaimplcommon.h
+++ b/linden/indra/llmedia/llmediaimplcommon.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplexample1.cpp b/linden/indra/llmedia/llmediaimplexample1.cpp
index 910bbf7..fe7b7e2 100644
--- a/linden/indra/llmedia/llmediaimplexample1.cpp
+++ b/linden/indra/llmedia/llmediaimplexample1.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplexample1.h b/linden/indra/llmedia/llmediaimplexample1.h
index 19b8ed6..1b90e93 100644
--- a/linden/indra/llmedia/llmediaimplexample1.h
+++ b/linden/indra/llmedia/llmediaimplexample1.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplexample2.cpp b/linden/indra/llmedia/llmediaimplexample2.cpp
index 7bda982..7590e19 100644
--- a/linden/indra/llmedia/llmediaimplexample2.cpp
+++ b/linden/indra/llmedia/llmediaimplexample2.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplexample2.h b/linden/indra/llmedia/llmediaimplexample2.h
index ad76088..6a4f80b 100644
--- a/linden/indra/llmedia/llmediaimplexample2.h
+++ b/linden/indra/llmedia/llmediaimplexample2.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplfactory.cpp b/linden/indra/llmedia/llmediaimplfactory.cpp
index 6f8787e..c5d098f 100644
--- a/linden/indra/llmedia/llmediaimplfactory.cpp
+++ b/linden/indra/llmedia/llmediaimplfactory.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplfactory.h b/linden/indra/llmedia/llmediaimplfactory.h
index 663efd8..93a7cc1 100644
--- a/linden/indra/llmedia/llmediaimplfactory.h
+++ b/linden/indra/llmedia/llmediaimplfactory.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 51614c5..a4fe930 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -43,10 +44,6 @@ extern "C" {
 
 #include "llmediaimplgstreamervidplug.h"
 
-#ifdef LL_GST_SOUNDSINK
-#include "llmediaimplgstreamersndplug.h"
-#endif // LL_GST_SOUNDSINK
-
 #include "llmediaimplgstreamer_syms.h"
 
 // register this impl with media manager factory
@@ -67,6 +64,7 @@ LLMediaImplGStreamerMaker::LLMediaImplGStreamerMaker()
 //
 LLMediaImplGStreamer::
 LLMediaImplGStreamer () :
+        mBusWatchID ( 0 ),
         mediaData ( NULL ),
         mMediaRowbytes ( 1 ),
         mTextureFormatPrimary ( LL_MEDIA_BGRA ),
@@ -74,10 +72,10 @@ LLMediaImplGStreamer () :
         mPump ( NULL ),
         mPlaybin ( NULL ),
         mVideoSink ( NULL )
-#ifdef LL_GST_SOUNDSINK
-        ,mAudioSink ( NULL )
-#endif // LL_GST_SOUNDSINK
 {
+        if (!mDoneInit)
+                return; // error
+
         DEBUGMSG("constructing media...");
 
         mVolume = 0.1234567; // minor hack to force an initial volume update
@@ -95,10 +93,20 @@ LLMediaImplGStreamer () :
         mPlaybin = llgst_element_factory_make ("playbin", "play");
         if (!mPlaybin)
         {
-                // todo: cleanup pump
                 return; // error
         }
 
+        // get playbin's bus
+        GstBus *bus = llgst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
+        if (!bus)
+        {
+                return; // error
+        }
+        mBusWatchID = llgst_bus_add_watch (bus,
+                                           llmediaimplgstreamer_bus_callback,
+                                           this);
+        llgst_object_unref (bus);
+
         if (NULL == getenv("LL_GSTREAMER_EXTERNAL")) {
                 // instantiate and connect a custom video sink
                 mVideoSink =
@@ -111,20 +119,6 @@ LLMediaImplGStreamer () :
                 }
 
                 g_object_set(mPlaybin, "video-sink", mVideoSink, NULL);
-
-#ifdef LL_GST_SOUNDSINK
-                // instantiate and connect a custom audio sink
-                mAudioSink =
-                        GST_SLSOUND(llgst_element_factory_make ("private-slsound", "slsound"));
-                if (!mAudioSink)
-                {
-                        WARNMSG("Could not instantiate private-slsound element.");
-                        // todo: cleanup.
-                        return; // error
-                }
-
-                g_object_set(mPlaybin, "audio-sink", mAudioSink, NULL);
-#endif
         }
 }
 
@@ -166,48 +160,96 @@ std::string LLMediaImplGStreamer::getVersion()
 
 ///////////////////////////////////////////////////////////////////////////////
 // (static) super-initialization - called once at application startup
+
+//static
+bool LLMediaImplGStreamer::mDoneInit = false;
+
+//static
 bool
 LLMediaImplGStreamer::
 startup ( LLMediaManagerData* init_data )
 {
-        static bool done_init = false;
-        if (!done_init)
+        // first - check if GStreamer is explicitly disabled
+        if (NULL != getenv("LL_DISABLE_GSTREAMER"))
+                return false;
+
+        // only do global GStreamer initialization once.
+        if (!mDoneInit)
         {
                 // Init the glib type system - we need it.
                 g_type_init();
 
                 // Get symbols!
                 if (! grab_gst_syms("libgstreamer-0.10.so.0",
-                                    "libgstvideo-0.10.so.0",
-                                    "libgstaudio-0.10.so.0") )
+                                    "libgstvideo-0.10.so.0") )
                 {
                         WARNMSG("Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled.");
                         return false;
                 }
 
                 if (llgst_segtrap_set_enabled)
+                {
                         llgst_segtrap_set_enabled(FALSE);
+                }
                 else
+                {
                         WARNMSG("gst_segtrap_set_enabled() is not available; Automated crash-reporter may cease to function until next restart.");
+                }
+
+#if LL_LINUX
+                // Gstreamer tries a fork during init, waitpid-ing on it,
+                // which conflicts with any installed SIGCHLD handler...
+                struct sigaction tmpact, oldact;
+                if (llgst_registry_fork_set_enabled) {
+                        // if we can disable SIGCHLD-using forking behaviour,
+                        // do it.
+                        llgst_registry_fork_set_enabled(false);
+                }
+                else {
+                        // else temporarily install default SIGCHLD handler
+                        // while GStreamer initialises
+                        tmpact.sa_handler = SIG_DFL;
+                        sigemptyset( &tmpact.sa_mask );
+                        tmpact.sa_flags = SA_SIGINFO;
+                        sigaction(SIGCHLD, &tmpact, &oldact);
+                }
+#endif // LL_LINUX
 
                 // Protect against GStreamer resetting the locale, yuck.
                 static std::string saved_locale;
                 saved_locale = setlocale(LC_ALL, NULL);
-                if (0 == llgst_init_check(NULL, NULL, NULL))
+
+                // finally, try to initialize GStreamer!
+                GError *err = NULL;
+                gboolean init_gst_success = llgst_init_check(NULL, NULL, &err);
+
+                // restore old locale
+                setlocale(LC_ALL, saved_locale.c_str() );
+
+#if LL_LINUX
+                // restore old SIGCHLD handler
+                if (!llgst_registry_fork_set_enabled)
+                        sigaction(SIGCHLD, &oldact, NULL);
+#endif // LL_LINUX
+
+                if (!init_gst_success) // fail
                 {
-                        WARNMSG("GST init failed for unspecified reason.");
-                        setlocale(LC_ALL, saved_locale.c_str() );
+                        if (err)
+                        {
+                                WARNMSG("GST init failed: %s", err->message);
+                                g_error_free(err);
+                        }
+                        else
+                        {
+                                WARNMSG("GST init failed for unspecified reason.");
+                        }
                         return false;
                 }
-                setlocale(LC_ALL, saved_locale.c_str() );
                 
                 // Init our custom plugins - only really need do this once.
                 gst_slvideo_init_class();
-#if 0
-                gst_slsound_init_class();
-#endif
 
-                done_init = true;
+                mDoneInit = true;
         }
 
         return true;
@@ -217,6 +259,9 @@ startup ( LLMediaManagerData* init_data )
 bool LLMediaImplGStreamer::
 closedown()
 {
+        if (!mDoneInit)
+                return false; // error
+
         ungrab_gst_syms();
 
         return true;
@@ -240,12 +285,15 @@ static char* get_gst_state_name(GstState state)
 }
 #endif // LL_GST_REPORT_STATE_CHANGES
 
-//static
+extern "C" {
 gboolean
-LLMediaImplGStreamer::bus_callback (GstBus     *bus,
-                                    GstMessage *message,
-                                    gpointer    data)
+llmediaimplgstreamer_bus_callback (GstBus     *bus,
+                                   GstMessage *message,
+                                   gpointer    data)
 {
+        if (!message) 
+                return TRUE; // shield against GStreamer bug
+
         if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_STATE_CHANGED &&
             GST_MESSAGE_TYPE(message) != GST_MESSAGE_BUFFERING)
         {
@@ -352,10 +400,35 @@ LLMediaImplGStreamer::bus_callback (GstBus     *bus,
                 if (impl->isLooping())
                 {
                         DEBUGMSG("looping media...");
-                        impl->stop();
-                        impl->play();
+                        double eos_pos_sec = 0.0F;
+                        bool got_eos_position = impl->getTimePos(eos_pos_sec);
+
+                        if (got_eos_position && eos_pos_sec < impl->MIN_LOOP_SEC)
+                        {
+                                // if we know that the movie is really short, don't
+                                // loop it else it can easily become a time-hog
+                                // because of GStreamer spin-up overhead
+                                DEBUGMSG("really short movie (%0.3fsec) - not gonna loop this, pausing instead.", eos_pos_sec);
+                                // inject a COMMAND_PAUSE
+                                impl->addCommand(LLMediaBase::COMMAND_PAUSE);
+                        }
+                        else
+                        {
+                                // first try looping by an explicit rewind
+                                bool seeksuccess = impl->seek(0.0);
+                                if (seeksuccess)
+                                {
+                                        impl->play();
+                                }
+                                else // use clumsy stop-start to loop
+                                {
+                                        DEBUGMSG("couldn't loop by rewinding - stopping and starting instead...");
+                                        impl->stop();
+                                        impl->play();
+                                }
+                        }
                 }
-                else
+                else // not a looping media
                 {
                         // inject a COMMAND_STOP
                         impl->addCommand(LLMediaBase::COMMAND_STOP);
@@ -372,6 +445,7 @@ LLMediaImplGStreamer::bus_callback (GstBus     *bus,
          */
         return TRUE;
 }
+} // extern "C"
 
 ///////////////////////////////////////////////////////////
 // virtual
@@ -379,15 +453,15 @@ bool
 LLMediaImplGStreamer::
 navigateTo ( const std::string urlIn )
 {
+        if (!mDoneInit)
+                return false; // error
+
         DEBUGMSG("Setting media URI: %s", urlIn.c_str());
 
-        if (NULL == mPump
-#ifdef LL_GST_SOUNDSINK
-            || NULL == mAudioSink
-#endif
-            || NULL == mPlaybin)
+        if (NULL == mPump ||
+            NULL == mPlaybin)
         {
-                return false;
+                return false; // error
         }
 
         setStatus( LLMediaBase::STATUS_NAVIGATING );
@@ -396,15 +470,6 @@ navigateTo ( const std::string urlIn )
         g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), NULL);
         //g_object_set (G_OBJECT (mPlaybin), "uri", "file:///tmp/movie", NULL);
 
-        // get playbin's bus - perhaps this can/should be done in ctor
-        GstBus *bus = llgst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
-        if (!bus)
-        {
-                return false;
-        }
-        llgst_bus_add_watch (bus, bus_callback, this);
-        llgst_object_unref (bus);
-
         // navigateTo implicitly plays, too.
         play();
 
@@ -417,7 +482,14 @@ bool
 LLMediaImplGStreamer::
 unload ()
 {
+        if (!mDoneInit)
+                return false; // error
+
         DEBUGMSG("unloading media...");
+        
+        // stop getting callbacks for this bus
+        g_source_remove(mBusWatchID);
+
         if (mPlaybin)
         {
                 llgst_element_set_state (mPlaybin, GST_STATE_NULL);
@@ -433,7 +505,7 @@ unload ()
 
         if (mediaData)
         {
-                delete mediaData;
+                delete [] mediaData;
                 mediaData = NULL;
         }
 
@@ -448,14 +520,14 @@ bool
 LLMediaImplGStreamer::
 updateMedia ()
 {
+        if (!mDoneInit)
+                return false; // error
+
         DEBUGMSG("updating media...");
         
         // sanity check
-        if (NULL == mPump
-#ifdef LL_GST_SOUNDSINK
-            || NULL == mAudioSink
-#endif
-            || NULL == mPlaybin)
+        if (NULL == mPump ||
+            NULL == mPlaybin)
         {
                 DEBUGMSG("dead media...");
                 return false;
@@ -517,7 +589,7 @@ updateMedia ()
                             mVideoSink->retained_frame_height != getMediaHeight())
                                 // *TODO: also check for change in format
                         {
-                                // just resize containe
+                                // just resize container
                                 int neww = mVideoSink->retained_frame_width;
                                 int newh = mVideoSink->retained_frame_height;
                                 int newd = SLVPixelFormatBytes[mVideoSink->retained_frame_format];
@@ -621,12 +693,12 @@ LLMediaImplGStreamer::
 seek( double time )
 {
         bool success = false;
-        if (mPlaybin)
+        if (mDoneInit && mPlaybin)
         {
                 success = llgst_element_seek(mPlaybin, 1.0F, GST_FORMAT_TIME,
                                 GstSeekFlags(GST_SEEK_FLAG_FLUSH |
                                              GST_SEEK_FLAG_KEY_UNIT),
-                                GST_SEEK_TYPE_SET, gint64(time*1000000000.0F),
+                                GST_SEEK_TYPE_SET, gint64(time*GST_SECOND),
                                 GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
         }
         DEBUGMSG("MEDIA SEEK REQUEST to %fsec result was %d",
@@ -634,6 +706,49 @@ seek( double time )
         return success;
 }
 
+bool
+LLMediaImplGStreamer::
+getTimePos(double &sec_out)
+{
+        bool got_position = false;
+        if (mPlaybin)
+        {
+                gint64 pos;
+                GstFormat timefmt = GST_FORMAT_TIME;
+                got_position =
+                        llgst_element_query_position &&
+                        llgst_element_query_position(mPlaybin,
+                                                     &timefmt,
+                                                     &pos);
+                got_position = got_position
+                        && (timefmt == GST_FORMAT_TIME);
+                // GStreamer may have other ideas, but we consider the current position
+                // undefined if not PLAYING or PAUSED
+                got_position = got_position &&
+                        (GST_STATE(mPlaybin) == GST_STATE_PLAYING ||
+                         GST_STATE(mPlaybin) == GST_STATE_PAUSED);
+                if (got_position && !GST_CLOCK_TIME_IS_VALID(pos))
+                {
+                        if (GST_STATE(mPlaybin) == GST_STATE_PLAYING)
+                        {
+                                // if we're playing then we treat an invalid clock time
+                                // as 0, for complicated reasons (insert reason here)
+                                pos = 0;
+                        }
+                        else
+                        {
+                                got_position = false;
+                        }
+                        
+                }
+                // If all the preconditions succeeded... we can trust the result.
+                if (got_position)
+                {
+                        sec_out = double(pos) / double(GST_SECOND); // gst to sec
+                }
+        }
+        return got_position;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // virtual
@@ -648,7 +763,7 @@ setVolume(float volume)
                 return true; // nothing to do, everything's fine
 
         mVolume = volume;
-        if (mPlaybin)
+        if (mDoneInit && mPlaybin)
         {
                 g_object_set(mPlaybin, "volume", mVolume, NULL);
                 return true;
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index f1ffd3a..07b698d 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -48,9 +49,6 @@ extern "C" {
 }
 
 #include "llmediaimplgstreamervidplug.h"
-#ifdef LL_GST_SOUNDSINK
-#include "llmediaimplgstreamersndplug.h"
-#endif // LL_GST_SOUNDSINK
 
 class LLMediaManagerData;
 class LLMediaImplMaker;
@@ -81,30 +79,38 @@ class LLMediaImplGStreamer:
 
                 LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
-        private:
                 // misc
-                bool unload();
                 bool pause();
                 bool stop();
                 bool play();
-                static gboolean bus_callback (GstBus     *bus,
-                                              GstMessage *message,
-                                              gpointer    data);
+                bool getTimePos(double &sec_out);
+                static const double MIN_LOOP_SEC = 1.0F;
+
+        private:
+                bool unload();
+
+                static bool mDoneInit;
+
+                guint mBusWatchID;
+
                 unsigned char* mediaData;
                 int mMediaRowbytes;
 
                 int mTextureFormatPrimary;
                 int mTextureFormatType;
 
-                // GStreamer-specific
+                // Very GStreamer-specific
                 GMainLoop *mPump; // event pump for this media
                 GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
-#ifdef LL_GST_SOUNDSINK
-                GstSLSound *mAudioSink;
-#endif // LL_GST_SOUNDSINK
 };
 
+extern "C" {
+gboolean llmediaimplgstreamer_bus_callback (GstBus     *bus,
+                                            GstMessage *message,
+                                            gpointer    data);
+}
+
 class LLMediaImplGStreamerMaker : public LLMediaImplMaker
 {
 public: 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
index 20ee00b..db26dda 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -42,21 +43,28 @@ extern "C" {
 
 #define LL_GST_SYM(REQ, GSTSYM, RTN, ...) RTN (*ll##GSTSYM)(__VA_ARGS__) = NULL
 #include "llmediaimplgstreamer_syms_raw.inc"
-#include "llmediaimplgstreamer_syms_rawa.inc"
 #include "llmediaimplgstreamer_syms_rawv.inc"
 #undef LL_GST_SYM
 
+// a couple of stubs for disgusting reasons
+GstDebugCategory*
+ll_gst_debug_category_new(gchar *name, guint color, gchar *description)
+{
+        static GstDebugCategory dummy;
+        return &dummy;
+}
+void ll_gst_debug_register_funcptr(GstDebugFuncPtr func, gchar* ptrname)
+{
+}
 
 static bool sSymsGrabbed = false;
 static apr_pool_t *sSymGSTDSOMemoryPool = NULL;
 static apr_dso_handle_t *sSymGSTDSOHandleG = NULL;
 static apr_dso_handle_t *sSymGSTDSOHandleV = NULL;
-static apr_dso_handle_t *sSymGSTDSOHandleA = NULL;
 
 
 bool grab_gst_syms(std::string gst_dso_name,
-                   std::string gst_dso_name_vid,
-                   std::string gst_dso_name_aud)
+                   std::string gst_dso_name_vid)
 {
         if (sSymsGrabbed)
         {
@@ -87,40 +95,20 @@ bool grab_gst_syms(std::string gst_dso_name,
                         sSymGSTDSOHandle = NULL;
                 }
       
-                if ( APR_SUCCESS == (rv = apr_dso_load(&sSymGSTDSOHandle,
-                                                    gst_dso_name_aud.c_str(),
-                                                       sSymGSTDSOMemoryPool) ))
+                if ( APR_SUCCESS ==
+                     (rv = apr_dso_load(&sSymGSTDSOHandle,
+                                        gst_dso_name_vid.c_str(),
+                                        sSymGSTDSOMemoryPool) ))
                 {
-                        INFOMSG("Found DSO: %s", gst_dso_name_aud.c_str());
-#include "llmediaimplgstreamer_syms_rawa.inc"
-                        
-                        if ( sSymGSTDSOHandle )
-                        {
-                                sSymGSTDSOHandleA = sSymGSTDSOHandle;
-                                sSymGSTDSOHandle = NULL;
-                        }
-          
-                        if ( APR_SUCCESS ==
-                             (rv = apr_dso_load(&sSymGSTDSOHandle,
-                                                gst_dso_name_vid.c_str(),
-                                                sSymGSTDSOMemoryPool) ))
-                        {
-                                INFOMSG("Found DSO: %s", gst_dso_name_vid.c_str());
+                        INFOMSG("Found DSO: %s", gst_dso_name_vid.c_str());
 #include "llmediaimplgstreamer_syms_rawv.inc"
-                        }
-                        else
-                        {
-                                INFOMSG("Couldn't load DSO: %s", gst_dso_name_vid.c_str());
-                                rtn = false; // failure
-                        }
+                        rtn = !sym_error;
                 }
                 else
                 {
-                        INFOMSG("Couldn't load DSO: %s", gst_dso_name_aud.c_str());
+                        INFOMSG("Couldn't load DSO: %s", gst_dso_name_vid.c_str());
                         rtn = false; // failure
                 }
-                
-                rtn = !sym_error;
         }
         else
         {
@@ -156,12 +144,6 @@ void ungrab_gst_syms()
                 sSymGSTDSOHandleG = NULL;
         }
         
-        if ( sSymGSTDSOHandleA )
-        {
-                apr_dso_unload(sSymGSTDSOHandleA);
-                sSymGSTDSOHandleA = NULL;
-        }
-        
         if ( sSymGSTDSOHandleV )
         {
                 apr_dso_unload(sSymGSTDSOHandleV);
@@ -177,7 +159,6 @@ void ungrab_gst_syms()
         // NULL-out all of the symbols we'd grabbed
 #define LL_GST_SYM(REQ, GSTSYM, RTN, ...) do{ll##GSTSYM = NULL;}while(0)
 #include "llmediaimplgstreamer_syms_raw.inc"
-#include "llmediaimplgstreamer_syms_rawa.inc"
 #include "llmediaimplgstreamer_syms_rawv.inc"
 #undef LL_GST_SYM
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.h b/linden/indra/llmedia/llmediaimplgstreamer_syms.h
index 6957b1c..4220bdb 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -38,13 +39,11 @@ extern "C" {
 }
 
 bool grab_gst_syms(std::string gst_dso_name,
-                   std::string gst_dso_name_vid,
-                   std::string gst_dso_name_aud);
+                   std::string gst_dso_name_vid);
 void ungrab_gst_syms();
 
 #define LL_GST_SYM(REQ, GSTSYM, RTN, ...) extern RTN (*ll##GSTSYM)(__VA_ARGS__)
 #include "llmediaimplgstreamer_syms_raw.inc"
-#include "llmediaimplgstreamer_syms_rawa.inc"
 #include "llmediaimplgstreamer_syms_rawv.inc"
 #undef LL_GST_SYM
 
@@ -61,12 +60,13 @@ void ungrab_gst_syms();
 #define GST_TYPE_PIPELINE (llgst_pipeline_get_type())
 #undef GST_TYPE_ELEMENT
 #define GST_TYPE_ELEMENT (llgst_element_get_type())
-#undef GST_TYPE_AUDIO_SINK
-#define GST_TYPE_AUDIO_SINK (llgst_audio_sink_get_type())
 #undef GST_TYPE_VIDEO_SINK
 #define GST_TYPE_VIDEO_SINK (llgst_video_sink_get_type())
+// more regrettable hacks to stub-out these .h-exposed GStreamer internals
+void ll_gst_debug_register_funcptr(GstDebugFuncPtr func, gchar* ptrname);
 #undef _gst_debug_register_funcptr
 #define _gst_debug_register_funcptr ll_gst_debug_register_funcptr
+GstDebugCategory* ll_gst_debug_category_new(gchar *name, guint color, gchar *description);
 #undef _gst_debug_category_new
 #define _gst_debug_category_new ll_gst_debug_category_new
 #undef __gst_debug_enabled
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
index 08ba6df..b81872a 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
@@ -19,8 +19,6 @@ LL_GST_SYM(true, gst_element_class_add_pad_template, void, GstElementClass *klas
 LL_GST_SYM(true, gst_element_class_set_details, void, GstElementClass *klass, const GstElementDetails *details);
 LL_GST_SYM(true, gst_caps_unref, void, GstCaps* caps);
 LL_GST_SYM(true, gst_caps_ref, GstCaps *, GstCaps* caps);
-LL_GST_SYM(true, _gst_debug_register_funcptr, void, GstDebugFuncPtr func, gchar* ptrname);
-LL_GST_SYM(true, _gst_debug_category_new, GstDebugCategory *, gchar *name, guint color, gchar *description);
 LL_GST_SYM(true, gst_caps_is_empty, gboolean, const GstCaps *caps);
 LL_GST_SYM(true, gst_caps_from_string, GstCaps *, const gchar *string);
 LL_GST_SYM(true, gst_caps_replace, void, GstCaps **caps, GstCaps *newcaps);
@@ -37,6 +35,12 @@ LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStruct
 LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64);
 
 // optional symbols to grab
+LL_GST_SYM(false, gst_registry_fork_set_enabled, void, gboolean enabled);
 LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled);
 LL_GST_SYM(false, gst_message_parse_buffering, void, GstMessage *message, gint *percent);
 LL_GST_SYM(false, gst_message_parse_info, void, GstMessage *message, GError **gerror, gchar **debug);
+LL_GST_SYM(false, gst_element_query_position, gboolean, GstElement *element, GstFormat *format, gint64 *cur);
+
+// GStreamer 'internal' symbols which may not be visible in some runtimes but are still used in expanded GStreamer header macros - yuck!  We'll substitute our own stubs for these.
+//LL_GST_SYM(true, _gst_debug_register_funcptr, void, GstDebugFuncPtr func, gchar* ptrname);
+//LL_GST_SYM(true, _gst_debug_category_new, GstDebugCategory *, gchar *name, guint color, gchar *description);
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc
deleted file mode 100644
index 0be99b5..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-// required symbols to grab
-LL_GST_SYM(true, gst_audio_sink_get_type, GType, void);
-
-// optional symbols to grab
diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
index dc3fe61..5e96666 100644
--- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -81,10 +82,10 @@ static void
 gst_slvideo_base_init (gpointer gclass)
 {
         static GstElementDetails element_details = {
-                "PluginTemplate",
-                "Generic/PluginTemplate",
-                "Generic Template Element",
-                "Linden Lab"
+                (gchar*)"PluginTemplate",
+                (gchar*)"Generic/PluginTemplate",
+                (gchar*)"Generic Template Element",
+                (gchar*)"Linden Lab"
         };
         GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
         
@@ -317,14 +318,6 @@ gst_slvideo_stop (GstBaseSink * bsink)
 }
 
 
-static gboolean
-gst_slvideo_unlock (GstBaseSink * bsink)
-{
-        // nothing really to do here.
-        return TRUE;
-}
-
-
 /* initialize the plugin's class */
 static void
 gst_slvideo_class_init (GstSLVideoClass * klass)
@@ -343,17 +336,19 @@ gst_slvideo_class_init (GstSLVideoClass * klass)
         
         gstelement_class->change_state = gst_slvideo_change_state;
         
-        gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_slvideo_get_caps);
-        gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR( gst_slvideo_set_caps);
-        //gstbasesink_class->buffer_alloc=GST_DEBUG_FUNCPTR(gst_slvideo_buffer_alloc);
-        //gstbasesink_class->get_times = GST_DEBUG_FUNCPTR (gst_slvideo_get_times);
-        gstbasesink_class->preroll = GST_DEBUG_FUNCPTR (gst_slvideo_show_frame);
-        gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_slvideo_show_frame);
+#define LLGST_DEBUG_FUNCPTR(p) (p)
+        gstbasesink_class->get_caps = LLGST_DEBUG_FUNCPTR (gst_slvideo_get_caps);
+        gstbasesink_class->set_caps = LLGST_DEBUG_FUNCPTR( gst_slvideo_set_caps);
+        //gstbasesink_class->buffer_alloc=LLGST_DEBUG_FUNCPTR(gst_slvideo_buffer_alloc);
+        //gstbasesink_class->get_times = LLGST_DEBUG_FUNCPTR (gst_slvideo_get_times);
+        gstbasesink_class->preroll = LLGST_DEBUG_FUNCPTR (gst_slvideo_show_frame);
+        gstbasesink_class->render = LLGST_DEBUG_FUNCPTR (gst_slvideo_show_frame);
         
-        gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_slvideo_start);
-        gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_slvideo_stop);
+        gstbasesink_class->start = LLGST_DEBUG_FUNCPTR (gst_slvideo_start);
+        gstbasesink_class->stop = LLGST_DEBUG_FUNCPTR (gst_slvideo_stop);
         
-        gstbasesink_class->unlock = GST_DEBUG_FUNCPTR (gst_slvideo_unlock);
+        //      gstbasesink_class->unlock = LLGST_DEBUG_FUNCPTR (gst_slvideo_unlock);
+#undef LLGST_DEBUG_FUNCPTR
 }
 
 
@@ -433,8 +428,8 @@ plugin_init (GstPlugin * plugin)
 {
         //fprintf(stderr, "\n\n\nPLUGIN INIT\n\n\n");
 
-        GST_DEBUG_CATEGORY_INIT (gst_slvideo_debug, "private-slvideo-plugin",
-                                 0, "Second Life Video Sink");
+        GST_DEBUG_CATEGORY_INIT (gst_slvideo_debug, (gchar*)"private-slvideo-plugin",
+                                 0, (gchar*)"Second Life Video Sink");
 
         return llgst_element_register (plugin, "private-slvideo",
                                        GST_RANK_NONE, GST_TYPE_SLVIDEO);
diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.h b/linden/indra/llmedia/llmediaimplgstreamervidplug.h
index 660d261..3db064c 100644
--- a/linden/indra/llmedia/llmediaimplgstreamervidplug.h
+++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 05d7220..689d4b4 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.h b/linden/indra/llmedia/llmediaimplllmozlib.h
index 18b1c6a..f71300e 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.h
+++ b/linden/indra/llmedia/llmediaimplllmozlib.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplquicktime.cpp b/linden/indra/llmedia/llmediaimplquicktime.cpp
index 5bd530d..76cacee 100644
--- a/linden/indra/llmedia/llmediaimplquicktime.cpp
+++ b/linden/indra/llmedia/llmediaimplquicktime.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplquicktime.h b/linden/indra/llmedia/llmediaimplquicktime.h
index c8de1dd..d4e1db8 100644
--- a/linden/indra/llmedia/llmediaimplquicktime.h
+++ b/linden/indra/llmedia/llmediaimplquicktime.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaimplregister.h b/linden/indra/llmedia/llmediaimplregister.h
index fcc3ab7..5191274 100644
--- a/linden/indra/llmedia/llmediaimplregister.h
+++ b/linden/indra/llmedia/llmediaimplregister.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index 6db8dbe..e1c7608 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -150,8 +151,10 @@ LLMediaManager* LLMediaManager::getInstance()
 // (static)
 void LLMediaManager::setBrowserUserAgent(std::string user_agent)
 {
+#if LL_LLMOZLIB_ENABLED
         // *HACK: Breaks encapsulation model, as initClass does above. JC
         LLMediaImplLLMozLib::setBrowserUserAgent(user_agent);
+#endif // LL_LLMOZLIB_ENABLED
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmedia/llmediamanager.h b/linden/indra/llmedia/llmediamanager.h
index f618f4c..dc832d5 100644
--- a/linden/indra/llmedia/llmediamanager.h
+++ b/linden/indra/llmedia/llmediamanager.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llmedia/llmediaobserver.h b/linden/indra/llmedia/llmediaobserver.h
index e6da4f6..5f794bb 100644
--- a/linden/indra/llmedia/llmediaobserver.h
+++ b/linden/indra/llmedia/llmediaobserver.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,