aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediaimplgstreamer.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-03-08 23:50:56 -0500
committerJacek Antonelli2009-03-08 23:50:56 -0500
commit1ca12fe0e8ddf29538d8c0462a337e99395db8d9 (patch)
treee2784b098d066614951771fe3cb561a4e1aa1aa7 /linden/indra/llmedia/llmediaimplgstreamer.cpp
parentTweaked GStreamer.cmake to work on Mac (diff)
downloadmeta-impy-1ca12fe0e8ddf29538d8c0462a337e99395db8d9.zip
meta-impy-1ca12fe0e8ddf29538d8c0462a337e99395db8d9.tar.gz
meta-impy-1ca12fe0e8ddf29538d8c0462a337e99395db8d9.tar.bz2
meta-impy-1ca12fe0e8ddf29538d8c0462a337e99395db8d9.tar.xz
Load the proper gstreamer lib type (dylib) on Mac
Diffstat (limited to '')
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 30706f1..cd6c91b 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -166,19 +166,26 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
166 g_type_init(); 166 g_type_init();
167 167
168 // Get symbols! 168 // Get symbols!
169 if (
169#if LL_WINDOWS 170#if LL_WINDOWS
170 if (! grab_gst_syms("libgstreamer-0.10.dll", "libgstvideo-0.10.dll", "libgstaudio-0.10.dll") ) 171 ! grab_gst_syms("libgstreamer-0.10.dll",
171 { 172 "libgstvideo-0.10.dll",
172 LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL; 173 "libgstaudio-0.10.dll")
173 return false; 174#elif LL_DARWIN
174 } 175 ! grab_gst_syms("libgstreamer-0.10.dylib",
176 "libgstvideo-0.10.dylib",
177 "libgstaudio-0.10.dylib")
175#else 178#else
176 if (! grab_gst_syms("libgstreamer-0.10.so.0", "libgstvideo-0.10.so.0", "libgstaudio-0.10.so.0") ) 179 ! grab_gst_syms("libgstreamer-0.10.so.0",
180 "libgstvideo-0.10.so.0",
181 "libgstaudio-0.10.so.0")
182#endif
183 )
177 { 184 {
178 LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL; 185 LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL;
179 return false; 186 return false;
180 } 187 }
181#endif 188
182 if (llgst_segtrap_set_enabled) 189 if (llgst_segtrap_set_enabled)
183 llgst_segtrap_set_enabled(FALSE); 190 llgst_segtrap_set_enabled(FALSE);
184 else 191 else