aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llmedia
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/llmedia/CMakeLists.txt94
-rw-r--r--linden/indra/llmedia/files.lst11
-rw-r--r--linden/indra/llmedia/llmedia.vcproj245
-rw-r--r--linden/indra/llmedia/llmedia_vc8.vcproj323
-rw-r--r--linden/indra/llmedia/llmedia_vc9.vcproj326
-rw-r--r--linden/indra/llmedia/llmediabase.h19
-rw-r--r--linden/indra/llmedia/llmediaimplexample1.cpp2
-rw-r--r--linden/indra/llmedia/llmediaimplexample2.cpp2
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp30
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.h12
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer_syms.cpp4
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc1
-rw-r--r--linden/indra/llmedia/llmediamanager.cpp23
-rw-r--r--linden/indra/llmedia/llmediamanager.h4
14 files changed, 157 insertions, 939 deletions
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
new file mode 100644
index 0000000..8ef8006
--- /dev/null
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -0,0 +1,94 @@
1# -*- cmake -*-
2
3project(llmedia)
4
5include(00-Common)
6include(LLAudio)
7include(LLCommon)
8include(LLImage)
9include(LLMath)
10include(LLMedia)
11include(LLMessage)
12include(LLWindow)
13include(Mozlib)
14
15include_directories(
16 ${GSTREAMER_INCLUDE_DIRS}
17 ${GSTREAMER_PLUGINS_BASE_INCLUDE_DIRS}
18 ${LLAUDIO_INCLUDE_DIRS}
19 ${LLCOMMON_INCLUDE_DIRS}
20 ${LLIMAGE_INCLUDE_DIRS}
21 ${LLMATH_INCLUDE_DIRS}
22 ${LLMESSAGE_INCLUDE_DIRS}
23 ${LLWINDOW_INCLUDE_DIRS}
24 )
25
26set(llmedia_SOURCE_FILES
27 llmediaimplcommon.cpp
28 llmediaimplexample1.cpp
29 llmediaimplexample2.cpp
30 llmediaimplfactory.cpp
31 llmediamanager.cpp
32 )
33
34set(llmedia_HEADER_FILES
35 CMakeLists.txt
36
37 llmediabase.h
38 llmediaemitter.h
39 llmediaimplcommon.h
40 llmediaimplexample1.h
41 llmediaimplexample2.h
42 llmediaimplfactory.h
43 llmediaimplregister.h
44 llmediamanager.h
45 llmediaobserver.h
46 )
47
48if (GSTREAMER)
49 list(APPEND llmedia_SOURCE_FILES
50 llmediaimplgstreamer.cpp
51 llmediaimplgstreamer_syms.cpp
52 llmediaimplgstreamervidplug.cpp
53 )
54
55 list(APPEND llmedia_HEADER_FILES
56 llmediaimplgstreamer.h
57 llmediaimplgstreamervidplug.h
58 llmediaimplgstreamer_syms.h
59 )
60
61 # Work around a bad interaction between broken gstreamer headers and
62 # g++ 4.3's increased strictness.
63
64 if (${CXX_VERSION} MATCHES "4.[23]")
65 set_source_files_properties(llmediaimplgstreamervidplug.cpp PROPERTIES
66 COMPILE_FLAGS -Wno-error=write-strings)
67 endif (${CXX_VERSION} MATCHES "4.[23]")
68endif (GSTREAMER)
69
70if (MOZLIB)
71 list(APPEND llmedia_SOURCE_FILES llmediaimplllmozlib.cpp)
72
73 list(APPEND llmedia_HEADER_FILES llmediaimplllmozlib.h)
74endif (MOZLIB)
75
76if (QUICKTIME)
77 list(APPEND llmedia_SOURCE_FILES llmediaimplquicktime.cpp)
78 list(APPEND llmedia_HEADER_FILES llmediaimplquicktime.h)
79
80 # We use a bunch of deprecated system APIs.
81 if (DARWIN)
82 set_source_files_properties(
83 llmediaimplquicktime.cpp PROPERTIES
84 COMPILE_FLAGS -Wno-deprecated-declarations
85 )
86 endif (DARWIN)
87endif (QUICKTIME)
88
89set_source_files_properties(${llmedia_HEADER_FILES}
90 PROPERTIES HEADER_FILE_ONLY TRUE)
91
92list(APPEND llmedia_SOURCE_FILES ${llmedia_HEADER_FILES})
93
94add_library (llmedia ${llmedia_SOURCE_FILES})
diff --git a/linden/indra/llmedia/files.lst b/linden/indra/llmedia/files.lst
deleted file mode 100644
index 3ce18e5..0000000
--- a/linden/indra/llmedia/files.lst
+++ /dev/null
@@ -1,11 +0,0 @@
1llmedia/llmediaimplcommon.cpp
2llmedia/llmediaimplexample1.cpp
3llmedia/llmediaimplexample2.cpp
4llmedia/llmediaimplfactory.cpp
5llmedia/llmediaimplgstreamer.cpp
6llmedia/llmediaimplgstreamer_syms.cpp
7llmedia/llmediaimplgstreamervidplug.cpp
8llmedia/llmediaimplllmozlib.cpp
9llmedia/llmediaimplquicktime.cpp
10llmedia/llmediamanager.cpp
11
diff --git a/linden/indra/llmedia/llmedia.vcproj b/linden/indra/llmedia/llmedia.vcproj
deleted file mode 100644
index 38c53f0..0000000
--- a/linden/indra/llmedia/llmedia.vcproj
+++ /dev/null
@@ -1,245 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="7.10"
5 Name="llmedia"
6 ProjectGUID="{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
7 RootNamespace="llmedia"
8 Keyword="Win32Proj">
9 <Platforms>
10 <Platform
11 Name="Win32"/>
12 </Platforms>
13 <Configurations>
14 <Configuration
15 Name="Debug|Win32"
16 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
17 IntermediateDirectory="Debug"
18 ConfigurationType="4"
19 CharacterSet="1">
20 <Tool
21 Name="VCCLCompilerTool"
22 Optimization="0"
23 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
24 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;XP_WIN;XP_WIN32"
25 MinimalRebuild="TRUE"
26 BasicRuntimeChecks="3"
27 RuntimeLibrary="1"
28 StructMemberAlignment="4"
29 ForceConformanceInForLoopScope="TRUE"
30 UsePrecompiledHeader="0"
31 WarningLevel="3"
32 WarnAsError="TRUE"
33 Detect64BitPortabilityProblems="FALSE"
34 DebugInformationFormat="4"
35 DisableSpecificWarnings="4702"/>
36 <Tool
37 Name="VCCustomBuildTool"/>
38 <Tool
39 Name="VCLibrarianTool"
40 AdditionalOptions="/IGNORE:4006"
41 AdditionalDependencies="qtmlclient.lib llmozlib2d.lib"
42 OutputFile="$(OutDir)/llmedia.lib"
43 AdditionalLibraryDirectories="&quot;..\..\libraries\i686-win32\lib_debug&quot;"/>
44 <Tool
45 Name="VCMIDLTool"/>
46 <Tool
47 Name="VCPostBuildEventTool"/>
48 <Tool
49 Name="VCPreBuildEventTool"/>
50 <Tool
51 Name="VCPreLinkEventTool"/>
52 <Tool
53 Name="VCResourceCompilerTool"/>
54 <Tool
55 Name="VCWebServiceProxyGeneratorTool"/>
56 <Tool
57 Name="VCXMLDataGeneratorTool"/>
58 <Tool
59 Name="VCManagedWrapperGeneratorTool"/>
60 <Tool
61 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
62 </Configuration>
63 <Configuration
64 Name="Release|Win32"
65 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
66 IntermediateDirectory="Release"
67 ConfigurationType="4"
68 CharacterSet="1">
69 <Tool
70 Name="VCCLCompilerTool"
71 GlobalOptimizations="FALSE"
72 InlineFunctionExpansion="0"
73 EnableIntrinsicFunctions="FALSE"
74 OptimizeForProcessor="0"
75 OptimizeForWindowsApplication="FALSE"
76 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
77 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
78 RuntimeLibrary="0"
79 StructMemberAlignment="0"
80 ForceConformanceInForLoopScope="TRUE"
81 UsePrecompiledHeader="0"
82 WarningLevel="3"
83 WarnAsError="FALSE"
84 Detect64BitPortabilityProblems="FALSE"
85 DebugInformationFormat="3"
86 DisableSpecificWarnings="4702"/>
87 <Tool
88 Name="VCCustomBuildTool"/>
89 <Tool
90 Name="VCLibrarianTool"
91 AdditionalOptions="/IGNORE:4006"
92 AdditionalDependencies="qtmlclient.lib llmozlib2.lib"
93 OutputFile="$(OutDir)/llmedia.lib"
94 AdditionalLibraryDirectories="&quot;..\..\libraries\i686-win32\lib_release&quot;"
95 IgnoreAllDefaultLibraries="FALSE"
96 IgnoreDefaultLibraryNames=""/>
97 <Tool
98 Name="VCMIDLTool"/>
99 <Tool
100 Name="VCPostBuildEventTool"/>
101 <Tool
102 Name="VCPreBuildEventTool"/>
103 <Tool
104 Name="VCPreLinkEventTool"/>
105 <Tool
106 Name="VCResourceCompilerTool"/>
107 <Tool
108 Name="VCWebServiceProxyGeneratorTool"/>
109 <Tool
110 Name="VCXMLDataGeneratorTool"/>
111 <Tool
112 Name="VCManagedWrapperGeneratorTool"/>
113 <Tool
114 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
115 </Configuration>
116 <Configuration
117 Name="ReleaseNoOpt|Win32"
118 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
119 IntermediateDirectory="$(ConfigurationName)"
120 ConfigurationType="4"
121 CharacterSet="1">
122 <Tool
123 Name="VCCLCompilerTool"
124 Optimization="0"
125 GlobalOptimizations="FALSE"
126 InlineFunctionExpansion="0"
127 EnableIntrinsicFunctions="FALSE"
128 OptimizeForProcessor="0"
129 OptimizeForWindowsApplication="FALSE"
130 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
131 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
132 RuntimeLibrary="0"
133 StructMemberAlignment="0"
134 ForceConformanceInForLoopScope="TRUE"
135 UsePrecompiledHeader="0"
136 WarningLevel="3"
137 WarnAsError="TRUE"
138 Detect64BitPortabilityProblems="FALSE"
139 DebugInformationFormat="3"
140 DisableSpecificWarnings="4702"/>
141 <Tool
142 Name="VCCustomBuildTool"/>
143 <Tool
144 Name="VCLibrarianTool"
145 AdditionalOptions="/IGNORE:4006"
146 AdditionalDependencies="qtmlclient.lib llmozlib2.lib"
147 OutputFile="$(OutDir)/llmedia.lib"
148 AdditionalLibraryDirectories="&quot;..\..\libraries\i686-win32\lib_release&quot;"
149 IgnoreAllDefaultLibraries="FALSE"
150 IgnoreDefaultLibraryNames=""/>
151 <Tool
152 Name="VCMIDLTool"/>
153 <Tool
154 Name="VCPostBuildEventTool"/>
155 <Tool
156 Name="VCPreBuildEventTool"/>
157 <Tool
158 Name="VCPreLinkEventTool"/>
159 <Tool
160 Name="VCResourceCompilerTool"/>
161 <Tool
162 Name="VCWebServiceProxyGeneratorTool"/>
163 <Tool
164 Name="VCXMLDataGeneratorTool"/>
165 <Tool
166 Name="VCManagedWrapperGeneratorTool"/>
167 <Tool
168 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
169 </Configuration>
170 </Configurations>
171 <References>
172 </References>
173 <Files>
174 <Filter
175 Name="Source Files"
176 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
177 UniqueIdentifier="{44DBC47A-0AF0-4726-A094-2D6FBB65FFFA}">
178 <File
179 RelativePath=".\llmediaimplfactory.cpp">
180 </File>
181 <File
182 RelativePath=".\llmediamanager.cpp">
183 </File>
184 </Filter>
185 <Filter
186 Name="Header Files"
187 Filter="h;hpp;hxx;hm;inl;inc;xsd"
188 UniqueIdentifier="{D188664C-B9B7-4982-8C4B-8D9A44B4D9EF}">
189 <File
190 RelativePath=".\llmediabase.h">
191 </File>
192 <File
193 RelativePath=".\llmediaemitter.h">
194 </File>
195 <File
196 RelativePath=".\llmediaimplfactory.h">
197 </File>
198 <File
199 RelativePath=".\llmediaimplregister.h">
200 </File>
201 <File
202 RelativePath=".\llmediamanager.h">
203 </File>
204 <File
205 RelativePath=".\llmediaobserver.h">
206 </File>
207 </Filter>
208 <Filter
209 Name="impls"
210 Filter="">
211 <File
212 RelativePath=".\llmediaimplcommon.cpp">
213 </File>
214 <File
215 RelativePath=".\llmediaimplcommon.h">
216 </File>
217 <File
218 RelativePath=".\llmediaimplexample1.cpp">
219 </File>
220 <File
221 RelativePath=".\llmediaimplexample1.h">
222 </File>
223 <File
224 RelativePath=".\llmediaimplexample2.cpp">
225 </File>
226 <File
227 RelativePath=".\llmediaimplexample2.h">
228 </File>
229 <File
230 RelativePath=".\llmediaimplllmozlib.cpp">
231 </File>
232 <File
233 RelativePath=".\llmediaimplllmozlib.h">
234 </File>
235 <File
236 RelativePath=".\llmediaimplquicktime.cpp">
237 </File>
238 <File
239 RelativePath=".\llmediaimplquicktime.h">
240 </File>
241 </Filter>
242 </Files>
243 <Globals>
244 </Globals>
245</VisualStudioProject>
diff --git a/linden/indra/llmedia/llmedia_vc8.vcproj b/linden/indra/llmedia/llmedia_vc8.vcproj
deleted file mode 100644
index 4681a6c..0000000
--- a/linden/indra/llmedia/llmedia_vc8.vcproj
+++ /dev/null
@@ -1,323 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="8.00"
5 Name="llmedia"
6 ProjectGUID="{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
7 RootNamespace="llmedia"
8 Keyword="Win32Proj"
9 >
10 <Platforms>
11 <Platform
12 Name="Win32"
13 />
14 </Platforms>
15 <ToolFiles>
16 </ToolFiles>
17 <Configurations>
18 <Configuration
19 Name="Debug|Win32"
20 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
21 IntermediateDirectory="Debug"
22 ConfigurationType="4"
23 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
24 CharacterSet="1"
25 >
26 <Tool
27 Name="VCPreBuildEventTool"
28 />
29 <Tool
30 Name="VCCustomBuildTool"
31 />
32 <Tool
33 Name="VCXMLDataGeneratorTool"
34 />
35 <Tool
36 Name="VCWebServiceProxyGeneratorTool"
37 />
38 <Tool
39 Name="VCMIDLTool"
40 />
41 <Tool
42 Name="VCCLCompilerTool"
43 Optimization="0"
44 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
45 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;XP_WIN;XP_WIN32"
46 MinimalRebuild="true"
47 BasicRuntimeChecks="3"
48 RuntimeLibrary="1"
49 StructMemberAlignment="4"
50 TreatWChar_tAsBuiltInType="false"
51 ForceConformanceInForLoopScope="true"
52 UsePrecompiledHeader="0"
53 WarningLevel="3"
54 WarnAsError="true"
55 Detect64BitPortabilityProblems="false"
56 DebugInformationFormat="4"
57 DisableSpecificWarnings="4702"
58 />
59 <Tool
60 Name="VCManagedResourceCompilerTool"
61 />
62 <Tool
63 Name="VCResourceCompilerTool"
64 />
65 <Tool
66 Name="VCPreLinkEventTool"
67 />
68 <Tool
69 Name="VCLibrarianTool"
70 OutputFile="$(OutDir)/llmedia.lib"
71 AdditionalLibraryDirectories=""
72 IgnoreAllDefaultLibraries="false"
73 IgnoreDefaultLibraryNames=""
74 />
75 <Tool
76 Name="VCALinkTool"
77 />
78 <Tool
79 Name="VCXDCMakeTool"
80 />
81 <Tool
82 Name="VCBscMakeTool"
83 />
84 <Tool
85 Name="VCFxCopTool"
86 />
87 <Tool
88 Name="VCPostBuildEventTool"
89 />
90 </Configuration>
91 <Configuration
92 Name="Release|Win32"
93 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
94 IntermediateDirectory="Release"
95 ConfigurationType="4"
96 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
97 CharacterSet="1"
98 >
99 <Tool
100 Name="VCPreBuildEventTool"
101 />
102 <Tool
103 Name="VCCustomBuildTool"
104 />
105 <Tool
106 Name="VCXMLDataGeneratorTool"
107 />
108 <Tool
109 Name="VCWebServiceProxyGeneratorTool"
110 />
111 <Tool
112 Name="VCMIDLTool"
113 />
114 <Tool
115 Name="VCCLCompilerTool"
116 InlineFunctionExpansion="0"
117 EnableIntrinsicFunctions="false"
118 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
119 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
120 RuntimeLibrary="0"
121 StructMemberAlignment="0"
122 TreatWChar_tAsBuiltInType="false"
123 ForceConformanceInForLoopScope="true"
124 UsePrecompiledHeader="0"
125 WarningLevel="3"
126 WarnAsError="false"
127 Detect64BitPortabilityProblems="false"
128 DebugInformationFormat="3"
129 DisableSpecificWarnings="4702"
130 />
131 <Tool
132 Name="VCManagedResourceCompilerTool"
133 />
134 <Tool
135 Name="VCResourceCompilerTool"
136 />
137 <Tool
138 Name="VCPreLinkEventTool"
139 />
140 <Tool
141 Name="VCLibrarianTool"
142 OutputFile="$(OutDir)/llmedia.lib"
143 AdditionalLibraryDirectories=""
144 IgnoreAllDefaultLibraries="false"
145 IgnoreDefaultLibraryNames=""
146 />
147 <Tool
148 Name="VCALinkTool"
149 />
150 <Tool
151 Name="VCXDCMakeTool"
152 />
153 <Tool
154 Name="VCBscMakeTool"
155 />
156 <Tool
157 Name="VCFxCopTool"
158 />
159 <Tool
160 Name="VCPostBuildEventTool"
161 />
162 </Configuration>
163 <Configuration
164 Name="ReleaseNoOpt|Win32"
165 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
166 IntermediateDirectory="$(ConfigurationName)"
167 ConfigurationType="4"
168 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
169 CharacterSet="1"
170 >
171 <Tool
172 Name="VCPreBuildEventTool"
173 />
174 <Tool
175 Name="VCCustomBuildTool"
176 />
177 <Tool
178 Name="VCXMLDataGeneratorTool"
179 />
180 <Tool
181 Name="VCWebServiceProxyGeneratorTool"
182 />
183 <Tool
184 Name="VCMIDLTool"
185 />
186 <Tool
187 Name="VCCLCompilerTool"
188 Optimization="0"
189 InlineFunctionExpansion="0"
190 EnableIntrinsicFunctions="false"
191 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
192 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
193 RuntimeLibrary="0"
194 StructMemberAlignment="0"
195 TreatWChar_tAsBuiltInType="false"
196 ForceConformanceInForLoopScope="true"
197 UsePrecompiledHeader="0"
198 WarningLevel="3"
199 WarnAsError="true"
200 Detect64BitPortabilityProblems="false"
201 DebugInformationFormat="3"
202 DisableSpecificWarnings="4702"
203 />
204 <Tool
205 Name="VCManagedResourceCompilerTool"
206 />
207 <Tool
208 Name="VCResourceCompilerTool"
209 />
210 <Tool
211 Name="VCPreLinkEventTool"
212 />
213 <Tool
214 Name="VCLibrarianTool"
215 OutputFile="$(OutDir)/llmedia.lib"
216 AdditionalLibraryDirectories=""
217 IgnoreAllDefaultLibraries="false"
218 IgnoreDefaultLibraryNames=""
219 />
220 <Tool
221 Name="VCALinkTool"
222 />
223 <Tool
224 Name="VCXDCMakeTool"
225 />
226 <Tool
227 Name="VCBscMakeTool"
228 />
229 <Tool
230 Name="VCFxCopTool"
231 />
232 <Tool
233 Name="VCPostBuildEventTool"
234 />
235 </Configuration>
236 </Configurations>
237 <References>
238 </References>
239 <Files>
240 <Filter
241 Name="Source Files"
242 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
243 UniqueIdentifier="{44DBC47A-0AF0-4726-A094-2D6FBB65FFFA}"
244 >
245 <File
246 RelativePath=".\llmediaimplcommon.cpp"
247 >
248 </File>
249 <File
250 RelativePath=".\llmediaimplexample1.cpp"
251 >
252 </File>
253 <File
254 RelativePath=".\llmediaimplexample2.cpp"
255 >
256 </File>
257 <File
258 RelativePath=".\llmediaimplfactory.cpp"
259 >
260 </File>
261 <File
262 RelativePath=".\llmediaimplllmozlib.cpp"
263 >
264 </File>
265 <File
266 RelativePath=".\llmediaimplquicktime.cpp"
267 >
268 </File>
269 <File
270 RelativePath=".\llmediamanager.cpp"
271 >
272 </File>
273 </Filter>
274 <Filter
275 Name="Header Files"
276 Filter="h;hpp;hxx;hm;inl;inc;xsd"
277 UniqueIdentifier="{D188664C-B9B7-4982-8C4B-8D9A44B4D9EF}"
278 >
279 <File
280 RelativePath=".\llmediaemitter.h"
281 >
282 </File>
283 <File
284 RelativePath=".\llmediaimplcommon.h"
285 >
286 </File>
287 <File
288 RelativePath=".\llmediaimplexample1.h"
289 >
290 </File>
291 <File
292 RelativePath=".\llmediaimplexample2.h"
293 >
294 </File>
295 <File
296 RelativePath=".\llmediaimplfactory.h"
297 >
298 </File>
299 <File
300 RelativePath=".\llmediaimplllmozlib.h"
301 >
302 </File>
303 <File
304 RelativePath=".\llmediaimplquicktime.h"
305 >
306 </File>
307 <File
308 RelativePath=".\llmediaimplregister.h"
309 >
310 </File>
311 <File
312 RelativePath=".\llmediamanager.h"
313 >
314 </File>
315 <File
316 RelativePath=".\llmediaobserver.h"
317 >
318 </File>
319 </Filter>
320 </Files>
321 <Globals>
322 </Globals>
323</VisualStudioProject>
diff --git a/linden/indra/llmedia/llmedia_vc9.vcproj b/linden/indra/llmedia/llmedia_vc9.vcproj
deleted file mode 100644
index d032711..0000000
--- a/linden/indra/llmedia/llmedia_vc9.vcproj
+++ /dev/null
@@ -1,326 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9.00"
5 Name="llmedia"
6 ProjectGUID="{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
7 RootNamespace="llmedia"
8 Keyword="Win32Proj"
9 TargetFrameworkVersion="131072"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 </Platforms>
16 <ToolFiles>
17 </ToolFiles>
18 <Configurations>
19 <Configuration
20 Name="Debug|Win32"
21 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
22 IntermediateDirectory="Debug"
23 ConfigurationType="4"
24 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
25 CharacterSet="1"
26 >
27 <Tool
28 Name="VCPreBuildEventTool"
29 />
30 <Tool
31 Name="VCCustomBuildTool"
32 />
33 <Tool
34 Name="VCXMLDataGeneratorTool"
35 />
36 <Tool
37 Name="VCWebServiceProxyGeneratorTool"
38 />
39 <Tool
40 Name="VCMIDLTool"
41 />
42 <Tool
43 Name="VCCLCompilerTool"
44 Optimization="0"
45 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
46 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;XP_WIN;XP_WIN32"
47 MinimalRebuild="true"
48 BasicRuntimeChecks="3"
49 RuntimeLibrary="1"
50 StructMemberAlignment="4"
51 TreatWChar_tAsBuiltInType="false"
52 ForceConformanceInForLoopScope="true"
53 UsePrecompiledHeader="0"
54 WarningLevel="3"
55 WarnAsError="true"
56 Detect64BitPortabilityProblems="false"
57 DebugInformationFormat="4"
58 DisableSpecificWarnings="4702"
59 />
60 <Tool
61 Name="VCManagedResourceCompilerTool"
62 />
63 <Tool
64 Name="VCResourceCompilerTool"
65 />
66 <Tool
67 Name="VCPreLinkEventTool"
68 />
69 <Tool
70 Name="VCLibrarianTool"
71 OutputFile="$(OutDir)/llmedia.lib"
72 AdditionalLibraryDirectories=""
73 IgnoreAllDefaultLibraries="false"
74 IgnoreDefaultLibraryNames=""
75 />
76 <Tool
77 Name="VCALinkTool"
78 />
79 <Tool
80 Name="VCXDCMakeTool"
81 />
82 <Tool
83 Name="VCBscMakeTool"
84 />
85 <Tool
86 Name="VCFxCopTool"
87 />
88 <Tool
89 Name="VCPostBuildEventTool"
90 />
91 </Configuration>
92 <Configuration
93 Name="Release|Win32"
94 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
95 IntermediateDirectory="Release"
96 ConfigurationType="4"
97 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
98 CharacterSet="1"
99 >
100 <Tool
101 Name="VCPreBuildEventTool"
102 />
103 <Tool
104 Name="VCCustomBuildTool"
105 />
106 <Tool
107 Name="VCXMLDataGeneratorTool"
108 />
109 <Tool
110 Name="VCWebServiceProxyGeneratorTool"
111 />
112 <Tool
113 Name="VCMIDLTool"
114 />
115 <Tool
116 Name="VCCLCompilerTool"
117 AdditionalOptions="/Oy-"
118 InlineFunctionExpansion="0"
119 EnableIntrinsicFunctions="false"
120 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
121 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
122 RuntimeLibrary="0"
123 StructMemberAlignment="0"
124 TreatWChar_tAsBuiltInType="false"
125 ForceConformanceInForLoopScope="true"
126 UsePrecompiledHeader="0"
127 WarningLevel="3"
128 WarnAsError="false"
129 Detect64BitPortabilityProblems="false"
130 DebugInformationFormat="3"
131 DisableSpecificWarnings="4702"
132 />
133 <Tool
134 Name="VCManagedResourceCompilerTool"
135 />
136 <Tool
137 Name="VCResourceCompilerTool"
138 />
139 <Tool
140 Name="VCPreLinkEventTool"
141 />
142 <Tool
143 Name="VCLibrarianTool"
144 OutputFile="$(OutDir)/llmedia.lib"
145 AdditionalLibraryDirectories=""
146 IgnoreAllDefaultLibraries="false"
147 IgnoreDefaultLibraryNames=""
148 />
149 <Tool
150 Name="VCALinkTool"
151 />
152 <Tool
153 Name="VCXDCMakeTool"
154 />
155 <Tool
156 Name="VCBscMakeTool"
157 />
158 <Tool
159 Name="VCFxCopTool"
160 />
161 <Tool
162 Name="VCPostBuildEventTool"
163 />
164 </Configuration>
165 <Configuration
166 Name="ReleaseNoOpt|Win32"
167 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
168 IntermediateDirectory="$(ConfigurationName)"
169 ConfigurationType="4"
170 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
171 CharacterSet="1"
172 >
173 <Tool
174 Name="VCPreBuildEventTool"
175 />
176 <Tool
177 Name="VCCustomBuildTool"
178 />
179 <Tool
180 Name="VCXMLDataGeneratorTool"
181 />
182 <Tool
183 Name="VCWebServiceProxyGeneratorTool"
184 />
185 <Tool
186 Name="VCMIDLTool"
187 />
188 <Tool
189 Name="VCCLCompilerTool"
190 AdditionalOptions="/Oy-"
191 Optimization="0"
192 InlineFunctionExpansion="0"
193 EnableIntrinsicFunctions="false"
194 AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
195 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
196 RuntimeLibrary="0"
197 StructMemberAlignment="0"
198 TreatWChar_tAsBuiltInType="false"
199 ForceConformanceInForLoopScope="true"
200 UsePrecompiledHeader="0"
201 WarningLevel="3"
202 WarnAsError="true"
203 Detect64BitPortabilityProblems="false"
204 DebugInformationFormat="3"
205 DisableSpecificWarnings="4702"
206 />
207 <Tool
208 Name="VCManagedResourceCompilerTool"
209 />
210 <Tool
211 Name="VCResourceCompilerTool"
212 />
213 <Tool
214 Name="VCPreLinkEventTool"
215 />
216 <Tool
217 Name="VCLibrarianTool"
218 OutputFile="$(OutDir)/llmedia.lib"
219 AdditionalLibraryDirectories=""
220 IgnoreAllDefaultLibraries="false"
221 IgnoreDefaultLibraryNames=""
222 />
223 <Tool
224 Name="VCALinkTool"
225 />
226 <Tool
227 Name="VCXDCMakeTool"
228 />
229 <Tool
230 Name="VCBscMakeTool"
231 />
232 <Tool
233 Name="VCFxCopTool"
234 />
235 <Tool
236 Name="VCPostBuildEventTool"
237 />
238 </Configuration>
239 </Configurations>
240 <References>
241 </References>
242 <Files>
243 <Filter
244 Name="Source Files"
245 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
246 UniqueIdentifier="{44DBC47A-0AF0-4726-A094-2D6FBB65FFFA}"
247 >
248 <File
249 RelativePath=".\llmediaimplcommon.cpp"
250 >
251 </File>
252 <File
253 RelativePath=".\llmediaimplexample1.cpp"
254 >
255 </File>
256 <File
257 RelativePath=".\llmediaimplexample2.cpp"
258 >
259 </File>
260 <File
261 RelativePath=".\llmediaimplfactory.cpp"
262 >
263 </File>
264 <File
265 RelativePath=".\llmediaimplllmozlib.cpp"
266 >
267 </File>
268 <File
269 RelativePath=".\llmediaimplquicktime.cpp"
270 >
271 </File>
272 <File
273 RelativePath=".\llmediamanager.cpp"
274 >
275 </File>
276 </Filter>
277 <Filter
278 Name="Header Files"
279 Filter="h;hpp;hxx;hm;inl;inc;xsd"
280 UniqueIdentifier="{D188664C-B9B7-4982-8C4B-8D9A44B4D9EF}"
281 >
282 <File
283 RelativePath=".\llmediaemitter.h"
284 >
285 </File>
286 <File
287 RelativePath=".\llmediaimplcommon.h"
288 >
289 </File>
290 <File
291 RelativePath=".\llmediaimplexample1.h"
292 >
293 </File>
294 <File
295 RelativePath=".\llmediaimplexample2.h"
296 >
297 </File>
298 <File
299 RelativePath=".\llmediaimplfactory.h"
300 >
301 </File>
302 <File
303 RelativePath=".\llmediaimplllmozlib.h"
304 >
305 </File>
306 <File
307 RelativePath=".\llmediaimplquicktime.h"
308 >
309 </File>
310 <File
311 RelativePath=".\llmediaimplregister.h"
312 >
313 </File>
314 <File
315 RelativePath=".\llmediamanager.h"
316 >
317 </File>
318 <File
319 RelativePath=".\llmediaobserver.h"
320 >
321 </File>
322 </Filter>
323 </Files>
324 <Globals>
325 </Globals>
326</VisualStudioProject>
diff --git a/linden/indra/llmedia/llmediabase.h b/linden/indra/llmedia/llmediabase.h
index 49c6d69..dad02ca 100644
--- a/linden/indra/llmedia/llmediabase.h
+++ b/linden/indra/llmedia/llmediabase.h
@@ -34,25 +34,6 @@
34#ifndef LLMEDIABASE_H 34#ifndef LLMEDIABASE_H
35#define LLMEDIABASE_H 35#define LLMEDIABASE_H
36 36
37// Per-OS feature switches.
38#if LL_DARWIN
39 #define LL_QUICKTIME_ENABLED 1
40 #define LL_LLMOZLIB_ENABLED 1
41#elif LL_WINDOWS
42 #define LL_QUICKTIME_ENABLED 1
43 #define LL_LLMOZLIB_ENABLED 1
44#elif LL_LINUX
45 #define LL_QUICKTIME_ENABLED 0
46 #ifndef LL_LLMOZLIB_ENABLED
47 #define LL_LLMOZLIB_ENABLED 1
48 #endif // def LL_LLMOZLIB_ENABLED
49#elif LL_SOLARIS
50 #define LL_QUICKTIME_ENABLED 0
51 #ifndef LL_LLMOZLIB_ENABLED
52 #define LL_LLMOZLIB_ENABLED 0
53 #endif // def LL_LLMOZLIB_ENABLED
54#endif
55
56#if LL_LLMOZLIB_ENABLED && !defined ( MOZILLA_INTERNAL_API ) 37#if LL_LLMOZLIB_ENABLED && !defined ( MOZILLA_INTERNAL_API )
57 // Without this, nsTAString.h errors out with: 38 // Without this, nsTAString.h errors out with:
58 // "Cannot use internal string classes without MOZILLA_INTERNAL_API defined. Use the frozen header nsStringAPI.h instead." 39 // "Cannot use internal string classes without MOZILLA_INTERNAL_API defined. Use the frozen header nsStringAPI.h instead."
diff --git a/linden/indra/llmedia/llmediaimplexample1.cpp b/linden/indra/llmedia/llmediaimplexample1.cpp
index 03e8291..977d508 100644
--- a/linden/indra/llmedia/llmediaimplexample1.cpp
+++ b/linden/indra/llmedia/llmediaimplexample1.cpp
@@ -32,6 +32,8 @@
32#include "llmediaimplexample1.h" 32#include "llmediaimplexample1.h"
33#include "llmediaimplregister.h" 33#include "llmediaimplregister.h"
34 34
35#include <cstring>
36
35// register this impl with media manager factory 37// register this impl with media manager factory
36static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() ); 38static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() );
37 39
diff --git a/linden/indra/llmedia/llmediaimplexample2.cpp b/linden/indra/llmedia/llmediaimplexample2.cpp
index dc20e03..13036f9 100644
--- a/linden/indra/llmedia/llmediaimplexample2.cpp
+++ b/linden/indra/llmedia/llmediaimplexample2.cpp
@@ -32,6 +32,8 @@
32#include "llmediaimplexample2.h" 32#include "llmediaimplexample2.h"
33#include "llmediaimplregister.h" 33#include "llmediaimplregister.h"
34 34
35#include <cstring>
36
35// register this impl with media manager factory 37// register this impl with media manager factory
36static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new LLMediaImplExample2Maker() ); 38static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new LLMediaImplExample2Maker() );
37 39
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 5bf30d9..51a5bca 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -235,10 +235,11 @@ static char* get_gst_state_name(GstState state)
235} 235}
236#endif // LL_GST_REPORT_STATE_CHANGES 236#endif // LL_GST_REPORT_STATE_CHANGES
237 237
238static gboolean 238//static
239bus_callback (GstBus *bus, 239gboolean
240 GstMessage *message, 240LLMediaImplGStreamer::bus_callback (GstBus *bus,
241 gpointer data) 241 GstMessage *message,
242 gpointer data)
242{ 243{
243 if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_STATE_CHANGED && 244 if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_STATE_CHANGED &&
244 GST_MESSAGE_TYPE(message) != GST_MESSAGE_BUFFERING) 245 GST_MESSAGE_TYPE(message) != GST_MESSAGE_BUFFERING)
@@ -612,6 +613,27 @@ getMediaData ()
612// virtual 613// virtual
613bool 614bool
614LLMediaImplGStreamer:: 615LLMediaImplGStreamer::
616seek( double time )
617{
618 bool success = false;
619 if (mPlaybin)
620 {
621 success = llgst_element_seek(mPlaybin, 1.0F, GST_FORMAT_TIME,
622 GstSeekFlags(GST_SEEK_FLAG_FLUSH |
623 GST_SEEK_FLAG_KEY_UNIT),
624 GST_SEEK_TYPE_SET, gint64(time*1000000000.0F),
625 GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
626 }
627 DEBUGMSG("MEDIA SEEK REQUEST to %fsec result was %d",
628 float(time), int(success));
629 return success;
630}
631
632
633///////////////////////////////////////////////////////////////////////////////
634// virtual
635bool
636LLMediaImplGStreamer::
615setVolume(float volume) 637setVolume(float volume)
616{ 638{
617 mVolume = volume; 639 mVolume = volume;
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
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
index c5e3c7b..e81d886 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
@@ -34,8 +34,8 @@
34extern "C" { 34extern "C" {
35#include <gst/gst.h> 35#include <gst/gst.h>
36 36
37#include <apr-1/apr_pools.h> 37#include "apr_pools.h"
38#include <apr-1/apr_dso.h> 38#include "apr_dso.h"
39} 39}
40 40
41#include "llmediaimplgstreamer.h" 41#include "llmediaimplgstreamer.h"
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
index 26cefc0..08ba6df 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
@@ -34,6 +34,7 @@ LL_GST_SYM(true, gst_structure_get_value, G_CONST_RETURN GValue *, const GstStru
34LL_GST_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value); 34LL_GST_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value);
35LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value); 35LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value);
36LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure); 36LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure);
37LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64);
37 38
38// optional symbols to grab 39// optional symbols to grab
39LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled); 40LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled);
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index 8d637c0..f72e63c 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -36,10 +36,13 @@
36#include "llmediaimplexample2.h" 36#include "llmediaimplexample2.h"
37#include "llmediaimplquicktime.h" 37#include "llmediaimplquicktime.h"
38#include "llmediaimplgstreamer.h" 38#include "llmediaimplgstreamer.h"
39#include "llmediaimplllmozlib.h" 39#if LL_LLMOZLIB_ENABLED
40# include "llmediaimplllmozlib.h"
41#endif
40 42
41LLMediaManager* LLMediaManager::sInstance = 0; 43LLMediaManager* LLMediaManager::sInstance = 0;
42 44
45
43//////////////////////////////////////////////////////////////////////////////// 46////////////////////////////////////////////////////////////////////////////////
44// (private) 47// (private)
45LLMediaManager::LLMediaManager() 48LLMediaManager::LLMediaManager()
@@ -52,6 +55,20 @@ LLMediaManager::~LLMediaManager()
52} 55}
53 56
54//////////////////////////////////////////////////////////////////////////////// 57////////////////////////////////////////////////////////////////////////////////
58// Early initialization for web browser for the viewer, so we can show
59// the login screen and defer initialization of QuickTime, etc. JC
60// (static)
61void LLMediaManager::initBrowser( LLMediaManagerData* init_data )
62{
63 if ( ! sInstance )
64 sInstance = new LLMediaManager();
65
66#if LL_LLMOZLIB_ENABLED
67 LLMediaImplLLMozLib::startup( init_data );
68#endif // LL_LLMOZLIB_ENABLED
69}
70
71////////////////////////////////////////////////////////////////////////////////
55// (static) 72// (static)
56void LLMediaManager::initClass( LLMediaManagerData* init_data ) 73void LLMediaManager::initClass( LLMediaManagerData* init_data )
57{ 74{
@@ -73,10 +90,6 @@ void LLMediaManager::initClass( LLMediaManagerData* init_data )
73#if LL_GSTREAMER_ENABLED 90#if LL_GSTREAMER_ENABLED
74 LLMediaImplGStreamer::startup( init_data ); 91 LLMediaImplGStreamer::startup( init_data );
75#endif // LL_GSTREAMER_ENABLED 92#endif // LL_GSTREAMER_ENABLED
76
77#if LL_LLMOZLIB_ENABLED
78 LLMediaImplLLMozLib::startup( init_data );
79#endif // LL_LLMOZLIB_ENABLED
80} 93}
81 94
82//////////////////////////////////////////////////////////////////////////////// 95////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmedia/llmediamanager.h b/linden/indra/llmedia/llmediamanager.h
index 0dbcc4a..ef721b2 100644
--- a/linden/indra/llmedia/llmediamanager.h
+++ b/linden/indra/llmedia/llmediamanager.h
@@ -78,6 +78,10 @@ class LLMediaManager
78 public: 78 public:
79 virtual ~LLMediaManager(); 79 virtual ~LLMediaManager();
80 80
81 // Special case early init for just web browser component
82 // so we can show login screen. See .cpp file for details. JC
83 static void initBrowser( LLMediaManagerData* init_data );
84
81 static void initClass( LLMediaManagerData* init_data ); 85 static void initClass( LLMediaManagerData* init_data );
82 static void cleanupClass(); 86 static void cleanupClass();
83 static LLMediaManager* getInstance(); 87 static LLMediaManager* getInstance();
generated by cgit v1.1 at 2025-01-19 02:40:24 +0000