diff options
author | unknown | 2009-01-06 01:45:09 -0700 |
---|---|---|
committer | unknown | 2009-01-06 01:45:09 -0700 |
commit | 9365711ee188a28ef52ed6fd8c07811bb725b7d2 (patch) | |
tree | f74777c7a7c4049ccb3e483a5dbf14e954730e79 /linden/indra/llmedia/llmediamanager.cpp | |
parent | changed test version back to alpha (diff) | |
download | meta-impy-9365711ee188a28ef52ed6fd8c07811bb725b7d2.zip meta-impy-9365711ee188a28ef52ed6fd8c07811bb725b7d2.tar.gz meta-impy-9365711ee188a28ef52ed6fd8c07811bb725b7d2.tar.bz2 meta-impy-9365711ee188a28ef52ed6fd8c07811bb725b7d2.tar.xz |
Streaming music/video now works on Windows.
Diffstat (limited to 'linden/indra/llmedia/llmediamanager.cpp')
-rw-r--r-- | linden/indra/llmedia/llmediamanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp index 57256e6..5394b62 100644 --- a/linden/indra/llmedia/llmediamanager.cpp +++ b/linden/indra/llmedia/llmediamanager.cpp | |||
@@ -90,10 +90,10 @@ void LLMediaManager::initClass( LLMediaManagerData* init_data ) | |||
90 | LLMediaImplQuickTime::startup( init_data ); | 90 | LLMediaImplQuickTime::startup( init_data ); |
91 | #endif // LL_QUICKTIME_ENABLED | 91 | #endif // LL_QUICKTIME_ENABLED |
92 | 92 | ||
93 | #if LL_GSTREAMER_ENABLED | 93 | ///#if LL_GSTREAMER_ENABLED |
94 | LL_DEBUGS("MediaManager") << "LLMediaManager::initClass: starting gstreamer" << LL_ENDL; | 94 | LL_DEBUGS("MediaManager") << "LLMediaManager::initClass: starting gstreamer" << LL_ENDL; |
95 | LLMediaImplGStreamer::startup( init_data ); | 95 | LLMediaImplGStreamer::startup( init_data ); |
96 | #endif // LL_GSTREAMER_ENABLED | 96 | ///#endif // LL_GSTREAMER_ENABLED |
97 | } | 97 | } |
98 | 98 | ||
99 | //////////////////////////////////////////////////////////////////////////////// | 99 | //////////////////////////////////////////////////////////////////////////////// |
@@ -133,9 +133,9 @@ void LLMediaManager::cleanupClass() | |||
133 | LLMediaImplQuickTime::closedown(); | 133 | LLMediaImplQuickTime::closedown(); |
134 | #endif // LL_QUICKTIME_ENABLED | 134 | #endif // LL_QUICKTIME_ENABLED |
135 | 135 | ||
136 | #if LL_GSTREAMER_ENABLED | 136 | ///#if LL_GSTREAMER_ENABLED |
137 | LLMediaImplGStreamer::closedown(); | 137 | LLMediaImplGStreamer::closedown(); |
138 | #endif // LL_QUICKTIME_ENABLED | 138 | ///#endif // LL_QUICKTIME_ENABLED |
139 | 139 | ||
140 | if ( sInstance ) | 140 | if ( sInstance ) |
141 | delete sInstance; | 141 | delete sInstance; |