Commit Graph

142 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Tofu Linden 551771fd90 Got this building okay now. It's not hooked-up to the webkit plugin yet, so I don't know if it *works*. 2010-02-22 14:00:10 +00:00
Tofu Linden 8c7d218f4e bunch o'fixing 2010-02-22 13:55:19 +00:00
Tofu Linden 7fb16ca505 pretty fleshed-out, now needs fixing-up. 2010-02-22 13:52:41 +00:00
Tofu Linden 9c66a9b6eb Really start to fill the implementation in. 2010-02-22 13:12:44 +00:00
Tofu Linden 1b6a57564c more work on the volume-catcher interface. 2010-02-22 12:36:10 +00:00
Tofu Linden aa654ae427 more work on the linux volume-catcher. 2010-02-22 12:32:07 +00:00
Tofu Linden cd368847dd fill out the interface. 2010-02-22 12:03:31 +00:00
Tofu Linden fae5c9b64e code code 2010-02-22 11:29:48 +00:00
Tofu Linden 3546075abf start to build up this code 2010-02-22 11:28:53 +00:00
Tofu Linden 68ebf9d5a5 start of work on EXT-5601 Linux: volume adjustment of web-based media / Flash
these libs are a temporary requirement - we'll dlopen() them when this is finished.
2010-02-22 11:12:54 +00:00
Tofu Linden 6d08400145 EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media
This change lets Linux pass keys through to Flash.
2010-02-09 18:19:35 +00:00
Tofu Linden c9b27bec33 EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
use the proper cmake include() so glib is really found!
2010-02-09 15:56:34 +00:00
Tofu Linden b809b87136 EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
restore part of this fix - glib-compatible Qt needs it, and flash needs a glib-compatible Qt.
2010-02-09 15:28:30 +00:00
Tofu Linden c920a71240 merge 2010-02-09 15:08:10 +00:00
Tofu Linden c66e9199a5 Backed out changeset b1c241040751 2010-02-09 14:52:13 +00:00
Tofu Linden 5abb6dece7 HACK HACK HACK to unbreak linux build while I wait for access to the new llqtwebkit code.
only affects linux.  may harm webkit functionality temporarily.  to be backed-out.
2010-02-09 14:00:33 +00:00
Monroe Linden 3699be5c45 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-05 18:38:16 -08:00
Monroe Linden 8b0ae67e73 Changed LLWindowWin32::getNativeKeyData() to use platform-specific names in the key data.
Changed MediaPluginWebkit::deserializeKeyboardData() to use platform-specific names when extracting the key data.  Also fixed a mac-specific issue where the arguments were reversed, which was causing flash apps to get bad keycode data.

