aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/llmedia
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/llmedia')
-rw-r--r--linden/indra/llmedia/llmedia_vc8.vcproj297
-rw-r--r--linden/indra/llmedia/llmediaengine.cpp2
-rw-r--r--linden/indra/llmedia/llmediaengine.h2
-rw-r--r--linden/indra/llmedia/llmediaimplquicktime.cpp2
4 files changed, 300 insertions, 3 deletions
diff --git a/linden/indra/llmedia/llmedia_vc8.vcproj b/linden/indra/llmedia/llmedia_vc8.vcproj
new file mode 100644
index 0000000..12fa817
--- /dev/null
+++ b/linden/indra/llmedia/llmedia_vc8.vcproj
@@ -0,0 +1,297 @@
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="..\llcommon;..\llrender;..\llwindow;..\llimage;..\llmath;..\llvfs;..\llmessage;..\llui;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
45 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;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 />
73 <Tool
74 Name="VCALinkTool"
75 />
76 <Tool
77 Name="VCXDCMakeTool"
78 />
79 <Tool
80 Name="VCBscMakeTool"
81 />
82 <Tool
83 Name="VCFxCopTool"
84 />
85 <Tool
86 Name="VCPostBuildEventTool"
87 />
88 </Configuration>
89 <Configuration
90 Name="Release|Win32"
91 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
92 IntermediateDirectory="Release"
93 ConfigurationType="4"
94 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
95 CharacterSet="1"
96 >
97 <Tool
98 Name="VCPreBuildEventTool"
99 />
100 <Tool
101 Name="VCCustomBuildTool"
102 />
103 <Tool
104 Name="VCXMLDataGeneratorTool"
105 />
106 <Tool
107 Name="VCWebServiceProxyGeneratorTool"
108 />
109 <Tool
110 Name="VCMIDLTool"
111 />
112 <Tool
113 Name="VCCLCompilerTool"
114 InlineFunctionExpansion="0"
115 EnableIntrinsicFunctions="false"
116 AdditionalIncludeDirectories="..\llcommon;..\llrender;..\llwindow;..\llimage;..\llmath;..\llvfs;..\llmessage;..\llui;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
117 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32"
118 RuntimeLibrary="0"
119 StructMemberAlignment="0"
120 TreatWChar_tAsBuiltInType="false"
121 ForceConformanceInForLoopScope="true"
122 UsePrecompiledHeader="0"
123 WarningLevel="3"
124 WarnAsError="false"
125 Detect64BitPortabilityProblems="false"
126 DebugInformationFormat="3"
127 DisableSpecificWarnings="4702"
128 />
129 <Tool
130 Name="VCManagedResourceCompilerTool"
131 />
132 <Tool
133 Name="VCResourceCompilerTool"
134 />
135 <Tool
136 Name="VCPreLinkEventTool"
137 />
138 <Tool
139 Name="VCLibrarianTool"
140 OutputFile="$(OutDir)/llmedia.lib"
141 AdditionalLibraryDirectories=""
142 IgnoreAllDefaultLibraries="false"
143 IgnoreDefaultLibraryNames=""
144 />
145 <Tool
146 Name="VCALinkTool"
147 />
148 <Tool
149 Name="VCXDCMakeTool"
150 />
151 <Tool
152 Name="VCBscMakeTool"
153 />
154 <Tool
155 Name="VCFxCopTool"
156 />
157 <Tool
158 Name="VCPostBuildEventTool"
159 />
160 </Configuration>
161 <Configuration
162 Name="ReleaseNoOpt|Win32"
163 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
164 IntermediateDirectory="$(ConfigurationName)"
165 ConfigurationType="4"
166 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
167 CharacterSet="1"
168 >
169 <Tool
170 Name="VCPreBuildEventTool"
171 />
172 <Tool
173 Name="VCCustomBuildTool"
174 />
175 <Tool
176 Name="VCXMLDataGeneratorTool"
177 />
178 <Tool
179 Name="VCWebServiceProxyGeneratorTool"
180 />
181 <Tool
182 Name="VCMIDLTool"
183 />
184 <Tool
185 Name="VCCLCompilerTool"
186 Optimization="0"
187 InlineFunctionExpansion="0"
188 EnableIntrinsicFunctions="false"
189 AdditionalIncludeDirectories="..\llcommon;..\llrender;..\llwindow;..\llimage;..\llmath;..\llvfs;..\llmessage;..\llui;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
190 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32"
191 RuntimeLibrary="0"
192 StructMemberAlignment="0"
193 TreatWChar_tAsBuiltInType="false"
194 ForceConformanceInForLoopScope="true"
195 UsePrecompiledHeader="0"
196 WarningLevel="3"
197 WarnAsError="true"
198 Detect64BitPortabilityProblems="false"
199 DebugInformationFormat="3"
200 DisableSpecificWarnings="4702"
201 />
202 <Tool
203 Name="VCManagedResourceCompilerTool"
204 />
205 <Tool
206 Name="VCResourceCompilerTool"
207 />
208 <Tool
209 Name="VCPreLinkEventTool"
210 />
211 <Tool
212 Name="VCLibrarianTool"
213 OutputFile="$(OutDir)/llmedia.lib"
214 AdditionalLibraryDirectories=""
215 IgnoreAllDefaultLibraries="false"
216 IgnoreDefaultLibraryNames=""
217 />
218 <Tool
219 Name="VCALinkTool"
220 />
221 <Tool
222 Name="VCXDCMakeTool"
223 />
224 <Tool
225 Name="VCBscMakeTool"
226 />
227 <Tool
228 Name="VCFxCopTool"
229 />
230 <Tool
231 Name="VCPostBuildEventTool"
232 />
233 </Configuration>
234 </Configurations>
235 <References>
236 </References>
237 <Files>
238 <Filter
239 Name="Source Files"
240 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
241 UniqueIdentifier="{44DBC47A-0AF0-4726-A094-2D6FBB65FFFA}"
242 >
243 <File
244 RelativePath=".\llmediabase.cpp"
245 >
246 </File>
247 <File
248 RelativePath=".\llmediaengine.cpp"
249 >
250 </File>
251 <File
252 RelativePath=".\llmediaimplquicktime.cpp"
253 >
254 </File>
255 <File
256 RelativePath=".\llmediamoviebase.cpp"
257 >
258 </File>
259 <File
260 RelativePath=".\llmediamoviebase.h"
261 >
262 </File>
263 </Filter>
264 <Filter
265 Name="Header Files"
266 Filter="h;hpp;hxx;hm;inl;inc;xsd"
267 UniqueIdentifier="{D188664C-B9B7-4982-8C4B-8D9A44B4D9EF}"
268 >
269 <File
270 RelativePath=".\llmediabase.h"
271 >
272 </File>
273 <File
274 RelativePath=".\llmediaemitter.h"
275 >
276 </File>
277 <File
278 RelativePath=".\llmediaemitterevents.h"
279 >
280 </File>
281 <File
282 RelativePath=".\llmediaengine.h"
283 >
284 </File>
285 <File
286 RelativePath=".\llmediaimplquicktime.h"
287 >
288 </File>
289 <File
290 RelativePath=".\llmediaobservers.h"
291 >
292 </File>
293 </Filter>
294 </Files>
295 <Globals>
296 </Globals>
297</VisualStudioProject>
diff --git a/linden/indra/llmedia/llmediaengine.cpp b/linden/indra/llmedia/llmediaengine.cpp
index c3930a4..c8a21ba 100644
--- a/linden/indra/llmedia/llmediaengine.cpp
+++ b/linden/indra/llmedia/llmediaengine.cpp
@@ -567,7 +567,7 @@ void LLMediaEngine::process_parcel_media( LLMessageSystem *msg, void ** )
567void LLMediaEngine::process_parcel_media_update( LLMessageSystem *msg, void ** ) 567void LLMediaEngine::process_parcel_media_update( LLMessageSystem *msg, void ** )
568{ 568{
569 LLUUID media_uuid; 569 LLUUID media_uuid;
570 char media_url[255]; 570 char media_url[255]; /* Flawfinder: ignore */
571 U8 auto_align; 571 U8 auto_align;
572 msg->getUUID( "DataBlock", "MediaID", media_uuid ); 572 msg->getUUID( "DataBlock", "MediaID", media_uuid );
573 msg->getString( "DataBlock", "MediaURL", 255, media_url ); 573 msg->getString( "DataBlock", "MediaURL", 255, media_url );
diff --git a/linden/indra/llmedia/llmediaengine.h b/linden/indra/llmedia/llmediaengine.h
index 1efebec..0d0db58 100644
--- a/linden/indra/llmedia/llmediaengine.h
+++ b/linden/indra/llmedia/llmediaengine.h
@@ -62,7 +62,7 @@ public:
62 BOOL update (); 62 BOOL update ();
63 63
64 // Pass web_url true if it's a web page, false if it's a movie. 64 // Pass web_url true if it's a web page, false if it's a movie.
65 // path is to mozilla directory for mozila 65 // path is to mozilla directory for mozilla
66 BOOL load( const LLString& urlIn, bool web_url, const LLString& path, S32 width_pixels, S32 height_pixels); 66 BOOL load( const LLString& urlIn, bool web_url, const LLString& path, S32 width_pixels, S32 height_pixels);
67 67
68 BOOL isLoaded (); 68 BOOL isLoaded ();
diff --git a/linden/indra/llmedia/llmediaimplquicktime.cpp b/linden/indra/llmedia/llmediaimplquicktime.cpp
index 74b6cd9..6489f66 100644
--- a/linden/indra/llmedia/llmediaimplquicktime.cpp
+++ b/linden/indra/llmedia/llmediaimplquicktime.cpp
@@ -383,7 +383,7 @@ myFrameDrawnCallback ( Movie callbackMovie, long refCon )
383 383
384 LockPixels ( myQtRenderer->pixmapHandle ); 384 LockPixels ( myQtRenderer->pixmapHandle );
385 385
386 memcpy ( ( U8* ) myQtRenderer->mediaData, pixels, myQtRenderer->getMediaBufferSize () ); 386 memcpy ( ( U8* ) myQtRenderer->mediaData, pixels, myQtRenderer->getMediaBufferSize () ); /* Flawfinder: ignore */
387 387
388 UnlockPixels ( myQtRenderer->pixmapHandle ); 388 UnlockPixels ( myQtRenderer->pixmapHandle );
389#endif 389#endif
generated by cgit v1.1 at 2024-11-15 09:05:51 +0000