diff options
author | Jacek Antonelli | 2009-04-01 23:15:29 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-02 01:43:46 -0500 |
commit | 713001efd41390bbcb28d071771ffae1201bab94 (patch) | |
tree | 2c2d29b0fa7e684dbfe4efb266223b1f53f326a6 | |
parent | Added LLMediaBase::EDebugLevel and setDebugLevel stub. (diff) | |
download | meta-impy-713001efd41390bbcb28d071771ffae1201bab94.zip meta-impy-713001efd41390bbcb28d071771ffae1201bab94.tar.gz meta-impy-713001efd41390bbcb28d071771ffae1201bab94.tar.bz2 meta-impy-713001efd41390bbcb28d071771ffae1201bab94.tar.xz |
Added LLMediaImplCommon::setDebugLevel().
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/llmedia/llmediaimplcommon.cpp | 12 | ||||
-rw-r--r-- | linden/indra/llmedia/llmediaimplcommon.h | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 51deeef..82b6b28 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,11 @@ | |||
1 | 2009-04-01 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-04-01 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/llmedia/llmediaimplcommon.cpp: | ||
4 | Added LLMediaImplCommon::setDebugLevel(). | ||
5 | * linden/indra/llmedia/llmediaimplcommon.h: | ||
6 | Ditto. | ||
7 | |||
8 | |||
3 | * linden/indra/llmedia/llmediabase.h: | 9 | * linden/indra/llmedia/llmediabase.h: |
4 | Added LLMediaBase::EDebugLevel and setDebugLevel prototype. | 10 | Added LLMediaBase::EDebugLevel and setDebugLevel prototype. |
5 | 11 | ||
diff --git a/linden/indra/llmedia/llmediaimplcommon.cpp b/linden/indra/llmedia/llmediaimplcommon.cpp index abb61e1..48b3973 100644 --- a/linden/indra/llmedia/llmediaimplcommon.cpp +++ b/linden/indra/llmedia/llmediaimplcommon.cpp | |||
@@ -66,7 +66,8 @@ LLMediaImplCommon::LLMediaImplCommon() : | |||
66 | mCommand( LLMediaBase::COMMAND_NONE ), | 66 | mCommand( LLMediaBase::COMMAND_NONE ), |
67 | mStatus( LLMediaBase::STATUS_UNKNOWN ), | 67 | mStatus( LLMediaBase::STATUS_UNKNOWN ), |
68 | mVolume( 0 ), | 68 | mVolume( 0 ), |
69 | mLooping( false ) | 69 | mLooping( false ), |
70 | mDebugLevel( LLMediaBase::DEBUG_LEVEL_NONE ) | ||
70 | { | 71 | { |
71 | } | 72 | } |
72 | 73 | ||
@@ -92,6 +93,15 @@ bool LLMediaImplCommon::reset() | |||
92 | 93 | ||
93 | //////////////////////////////////////////////////////////////////////////////// | 94 | //////////////////////////////////////////////////////////////////////////////// |
94 | // virtual (derives from LLMediaBase) | 95 | // virtual (derives from LLMediaBase) |
96 | bool LLMediaImplCommon::setDebugLevel( LLMediaBase::EDebugLevel level ) | ||
97 | { | ||
98 | mDebugLevel = level; | ||
99 | |||
100 | return true; | ||
101 | } | ||
102 | |||
103 | //////////////////////////////////////////////////////////////////////////////// | ||
104 | // virtual (derives from LLMediaBase) | ||
95 | bool LLMediaImplCommon::setMimeType( const std::string mime_type ) | 105 | bool LLMediaImplCommon::setMimeType( const std::string mime_type ) |
96 | { | 106 | { |
97 | mMimeType = mime_type; | 107 | mMimeType = mime_type; |
diff --git a/linden/indra/llmedia/llmediaimplcommon.h b/linden/indra/llmedia/llmediaimplcommon.h index aa6c4d5..8a726f1 100644 --- a/linden/indra/llmedia/llmediaimplcommon.h +++ b/linden/indra/llmedia/llmediaimplcommon.h | |||
@@ -54,6 +54,7 @@ class LLMediaImplCommon : | |||
54 | // housekeeping | 54 | // housekeeping |
55 | virtual bool init(); | 55 | virtual bool init(); |
56 | virtual bool reset(); | 56 | virtual bool reset(); |
57 | virtual bool setDebugLevel( LLMediaBase::EDebugLevel level ); | ||
57 | virtual bool setMimeType( const std::string url ); | 58 | virtual bool setMimeType( const std::string url ); |
58 | virtual std::string getMimeType() const; | 59 | virtual std::string getMimeType() const; |
59 | virtual std::string getMediaURL() const; | 60 | virtual std::string getMediaURL() const; |
@@ -156,6 +157,7 @@ class LLMediaImplCommon : | |||
156 | LLMediaBase::ECommand mCommand; | 157 | LLMediaBase::ECommand mCommand; |
157 | LLMediaBase::EStatus mStatus; | 158 | LLMediaBase::EStatus mStatus; |
158 | bool mLooping; | 159 | bool mLooping; |
160 | LLMediaBase::EDebugLevel mDebugLevel; | ||
159 | }; | 161 | }; |
160 | 162 | ||
161 | #endif // LLMEDIAIMPLCOMMON_H | 163 | #endif // LLMEDIAIMPLCOMMON_H |