diff options
Diffstat (limited to 'linden/indra/llmedia/llmediaimplgstreamer.h')
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h index 247b0ce..4b9353b 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.h +++ b/linden/indra/llmedia/llmediaimplgstreamer.h | |||
@@ -31,20 +31,19 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | // header guard | 33 | // header guard |
34 | #ifndef llmediaimplgstreamer_h | 34 | ///#ifndef llmediaimplgstreamer_h |
35 | #define llmediaimplgstreamer_h | 35 | #define llmediaimplgstreamer_h |
36 | 36 | ||
37 | #include "llmediaimplcommon.h" | 37 | #include "llmediaimplcommon.h" |
38 | #include "llmediaimplfactory.h" | 38 | #include "llmediaimplfactory.h" |
39 | 39 | ||
40 | #if LL_GSTREAMER_ENABLED | 40 | ///#if LL_GSTREAMER_ENABLED |
41 | 41 | ||
42 | extern "C" { | 42 | extern "C" { |
43 | #include <stdio.h> | 43 | #include <stdio.h> |
44 | #include <gst/gst.h> | 44 | #include <gst/gst.h> |
45 | 45 | #include <apr_pools.h> | |
46 | #include "apr_pools.h" | 46 | #include <apr_dso.h> |
47 | #include "apr_dso.h" | ||
48 | } | 47 | } |
49 | 48 | ||
50 | #include "llmediaimplgstreamervidplug.h" | 49 | #include "llmediaimplgstreamervidplug.h" |
@@ -100,9 +99,11 @@ class LLMediaImplGStreamer: | |||
100 | GMainLoop *mPump; // event pump for this media | 99 | GMainLoop *mPump; // event pump for this media |
101 | GstElement *mPlaybin; | 100 | GstElement *mPlaybin; |
102 | GstSLVideo *mVideoSink; | 101 | GstSLVideo *mVideoSink; |
102 | GstState mState; | ||
103 | #ifdef LL_GST_SOUNDSINK | 103 | #ifdef LL_GST_SOUNDSINK |
104 | GstSLSound *mAudioSink; | 104 | GstSLSound *mAudioSink; |
105 | #endif // LL_GST_SOUNDSINK | 105 | #endif // LL_GST_SOUNDSINK |
106 | GstState getState() const { return mState; } | ||
106 | }; | 107 | }; |
107 | 108 | ||
108 | class LLMediaImplGStreamerMaker : public LLMediaImplMaker | 109 | class LLMediaImplGStreamerMaker : public LLMediaImplMaker |
@@ -129,6 +130,6 @@ public: | |||
129 | #define WARNMSG STDERRMSG | 130 | #define WARNMSG STDERRMSG |
130 | ///////////////////////////////////////////////////////////////////////// | 131 | ///////////////////////////////////////////////////////////////////////// |
131 | 132 | ||
132 | #endif // LL_GSTREAMER_ENABLED | 133 | ///#endif // LL_GSTREAMER_ENABLED |
133 | 134 | ||
134 | #endif // llmediaimplgstreamer_h | 135 | ///#endif // llmediaimplgstreamer_h |