diff options
-rw-r--r-- | linden/indra/llinventory/llparcel.cpp | 13 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/mime_types.xml | 31 | ||||
-rwxr-xr-x[-rw-r--r--] | linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml | 71 | ||||
-rwxr-xr-x[-rw-r--r--] | linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml | 69 |
4 files changed, 139 insertions, 45 deletions
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp index 547862f..39605eb 100644 --- a/linden/indra/llinventory/llparcel.cpp +++ b/linden/indra/llinventory/llparcel.cpp | |||
@@ -306,11 +306,11 @@ void LLParcel::setMediaType(const std::string& type) | |||
306 | mMediaType = type; | 306 | mMediaType = type; |
307 | mMediaType = rawstr_to_utf8(mMediaType); | 307 | mMediaType = rawstr_to_utf8(mMediaType); |
308 | 308 | ||
309 | // This code attempts to preserve legacy movie functioning | 309 | // // This legacy code prevents any media different from video from working on OpenSim |
310 | if(mMediaType.empty() && ! mMediaURL.empty()) | 310 | // if(mMediaType.empty() && ! mMediaURL.empty()) |
311 | { | 311 | // { |
312 | setMediaType(std::string("video/vnd.secondlife.qt.legacy")); | 312 | // setMediaType(std::string("video/vnd.secondlife.qt.legacy")); |
313 | } | 313 | // } |
314 | } | 314 | } |
315 | void LLParcel::setMediaWidth(S32 width) | 315 | void LLParcel::setMediaWidth(S32 width) |
316 | { | 316 | { |
@@ -762,7 +762,8 @@ void LLParcel::unpackMessage(LLMessageSystem* msg) | |||
762 | } | 762 | } |
763 | else | 763 | else |
764 | { | 764 | { |
765 | setMediaType(std::string("video/vnd.secondlife.qt.legacy")); | 765 | setMediaType(std::string("")); //having mMediaType empty causes autodetect, |
766 | // thats what we want -- AW | ||
766 | setMediaDesc(std::string("No Description available without Server Upgrade")); | 767 | setMediaDesc(std::string("No Description available without Server Upgrade")); |
767 | mMediaLoop = true; | 768 | mMediaLoop = true; |
768 | mObscureMedia = true; | 769 | mObscureMedia = true; |
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml index 9f0c631..a585069 100644 --- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml | |||
@@ -120,7 +120,7 @@ | |||
120 | none | 120 | none |
121 | </widgettype> | 121 | </widgettype> |
122 | <impl> | 122 | <impl> |
123 | media_plugin_quicktime | 123 | media_plugin_webkit |
124 | </impl> | 124 | </impl> |
125 | </mimetype> | 125 | </mimetype> |
126 | <mimetype name="none/none"> | 126 | <mimetype name="none/none"> |
@@ -130,6 +130,9 @@ | |||
130 | <widgettype> | 130 | <widgettype> |
131 | none | 131 | none |
132 | </widgettype> | 132 | </widgettype> |
133 | <impl> | ||
134 | media_plugin_webkit | ||
135 | </impl> | ||
133 | </mimetype> | 136 | </mimetype> |
134 | <mimetype name="audio/*"> | 137 | <mimetype name="audio/*"> |
135 | <label name="audio2_label"> | 138 | <label name="audio2_label"> |
@@ -160,6 +163,9 @@ | |||
160 | <widgettype> | 163 | <widgettype> |
161 | image | 164 | image |
162 | </widgettype> | 165 | </widgettype> |
166 | <impl> | ||
167 | media_plugin_webkit | ||
168 | </impl> | ||
163 | </mimetype> | 169 | </mimetype> |
164 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | 170 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> |
165 | <label name="vnd.secondlife.qt.legacy_label"> | 171 | <label name="vnd.secondlife.qt.legacy_label"> |
@@ -179,6 +185,9 @@ | |||
179 | <widgettype> | 185 | <widgettype> |
180 | web | 186 | web |
181 | </widgettype> | 187 | </widgettype> |
188 | <impl> | ||
189 | media_plugin_webkit | ||
190 | </impl> | ||
182 | </mimetype> | 191 | </mimetype> |
183 | <mimetype name="application/ogg"> | 192 | <mimetype name="application/ogg"> |
184 | <label name="application/ogg_label"> | 193 | <label name="application/ogg_label"> |
@@ -187,6 +196,9 @@ | |||
187 | <widgettype> | 196 | <widgettype> |
188 | audio | 197 | audio |
189 | </widgettype> | 198 | </widgettype> |
199 | <impl> | ||
200 | media_plugin_quicktime | ||
201 | </impl> | ||
190 | </mimetype> | 202 | </mimetype> |
191 | <mimetype name="application/pdf"> | 203 | <mimetype name="application/pdf"> |
192 | <label name="application/pdf_label"> | 204 | <label name="application/pdf_label"> |
@@ -195,6 +207,9 @@ | |||
195 | <widgettype> | 207 | <widgettype> |
196 | image | 208 | image |
197 | </widgettype> | 209 | </widgettype> |
210 | <impl> | ||
211 | media_plugin_webkit | ||
212 | </impl> | ||
198 | </mimetype> | 213 | </mimetype> |
199 | <mimetype name="application/postscript"> | 214 | <mimetype name="application/postscript"> |
200 | <label name="application/postscript_label"> | 215 | <label name="application/postscript_label"> |
@@ -203,6 +218,9 @@ | |||
203 | <widgettype> | 218 | <widgettype> |
204 | image | 219 | image |
205 | </widgettype> | 220 | </widgettype> |
221 | <impl> | ||
222 | media_plugin_webkit | ||
223 | </impl> | ||
206 | </mimetype> | 224 | </mimetype> |
207 | <mimetype name="application/rtf"> | 225 | <mimetype name="application/rtf"> |
208 | <label name="application/rtf_label"> | 226 | <label name="application/rtf_label"> |
@@ -211,6 +229,9 @@ | |||
211 | <widgettype> | 229 | <widgettype> |
212 | image | 230 | image |
213 | </widgettype> | 231 | </widgettype> |
232 | <impl> | ||
233 | media_plugin_webkit | ||
234 | </impl> | ||
214 | </mimetype> | 235 | </mimetype> |
215 | <mimetype name="application/smil"> | 236 | <mimetype name="application/smil"> |
216 | <label name="application/smil_label"> | 237 | <label name="application/smil_label"> |
@@ -220,7 +241,7 @@ | |||
220 | movie | 241 | movie |
221 | </widgettype> | 242 | </widgettype> |
222 | <impl> | 243 | <impl> |
223 | media_plugin_quicktime | 244 | media_plugin_webkit |
224 | </impl> | 245 | </impl> |
225 | </mimetype> | 246 | </mimetype> |
226 | <mimetype name="application/xhtml+xml"> | 247 | <mimetype name="application/xhtml+xml"> |
@@ -230,6 +251,9 @@ | |||
230 | <widgettype> | 251 | <widgettype> |
231 | web | 252 | web |
232 | </widgettype> | 253 | </widgettype> |
254 | <impl> | ||
255 | media_plugin_webkit | ||
256 | </impl> | ||
233 | </mimetype> | 257 | </mimetype> |
234 | <mimetype name="application/x-director"> | 258 | <mimetype name="application/x-director"> |
235 | <label name="application/x-director_label"> | 259 | <label name="application/x-director_label"> |
@@ -238,6 +262,9 @@ | |||
238 | <widgettype> | 262 | <widgettype> |
239 | image | 263 | image |
240 | </widgettype> | 264 | </widgettype> |
265 | <impl> | ||
266 | media_plugin_webkit | ||
267 | </impl> | ||
241 | </mimetype> | 268 | </mimetype> |
242 | <mimetype name="audio/mid"> | 269 | <mimetype name="audio/mid"> |
243 | <label name="audio/mid_label"> | 270 | <label name="audio/mid_label"> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml index 2977d7a..e95b371 100644..100755 --- a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml | |||
@@ -120,7 +120,7 @@ | |||
120 | none | 120 | none |
121 | </widgettype> | 121 | </widgettype> |
122 | <impl> | 122 | <impl> |
123 | media_plugin_gstreamer | 123 | media_plugin_webkit |
124 | </impl> | 124 | </impl> |
125 | </mimetype> | 125 | </mimetype> |
126 | <mimetype name="none/none"> | 126 | <mimetype name="none/none"> |
@@ -130,6 +130,9 @@ | |||
130 | <widgettype> | 130 | <widgettype> |
131 | none | 131 | none |
132 | </widgettype> | 132 | </widgettype> |
133 | <impl> | ||
134 | media_plugin_webkit | ||
135 | </impl> | ||
133 | </mimetype> | 136 | </mimetype> |
134 | <mimetype name="audio/*"> | 137 | <mimetype name="audio/*"> |
135 | <label name="audio2_label"> | 138 | <label name="audio2_label"> |
@@ -138,6 +141,9 @@ | |||
138 | <widgettype> | 141 | <widgettype> |
139 | audio | 142 | audio |
140 | </widgettype> | 143 | </widgettype> |
144 | <impl> | ||
145 | media_plugin_gstreamer | ||
146 | </impl> | ||
141 | </mimetype> | 147 | </mimetype> |
142 | <mimetype name="video/*"> | 148 | <mimetype name="video/*"> |
143 | <label name="video2_label"> | 149 | <label name="video2_label"> |
@@ -146,6 +152,9 @@ | |||
146 | <widgettype> | 152 | <widgettype> |
147 | movie | 153 | movie |
148 | </widgettype> | 154 | </widgettype> |
155 | <impl> | ||
156 | media_plugin_gstreamer | ||
157 | </impl> | ||
149 | </mimetype> | 158 | </mimetype> |
150 | <mimetype name="image/*"> | 159 | <mimetype name="image/*"> |
151 | <label name="image2_label"> | 160 | <label name="image2_label"> |
@@ -154,6 +163,9 @@ | |||
154 | <widgettype> | 163 | <widgettype> |
155 | image | 164 | image |
156 | </widgettype> | 165 | </widgettype> |
166 | <impl> | ||
167 | media_plugin_webkit | ||
168 | </impl> | ||
157 | </mimetype> | 169 | </mimetype> |
158 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | 170 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> |
159 | <label name="vnd.secondlife.qt.legacy_label"> | 171 | <label name="vnd.secondlife.qt.legacy_label"> |
@@ -163,8 +175,8 @@ | |||
163 | movie | 175 | movie |
164 | </widgettype> | 176 | </widgettype> |
165 | <impl> | 177 | <impl> |
166 | media_plugin_gstreamer | 178 | media_plugin_gstreamer |
167 | </impl> | 179 | </impl> |
168 | </mimetype> | 180 | </mimetype> |
169 | <mimetype name="application/javascript"> | 181 | <mimetype name="application/javascript"> |
170 | <label name="application/javascript_label"> | 182 | <label name="application/javascript_label"> |
@@ -173,6 +185,9 @@ | |||
173 | <widgettype> | 185 | <widgettype> |
174 | web | 186 | web |
175 | </widgettype> | 187 | </widgettype> |
188 | <impl> | ||
189 | media_plugin_webkit | ||
190 | </impl> | ||
176 | </mimetype> | 191 | </mimetype> |
177 | <mimetype name="application/ogg"> | 192 | <mimetype name="application/ogg"> |
178 | <label name="application/ogg_label"> | 193 | <label name="application/ogg_label"> |
@@ -181,6 +196,9 @@ | |||
181 | <widgettype> | 196 | <widgettype> |
182 | audio | 197 | audio |
183 | </widgettype> | 198 | </widgettype> |
199 | <impl> | ||
200 | media_plugin_gstreamer | ||
201 | </impl> | ||
184 | </mimetype> | 202 | </mimetype> |
185 | <mimetype name="application/pdf"> | 203 | <mimetype name="application/pdf"> |
186 | <label name="application/pdf_label"> | 204 | <label name="application/pdf_label"> |
@@ -189,6 +207,9 @@ | |||
189 | <widgettype> | 207 | <widgettype> |
190 | image | 208 | image |
191 | </widgettype> | 209 | </widgettype> |
210 | <impl> | ||
211 | media_plugin_webkit | ||
212 | </impl> | ||
192 | </mimetype> | 213 | </mimetype> |
193 | <mimetype name="application/postscript"> | 214 | <mimetype name="application/postscript"> |
194 | <label name="application/postscript_label"> | 215 | <label name="application/postscript_label"> |
@@ -197,6 +218,9 @@ | |||
197 | <widgettype> | 218 | <widgettype> |
198 | image | 219 | image |
199 | </widgettype> | 220 | </widgettype> |
221 | <impl> | ||
222 | media_plugin_webkit | ||
223 | </impl> | ||
200 | </mimetype> | 224 | </mimetype> |
201 | <mimetype name="application/rtf"> | 225 | <mimetype name="application/rtf"> |
202 | <label name="application/rtf_label"> | 226 | <label name="application/rtf_label"> |
@@ -205,16 +229,19 @@ | |||
205 | <widgettype> | 229 | <widgettype> |
206 | image | 230 | image |
207 | </widgettype> | 231 | </widgettype> |
232 | <impl> | ||
233 | media_plugin_webkit | ||
234 | </impl> | ||
208 | </mimetype> | 235 | </mimetype> |
209 | <mimetype name="application/smil"> | 236 | <mimetype name="application/smil"> |
210 | <label name="application/smil_label"> | 237 | <label name="application/smil_label"> |
211 | Synchronized Multimedia Integration Language (SMIL) | 238 | Synchronized Multimedia Integration Language (SMIL) |
212 | </label> | 239 | </label> |
213 | <widgettype> | 240 | <widgettype> |
214 | movie | 241 | movie |
215 | </widgettype> | 242 | </widgettype> |
216 | <impl> | 243 | <impl> |
217 | media_plugin_gstreamer | 244 | media_plugin_webkit |
218 | </impl> | 245 | </impl> |
219 | </mimetype> | 246 | </mimetype> |
220 | <mimetype name="application/xhtml+xml"> | 247 | <mimetype name="application/xhtml+xml"> |
@@ -224,6 +251,9 @@ | |||
224 | <widgettype> | 251 | <widgettype> |
225 | web | 252 | web |
226 | </widgettype> | 253 | </widgettype> |
254 | <impl> | ||
255 | media_plugin_webkit | ||
256 | </impl> | ||
227 | </mimetype> | 257 | </mimetype> |
228 | <mimetype name="application/x-director"> | 258 | <mimetype name="application/x-director"> |
229 | <label name="application/x-director_label"> | 259 | <label name="application/x-director_label"> |
@@ -232,6 +262,9 @@ | |||
232 | <widgettype> | 262 | <widgettype> |
233 | image | 263 | image |
234 | </widgettype> | 264 | </widgettype> |
265 | <impl> | ||
266 | media_plugin_webkit | ||
267 | </impl> | ||
235 | </mimetype> | 268 | </mimetype> |
236 | <mimetype name="audio/mid"> | 269 | <mimetype name="audio/mid"> |
237 | <label name="audio/mid_label"> | 270 | <label name="audio/mid_label"> |
@@ -351,8 +384,8 @@ | |||
351 | web | 384 | web |
352 | </widgettype> | 385 | </widgettype> |
353 | <impl> | 386 | <impl> |
354 | media_plugin_webkit | 387 | media_plugin_webkit |
355 | </impl> | 388 | </impl> |
356 | </mimetype> | 389 | </mimetype> |
357 | <mimetype menu="1" name="text/plain"> | 390 | <mimetype menu="1" name="text/plain"> |
358 | <label name="text/plain_label"> | 391 | <label name="text/plain_label"> |
@@ -384,8 +417,8 @@ | |||
384 | movie | 417 | movie |
385 | </widgettype> | 418 | </widgettype> |
386 | <impl> | 419 | <impl> |
387 | media_plugin_gstreamer | 420 | media_plugin_gstreamer |
388 | </impl> | 421 | </impl> |
389 | </mimetype> | 422 | </mimetype> |
390 | <mimetype name="video/mp4"> | 423 | <mimetype name="video/mp4"> |
391 | <label name="video/mp4_label"> | 424 | <label name="video/mp4_label"> |
@@ -395,8 +428,8 @@ | |||
395 | movie | 428 | movie |
396 | </widgettype> | 429 | </widgettype> |
397 | <impl> | 430 | <impl> |
398 | media_plugin_gstreamer | 431 | media_plugin_gstreamer |
399 | </impl> | 432 | </impl> |
400 | </mimetype> | 433 | </mimetype> |
401 | <mimetype menu="1" name="video/quicktime"> | 434 | <mimetype menu="1" name="video/quicktime"> |
402 | <label name="video/quicktime_label"> | 435 | <label name="video/quicktime_label"> |
@@ -406,8 +439,8 @@ | |||
406 | movie | 439 | movie |
407 | </widgettype> | 440 | </widgettype> |
408 | <impl> | 441 | <impl> |
409 | media_plugin_gstreamer | 442 | media_plugin_gstreamer |
410 | </impl> | 443 | </impl> |
411 | </mimetype> | 444 | </mimetype> |
412 | <mimetype name="video/x-ms-asf"> | 445 | <mimetype name="video/x-ms-asf"> |
413 | <label name="video/x-ms-asf_label"> | 446 | <label name="video/x-ms-asf_label"> |
@@ -417,8 +450,8 @@ | |||
417 | movie | 450 | movie |
418 | </widgettype> | 451 | </widgettype> |
419 | <impl> | 452 | <impl> |
420 | media_plugin_gstreamer | 453 | media_plugin_gstreamer |
421 | </impl> | 454 | </impl> |
422 | </mimetype> | 455 | </mimetype> |
423 | <mimetype name="video/x-ms-wmv"> | 456 | <mimetype name="video/x-ms-wmv"> |
424 | <label name="video/x-ms-wmv_label"> | 457 | <label name="video/x-ms-wmv_label"> |
@@ -428,8 +461,8 @@ | |||
428 | movie | 461 | movie |
429 | </widgettype> | 462 | </widgettype> |
430 | <impl> | 463 | <impl> |
431 | media_plugin_gstreamer | 464 | media_plugin_gstreamer |
432 | </impl> | 465 | </impl> |
433 | </mimetype> | 466 | </mimetype> |
434 | <mimetype menu="1" name="video/x-msvideo"> | 467 | <mimetype menu="1" name="video/x-msvideo"> |
435 | <label name="video/x-msvideo_label"> | 468 | <label name="video/x-msvideo_label"> |
@@ -439,7 +472,7 @@ | |||
439 | movie | 472 | movie |
440 | </widgettype> | 473 | </widgettype> |
441 | <impl> | 474 | <impl> |
442 | media_plugin_gstreamer | 475 | media_plugin_gstreamer |
443 | </impl> | 476 | </impl> |
444 | </mimetype> | 477 | </mimetype> |
445 | </mimetypes> | 478 | </mimetypes> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml index 4a7a6e1..7931e55 100644..100755 --- a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml | |||
@@ -130,6 +130,9 @@ | |||
130 | <widgettype> | 130 | <widgettype> |
131 | none | 131 | none |
132 | </widgettype> | 132 | </widgettype> |
133 | <impl> | ||
134 | media_plugin_webkit | ||
135 | </impl> | ||
133 | </mimetype> | 136 | </mimetype> |
134 | <mimetype name="audio/*"> | 137 | <mimetype name="audio/*"> |
135 | <label name="audio2_label"> | 138 | <label name="audio2_label"> |
@@ -138,6 +141,9 @@ | |||
138 | <widgettype> | 141 | <widgettype> |
139 | audio | 142 | audio |
140 | </widgettype> | 143 | </widgettype> |
144 | <impl> | ||
145 | media_plugin_quicktime | ||
146 | </impl> | ||
141 | </mimetype> | 147 | </mimetype> |
142 | <mimetype name="video/*"> | 148 | <mimetype name="video/*"> |
143 | <label name="video2_label"> | 149 | <label name="video2_label"> |
@@ -146,6 +152,9 @@ | |||
146 | <widgettype> | 152 | <widgettype> |
147 | movie | 153 | movie |
148 | </widgettype> | 154 | </widgettype> |
155 | <impl> | ||
156 | media_plugin_quicktime | ||
157 | </impl> | ||
149 | </mimetype> | 158 | </mimetype> |
150 | <mimetype name="image/*"> | 159 | <mimetype name="image/*"> |
151 | <label name="image2_label"> | 160 | <label name="image2_label"> |
@@ -154,6 +163,9 @@ | |||
154 | <widgettype> | 163 | <widgettype> |
155 | image | 164 | image |
156 | </widgettype> | 165 | </widgettype> |
166 | <impl> | ||
167 | media_plugin_webkit | ||
168 | </impl> | ||
157 | </mimetype> | 169 | </mimetype> |
158 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> | 170 | <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> |
159 | <label name="vnd.secondlife.qt.legacy_label"> | 171 | <label name="vnd.secondlife.qt.legacy_label"> |
@@ -163,8 +175,8 @@ | |||
163 | movie | 175 | movie |
164 | </widgettype> | 176 | </widgettype> |
165 | <impl> | 177 | <impl> |
166 | media_plugin_quicktime | 178 | media_plugin_quicktime |
167 | </impl> | 179 | </impl> |
168 | </mimetype> | 180 | </mimetype> |
169 | <mimetype name="application/javascript"> | 181 | <mimetype name="application/javascript"> |
170 | <label name="application/javascript_label"> | 182 | <label name="application/javascript_label"> |
@@ -173,6 +185,9 @@ | |||
173 | <widgettype> | 185 | <widgettype> |
174 | web | 186 | web |
175 | </widgettype> | 187 | </widgettype> |
188 | <impl> | ||
189 | media_plugin_webkit | ||
190 | </impl> | ||
176 | </mimetype> | 191 | </mimetype> |
177 | <mimetype name="application/ogg"> | 192 | <mimetype name="application/ogg"> |
178 | <label name="application/ogg_label"> | 193 | <label name="application/ogg_label"> |
@@ -181,6 +196,9 @@ | |||
181 | <widgettype> | 196 | <widgettype> |
182 | audio | 197 | audio |
183 | </widgettype> | 198 | </widgettype> |
199 | <impl> | ||
200 | media_plugin_quicktime | ||
201 | </impl> | ||
184 | </mimetype> | 202 | </mimetype> |
185 | <mimetype name="application/pdf"> | 203 | <mimetype name="application/pdf"> |
186 | <label name="application/pdf_label"> | 204 | <label name="application/pdf_label"> |
@@ -189,6 +207,9 @@ | |||
189 | <widgettype> | 207 | <widgettype> |
190 | image | 208 | image |
191 | </widgettype> | 209 | </widgettype> |
210 | <impl> | ||
211 | media_plugin_webkit | ||
212 | </impl> | ||
192 | </mimetype> | 213 | </mimetype> |
193 | <mimetype name="application/postscript"> | 214 | <mimetype name="application/postscript"> |
194 | <label name="application/postscript_label"> | 215 | <label name="application/postscript_label"> |
@@ -197,6 +218,9 @@ | |||
197 | <widgettype> | 218 | <widgettype> |
198 | image | 219 | image |
199 | </widgettype> | 220 | </widgettype> |
221 | <impl> | ||
222 | media_plugin_webkit | ||
223 | </impl> | ||
200 | </mimetype> | 224 | </mimetype> |
201 | <mimetype name="application/rtf"> | 225 | <mimetype name="application/rtf"> |
202 | <label name="application/rtf_label"> | 226 | <label name="application/rtf_label"> |
@@ -205,16 +229,19 @@ | |||
205 | <widgettype> | 229 | <widgettype> |
206 | image | 230 | image |
207 | </widgettype> | 231 | </widgettype> |
232 | <impl> | ||
233 | media_plugin_webkit | ||
234 | </impl> | ||
208 | </mimetype> | 235 | </mimetype> |
209 | <mimetype name="application/smil"> | 236 | <mimetype name="application/smil"> |
210 | <label name="application/smil_label"> | 237 | <label name="application/smil_label"> |
211 | Synchronized Multimedia Integration Language (SMIL) | 238 | Synchronized Multimedia Integration Language (SMIL) |
212 | </label> | 239 | </label> |
213 | <widgettype> | 240 | <widgettype> |
214 | movie | 241 | movie |
215 | </widgettype> | 242 | </widgettype> |
216 | <impl> | 243 | <impl> |
217 | media_plugin_quicktime | 244 | media_plugin_webkit |
218 | </impl> | 245 | </impl> |
219 | </mimetype> | 246 | </mimetype> |
220 | <mimetype name="application/xhtml+xml"> | 247 | <mimetype name="application/xhtml+xml"> |
@@ -224,6 +251,9 @@ | |||
224 | <widgettype> | 251 | <widgettype> |
225 | web | 252 | web |
226 | </widgettype> | 253 | </widgettype> |
254 | <impl> | ||
255 | media_plugin_webkit | ||
256 | </impl> | ||
227 | </mimetype> | 257 | </mimetype> |
228 | <mimetype name="application/x-director"> | 258 | <mimetype name="application/x-director"> |
229 | <label name="application/x-director_label"> | 259 | <label name="application/x-director_label"> |
@@ -232,6 +262,9 @@ | |||
232 | <widgettype> | 262 | <widgettype> |
233 | image | 263 | image |
234 | </widgettype> | 264 | </widgettype> |
265 | <impl> | ||
266 | media_plugin_webkit | ||
267 | </impl> | ||
235 | </mimetype> | 268 | </mimetype> |
236 | <mimetype name="audio/mid"> | 269 | <mimetype name="audio/mid"> |
237 | <label name="audio/mid_label"> | 270 | <label name="audio/mid_label"> |
@@ -351,8 +384,8 @@ | |||
351 | web | 384 | web |
352 | </widgettype> | 385 | </widgettype> |
353 | <impl> | 386 | <impl> |
354 | media_plugin_webkit | 387 | media_plugin_webkit |
355 | </impl> | 388 | </impl> |
356 | </mimetype> | 389 | </mimetype> |
357 | <mimetype menu="1" name="text/plain"> | 390 | <mimetype menu="1" name="text/plain"> |
358 | <label name="text/plain_label"> | 391 | <label name="text/plain_label"> |
@@ -384,8 +417,8 @@ | |||
384 | movie | 417 | movie |
385 | </widgettype> | 418 | </widgettype> |
386 | <impl> | 419 | <impl> |
387 | media_plugin_quicktime | 420 | media_plugin_quicktime |
388 | </impl> | 421 | </impl> |
389 | </mimetype> | 422 | </mimetype> |
390 | <mimetype name="video/mp4"> | 423 | <mimetype name="video/mp4"> |
391 | <label name="video/mp4_label"> | 424 | <label name="video/mp4_label"> |
@@ -395,8 +428,8 @@ | |||
395 | movie | 428 | movie |
396 | </widgettype> | 429 | </widgettype> |
397 | <impl> | 430 | <impl> |
398 | media_plugin_quicktime | 431 | media_plugin_quicktime |
399 | </impl> | 432 | </impl> |
400 | </mimetype> | 433 | </mimetype> |
401 | <mimetype menu="1" name="video/quicktime"> | 434 | <mimetype menu="1" name="video/quicktime"> |
402 | <label name="video/quicktime_label"> | 435 | <label name="video/quicktime_label"> |
@@ -406,8 +439,8 @@ | |||
406 | movie | 439 | movie |
407 | </widgettype> | 440 | </widgettype> |
408 | <impl> | 441 | <impl> |
409 | media_plugin_quicktime | 442 | media_plugin_quicktime |
410 | </impl> | 443 | </impl> |
411 | </mimetype> | 444 | </mimetype> |
412 | <mimetype name="video/x-ms-asf"> | 445 | <mimetype name="video/x-ms-asf"> |
413 | <label name="video/x-ms-asf_label"> | 446 | <label name="video/x-ms-asf_label"> |
@@ -417,8 +450,8 @@ | |||
417 | movie | 450 | movie |
418 | </widgettype> | 451 | </widgettype> |
419 | <impl> | 452 | <impl> |
420 | media_plugin_quicktime | 453 | media_plugin_quicktime |
421 | </impl> | 454 | </impl> |
422 | </mimetype> | 455 | </mimetype> |
423 | <mimetype name="video/x-ms-wmv"> | 456 | <mimetype name="video/x-ms-wmv"> |
424 | <label name="video/x-ms-wmv_label"> | 457 | <label name="video/x-ms-wmv_label"> |
@@ -428,8 +461,8 @@ | |||
428 | movie | 461 | movie |
429 | </widgettype> | 462 | </widgettype> |
430 | <impl> | 463 | <impl> |
431 | media_plugin_quicktime | 464 | media_plugin_quicktime |
432 | </impl> | 465 | </impl> |
433 | </mimetype> | 466 | </mimetype> |
434 | <mimetype menu="1" name="video/x-msvideo"> | 467 | <mimetype menu="1" name="video/x-msvideo"> |
435 | <label name="video/x-msvideo_label"> | 468 | <label name="video/x-msvideo_label"> |
@@ -439,7 +472,7 @@ | |||
439 | movie | 472 | movie |
440 | </widgettype> | 473 | </widgettype> |
441 | <impl> | 474 | <impl> |
442 | media_plugin_quicktime | 475 | media_plugin_quicktime |
443 | </impl> | 476 | </impl> |
444 | </mimetype> | 477 | </mimetype> |
445 | </mimetypes> | 478 | </mimetypes> |