Just pass 0 for the "native modifiers" param on windows, since it doesn't seem to actually have a native notion of a "modifier keys mask".  The Qt (non-native) modifiers should be good enough.
2010-02-05 18:23:16 -08:00
Tofu Linden 456bbdfa2f fix hook whine. 2010-02-05 09:03:09 +00:00
Tofu Linden f9f6f1958d EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
This should be a lot better now.  But still not good overall.  Performance is now just bad instead of intolerable.
2010-02-05 09:01:58 +00:00
Callum Prentice 259fa5fd0b Merge with tip 2010-02-04 17:03:41 -08:00
Callum Prentice 80139d95ad added code to grab raw key codes from Win32 WPARAM and LPARAM and send to plugin
factored out keyboard message deserialization for media_plugin_webkit
new version of llqtwebkit with Girish's changes to keyboard and cursor handling code
2010-02-04 16:30:21 -08:00
Callum Prentice 9c608d4db5 Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in Quicktime plugin"
(Fixed line endings for commit hook)
Reviewed by Rick.
2010-02-03 15:16:57 -08:00
Callum Prentice fea3e5ea76 Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in Quicktime plugin"
Reviewed by Rick.
2010-02-03 15:13:19 -08:00
Tofu Linden c0422e1c6c CID-284
Checker: UNINIT_CTOR
Function: MediaPluginWebKit::MediaPluginWebKit(void (*)(const char *, void **), void *)
File: /indra/media_plugins/webkit/media_plugin_webkit.cpp
2010-02-03 19:06:06 +00:00
Monroe Linden a4aed31ad9 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-01-29 14:49:18 -08:00
Monroe Linden 572b8fc518 Changes to llqtwebkit keyboard event api.
Reference to new mac build of llqtwebkit (from revision 5e61bf24915f in https://hg.lindenlab.com/monroe/llqtwebkit-4.6).
2010-01-19 21:55:51 -08:00
Monroe Linden c3b8a84d3c Workaround for "Stop on Debugger()/DebugStr()" Xcode setting causing the webkit plugin to crash. 2010-01-19 14:31:27 -08:00
Monroe Linden fae9c8fe86 Added getNativeKeyData() function to LLWindow and LLWindowMacOSX.
Added an LLSD argument to LLPluginClassMedia::keyEvent() and LLPluginClassMedia::textInput() which contains the native key data.
Made LLViewerMediaImpl retrieve the native key data and pass it to keyEvent and textInput.
Added a native_key_data parameter to the text_event and key_event messages.
Made the webkit plugin extract the native_key_data parameter and pass it to the internal keyEvent() and unicodeInput() functions.
Fixed LLMediaPluginTest to match function signature change to LLPluginClassMedia::keyEvent().
2010-01-18 17:58:12 -08:00
Lynx Linden 507ccd52a9 EXT-3624: Support "_blank" href target types.
Support href links in web views that have a target attribute set to
"_blank". This will open the link in the user's preferred browser
(internal or external, as defined in Prefs). This change relies on the
new llqtwebkit package that has just been pushed.

Also updated the hardcoded Qt version number in the About floater.
2010-01-14 11:57:03 +00:00
Monroe Linden 3b2697cb93 Fix for black/grey look at login screen and backspace going back in search/help windows. This should address EXT-4097.
Added a notion of "background color" to LLViewerMediaImpl and LLPluginClassMedia.
Added background color parameters to the size_change message.
Webkit plugin now sets the background color of the instance from the supplied background color, and navigates to a data: url with that background color instead of about:blank as its initial navigate.
Webkit plugin now no longer waits for the first onPageChanged event
LLViewerMediaImpl now clears the texture to the background color when initializing it.
Made LLMediaCtrl fill with its opaque background color when the media impl isn't set up yet.
Removed the initial data URL from the search and help floaters, since what it was doing is now handled internally by the new background color code.

Reviewed by callum and rick.
2010-01-11 17:54:05 -08:00
Monroe Linden f119a86461 Fix for EXT-3069 (Media Browser lets you click on Back button on first page).
Fix was to have the webkit plugin clear the llqtwebkit history on the first real navigateComplete event.
2010-01-05 15:23:52 -08:00
Tofu Linden 005688984d turn off verbose logging on gstreamer media plugin. 2009-12-24 17:18:39 -08:00
Tofu Linden 4070f6636e more minor cleanup to the gstreamer plugin. 2009-12-24 16:57:53 -08:00
Tofu Linden 52c8ffaa49 Some tidy-ups to the gstreamer media plugin while I try to figure out where the black-frame-on-resize is coming from. 2009-12-24 16:53:54 -08:00
Tofu Linden 043407238a Final tidy-up for DEV-44502 (gstreamer scaling bug) -
I *think* this is a bit clearer.  Not awesomely so.
2009-12-18 15:33:52 -08:00
Tofu Linden ceda074b86 gstreamer plugin now does the 'right' thing wrt resizing downwards *and up to its natural size again*. Though I don't like the logic so I'll be rejigging it again next. 2009-12-18 15:10:24 -08:00
Tofu Linden 68b8831fd6 add PID to gstreamer plugin logging. 2009-12-18 13:47:57 -08:00
Tofu Linden 4102367297 minor improvements to gstreamer media plugin's logging. 2009-12-18 13:21:43 -08:00
skolb d5b53eb483 Merge viewer 2 into media 2009-12-18 10:54:16 -08:00
Tofu Linden d8a574ce57 DEV-43898 Enable Flash-on-a-prim on Linux. Yowza! 2009-12-17 17:43:31 -08:00
Tofu Linden b7ddd2e4fe Fix a code comment now that we enable NSAPI plugins under Darwin. 2009-12-17 17:05:04 -08:00
Monroe Linden 0084d969ae Added setInitState() function to use as a logging point. 2009-12-16 18:06:23 -08:00
callum 6cb3d25942 Merge with tip 2009-12-16 13:10:03 -08:00
callum b7747a815f Merge with tip before push 2009-12-15 17:53:03 -08:00
callum f923f896bc client changes to work with new version of Qt (4.6) and to do some cleanup at plugin exit so that cookies more betterer than what they did before. 2009-12-15 17:50:16 -08:00
Monroe Linden bf9609294f Enable plugins in the Mac build of the webkit plugin. 2009-12-11 10:43:23 -08:00
Tofu Linden 05e0d9d24a Re-disable a very spewy debug spew in the webkit plugin. Mea culpa. 2009-12-09 14:36:45 -08:00
Tofu Linden 197de032e1 DEV-43948 viewer2 is writing session data into the 'read-only' installation tree (mostly media stuff)
propagate the parent app's OSUserAppDir (i.e. ~/.secondlife/) all the way down to plugins, if they need persistant user data/settings (like the webkit plugin needs a place to put its cache).
2009-12-09 12:57:10 -08:00
skolb 7851819c88 local merge 2009-12-03 09:18:11 -08:00
bea@american.lindenlab.com 1973cdc4e6 Add Doxygen comments 2009-12-03 08:47:59 -08:00
bea@american.lindenlab.com 916720dd11 merge 2009-12-01 18:50:53 -08:00
bea@american.lindenlab.com 9026ac3264 Add Doxygen comments 2009-12-01 18:47:36 -08:00
Monroe Linden 1db0d32133 Partial fix for EXT-2904/DEV-43584 (Space bar and Enter/Return key don't work as input for checkboxes or buttons on MoaP).
This change forces space characters to go through the keyEvent() path instead of the unicodeInput() path, which makes the space bar work for setting checkboxes.  I still need to figure out what's going on with the enter key.
2009-12-01 18:27:09 -08:00
bea@american.lindenlab.com 8e3276ebf9 doxygen: exclude licensing comments 2009-11-30 14:53:31 -08:00
bea@american.lindenlab.com 199d42f274 doxygen: exclude licensing blurbs 2009-11-30 14:46:35 -08:00
Bryan O'Sullivan 699eac4ee3 Switch some files to Unix line endings 2009-11-18 17:52:03 -08:00
Eric M. Tulla (BigPapi) 3217887356 Merge of viewer2 into avp
--HG--
branch : avatar-pipeline
2009-11-17 17:58:17 -05:00
James Cook ccc72757ef Fix comment-in-comment that was breaking Mac build. 2009-11-16 22:25:40 -08:00
callum 18980efe16 Fix up line endings issues. 2009-11-16 19:49:45 -08:00
callum ac9963ade2 Fix for - DEV-42713 (Playing MP3s crash the QuickTime plugin)
Note: This was fixed earlier in checkTitle() bosy and checked in by mistake.
This checkin re-enables the title grabbing code.
2009-11-16 19:22:45 -08:00
callum 18eab4a026 Merge with tip 2009-11-16 18:42:35 -08:00
Monroe Linden d19d581b48 Fix a logic error in the code to hide the initial about:blank navigate that caused DEV-42093 to recur. 2009-11-16 13:48:50 -08:00
Loren Shih 95cbf689f3 merge
--HG--
branch : avatar-pipeline
2009-11-16 11:05:33 -05:00
Steve Bennetts 7bb862c8c1 Merge 2009-12-02 12:52:13 -08:00
Sergei Litovchuk feef63d05f build fix (on behalf of Eugene Mutavchi)
--HG--
branch : product-engine
2009-12-01 20:52:33 +02:00
Loren Shih 59eb2815bf merge
--HG--
branch : avatar-pipeline
2009-11-13 18:28:27 -05:00
Monroe Linden 5890c850f8 Prevent the about:blank url from the initial navigate from leaking out of the webkit plugin. This should fix DEV-42766. 2009-11-13 13:05:16 -08:00
callum be72748d2a Fix for DEV-42152 (Streaming media broken on QuickTime) 2009-11-13 11:03:39 -08:00
Eric M. Tulla (BigPapi) e87975284e update from viewer2 and merge into avp
--HG--
branch : avatar-pipeline
2009-11-03 14:52:05 -05:00
Loren Shih 0dd9871012 merge
--HG--
branch : avatar-pipeline
2009-11-03 14:02:02 -05:00
callum 6e018f7143 Fix for compiler warning - passing F64 in as an int 2009-11-02 10:31:05 -08:00
callum 91b54876b7 Adds an example plugin and corresponding changes to
LLMediaPluginTest test app. We do not copy over the
example plugin to the Second Life client plugin dir.
2009-10-30 10:48:10 -07:00
callum a99493e8d0 Fix for - DEV-41731 (HTTP AUTH issues).
Reintroduces "white-flash" but this is less important than fix for now.
Also cleaned up a code typo.
2009-10-29 11:46:32 -07:00
Monroe Linden 8ae2f388b6 Fixes for DEV-41791 and DEV-41920.
Reworked some of the autoplay logic in LLViewerMediaImpl to try and make it more consistent when media is unloaded and reloaded by the performance manager.

LLViewerMediaImpl will now keep track of the media state and current time of media that it unloads for performance reasons, and attempt to restore playing or paused media to the same playhead time and state (playing or paused) when it reloads.

Added "done" status that time-based media plugins can use to indicate that they've reached the end of the media and stopped.

Added logging of priority transitions, for use in debugging issues with the peformance manager.
2009-10-28 17:34:03 -07:00
Monroe Linden c114b6a7d9 Fix for DEV-41544 (focus issues when signing into google docs on MoaP).
Made the webkit plugin code post a tab key event into llqtwebkit on initial focus.  This seems to do the right thing in all cases I tested.
2009-10-27 17:49:13 -07:00
Monroe Linden 4767b546e6 Fix for DEV-41638 (current URL is not propagated if media changes from website to media).
Made the quicktime plugin send navigate_begin and navigate_complete events.

This should allow the viewer's logic for sending prim media navigate events to work when loading quicktime media.
2009-10-26 17:59:45 -07:00
Monroe Linden 376deff7a3 Changes to match new version of llqtwebkit -- passing modifier keys through to most user events and using new scroll wheel event. 2009-10-23 14:28:21 -07:00
callum 318e4784d2 No Jira - added some new bookmarks to include Flash based sites
for testing purposes.
2009-10-22 18:09:38 -07:00
Steve Bennetts 642d368ecc merge 2009-10-21 18:49:19 -07:00
Steven Bennetts 6f41747bc4 Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587
* Dev: EXT-748 EXT-1447
* IM Cleanup
2009-10-21 04:58:23 +00:00
callum 113053b504 Fixed defects - added back getLoadedDuration() code that mysteriously vanished and fix name of function that checks the title.
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=19
2009-10-15 15:08:10 -07:00
callum 4347096803 https://jira.lindenlab.com/jira/browse/DEV-40711
Implement name fetching capabilities for Webkit and Quicktime plugins
Adds support for new PluginAPI message (MEDIA_EVENT_NAME_CHANGED) that updates the "title" of the media. In WebKit plugin this is the contents of the <title> tag. In The QuickTime plugin it is the "display name" from the movie meta data
2009-10-15 11:26:52 -07:00
Monroe Linden d02906b12e Added an optional "loaded_duration" parameter to the 'updated' message. This is the duration through which the time-based media has loaded, and should be between zero and the value of the "duration" parameter. If the parameter is not supplied, it will be implicitly set to the same value as the "duration" parameter, so the movie will appear fully loaded. This can be queried with LLPluginClassMedia::getLoadedDuration().
Made the "loaded_duration" parameter also implicitly set the progress percentage and send out MEDIA_EVENT_PROGRESS_UPDATED messages when it changes.

Made the quicktime plugin set the "loaded_duration" parameter in its update messages.
2009-10-12 17:21:26 -07:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
Mark Palange (Mani) 65d8a5a11b Changed win32 generation of initial 'component_path' for webkit plugin.
DllMain() captures module handle.
Call to GetModuleFilePathA() gets the dll filepath, Filename is trimmed off.
2009-09-28 17:57:51 -07:00
Mark Palange (Mani) 17f9fd5f96 Changes force no crt manifest linking in windows plugin files. 2009-09-25 19:23:24 -07:00
Brian McGroarty 7e43203558 Xcode 3.2 line-ending warning 2009-09-09 22:21:01 +00:00
Adam Moss 158946668a svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
Monroe Williams 558897b4b9 svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5
In the webkit plugin, don't try to load web browser plugins except on Windows.  The flash plugin on the Mac crashes the webkit plugin when running under xcode.
2009-08-29 01:08:36 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00