diff options
Diffstat (limited to 'linden/indra/llmedia/llmediaimplgstreamer.h')
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h index 944db59..247b0ce 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.h +++ b/linden/indra/llmedia/llmediaimplgstreamer.h | |||
@@ -43,8 +43,8 @@ extern "C" { | |||
43 | #include <stdio.h> | 43 | #include <stdio.h> |
44 | #include <gst/gst.h> | 44 | #include <gst/gst.h> |
45 | 45 | ||
46 | #include <apr-1/apr_pools.h> | 46 | #include "apr_pools.h" |
47 | #include <apr-1/apr_dso.h> | 47 | #include "apr_dso.h" |
48 | } | 48 | } |
49 | 49 | ||
50 | #include "llmediaimplgstreamervidplug.h" | 50 | #include "llmediaimplgstreamervidplug.h" |
@@ -76,16 +76,20 @@ class LLMediaImplGStreamer: | |||
76 | /* virtual */ int getTextureFormatPrimary() const; | 76 | /* virtual */ int getTextureFormatPrimary() const; |
77 | /* virtual */ int getTextureFormatType() const; | 77 | /* virtual */ int getTextureFormatType() const; |
78 | /* virtual */ int getTextureFormatInternal() const; | 78 | /* virtual */ int getTextureFormatInternal() const; |
79 | /* virtual */ bool seek( double time ); | ||
79 | /* virtual */ bool setVolume( float volume ); | 80 | /* virtual */ bool setVolume( float volume ); |
80 | 81 | ||
81 | bool stop(); | ||
82 | bool play(); | ||
83 | LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;}; | 82 | LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;}; |
84 | 83 | ||
85 | private: | 84 | private: |
86 | // misc | 85 | // misc |
87 | bool unload(); | 86 | bool unload(); |
88 | bool pause(); | 87 | bool pause(); |
88 | bool stop(); | ||
89 | bool play(); | ||
90 | static gboolean bus_callback (GstBus *bus, | ||
91 | GstMessage *message, | ||
92 | gpointer data); | ||
89 | unsigned char* mediaData; | 93 | unsigned char* mediaData; |
90 | int mMediaRowbytes; | 94 | int mMediaRowbytes; |
91 | 95 | ||