diff options
author | McCabe Maxsted | 2009-03-30 02:55:33 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-03-30 02:55:33 -0700 |
commit | 8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af (patch) | |
tree | 377f08b13ac8d0f3ba267a5cff91ebd7ae23431d /linden/indra/llmedia/llmediaimplgstreamer.h | |
parent | Merge branch 'gst-revamp' into next (diff) | |
parent | Added flag for multi-core compiling in VS2005 (diff) | |
download | meta-impy-8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af.zip meta-impy-8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af.tar.gz meta-impy-8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af.tar.bz2 meta-impy-8ad8d0bac5e0305e2f71d05cc9d1c22e71b217af.tar.xz |
Merge commit 'edadcfadf71ac23d301a1b6fb186883d' into next
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h index dec970a..2918416 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.h +++ b/linden/indra/llmedia/llmediaimplgstreamer.h | |||
@@ -66,6 +66,9 @@ class LLMediaImplGStreamer: | |||
66 | static bool startup( LLMediaManagerData* init_data ); | 66 | static bool startup( LLMediaManagerData* init_data ); |
67 | static bool closedown(); | 67 | static bool closedown(); |
68 | 68 | ||
69 | // Sets GST_PLUGIN_PATH env var for GStreamer. | ||
70 | static void set_gst_plugin_path(); | ||
71 | |||
69 | /* virtual */ std::string getVersion(); | 72 | /* virtual */ std::string getVersion(); |
70 | /* virtual */ bool navigateTo( const std::string url ); | 73 | /* virtual */ bool navigateTo( const std::string url ); |
71 | /* virtual */ bool updateMedia(); | 74 | /* virtual */ bool updateMedia(); |
@@ -79,6 +82,7 @@ class LLMediaImplGStreamer: | |||
79 | LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;}; | 82 | LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;}; |
80 | 83 | ||
81 | private: | 84 | private: |
85 | |||
82 | // misc | 86 | // misc |
83 | bool unload(); | 87 | bool unload(); |
84 | bool pause(); | 88 | bool pause(); |