summaryrefslogtreecommitdiff
path: root/indra/media_plugins
AgeCommit message (Collapse)Author
2010-04-09Set up volume control code in webkit plugin for platform-specific ↵Monroe Linden
implementations Renamed LinuxVolumeCatcher class to VolumeCatcher. Everything in the header except the class name was already platform-agnostic, so I just renamed it to volume_catcher.h. Moved the stub implementation from the end of linux_volume_catcher.cpp (previously only used if LL_PULSEAUDIO_ENABLED was not defined) to dummy_volume_catcher.cpp, and made CMakeList.txt file use the dummy impl on Linux if PULSEAUDIO is not defined. Removed the ifdefs on the use of VolumeCatcher in MediaPluginWebkit, so it gets called on all platforms. Added a setPan() function to VolumeCatcher (currently unimplemented, but we'd like to have this capability in the future).
2010-03-29Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the ↵Monroe Linden
HTTP_USER_AGENT) The issue here is that initBrowserWindow() was doing the wrong thing if it got called after the set_user_agent message was received. Made the handler for the set_user_agent message save the string in a member variable (mUserAgent). Initialize mUserAgent to the default string in the MediaPluginWebKit constructor. initBrowserWindow() now sets the user agent string from mUserAgent instead of from a literal.
2010-03-26Implemented central storage mechanism for media plugin cookies.Monroe Linden
Added LLPluginCookieStore, which manages the central list of cookies. New Mac and Windows versions of llqtwebkit, built from the tip of the cookie-api branch on http://bitbucket.org/lindenlab/llqtwebkit/ (currently revision f35a5eab8c2f). Added "set_cookies" and "cookie_set" messages to the media_browser message class in the plugin API, and made the webkit plugin use them appropriately. Added methods to LLViewerMedia to read/write the cookie file and add/remove individual cookies. Added hooks to read/write the cookie file (plugin_cookies.txt) in the same places as the location history (idle_startup() in llstartup.cpp and LLAppViewer::cleanup(), respectively). Reviewed by Richard at http://codereview.lindenlab.com/1006003
2010-03-23Merge from viewer-2-0Tofu Linden
2010-03-18EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to ↵Callum Prentice
disable Web plugins via prefs" and EXT-6401 "Add feature to disable Javascript via prefs" Apologies for the multiple commit of Jiras - these changes are closely related and impossible to commit deparately Reviewed by Monroe
2010-03-16Fix for build error in media_plugin_example.cpp.Monroe Linden
2010-03-16Added an "init" message in LLPLUGIN_MESSAGE_CLASS_MEDIA, and made ↵Monroe Linden
LLPluginClassMedia queue it up before initializing its LLPluginProcessParent. Made all existing plugins send their texture_params message from this init message instead of the LLPLUGIN_MESSAGE_CLASS_BASE "init" message. (This ensures that they won't start to receive 'size_change' messages until after the init has happened.) Added "set_user_data_path" and "set_language_code" messages to LLPluginClassMedia. Made webkit plugin deal with the new messages, when they're sent before it receives the media "init". Removed the user_data_path and language_code arguments from the init function calls throughout the hierarchy. Made LLViewerMediaImpl queue up the language code and user data path messages before initializing the media. Reviewed by Callum at http://codereview.lindenlab.com/687006 .
2010-03-15merge from viewer-2-0Tofu Linden
2010-03-12New linux build of llqtwebkit.Monroe Linden
Also, disabled LL_QTWEBKIT_USES_PIXMAPS define in media_plugin_webkit.cpp as the QPixmap changes have been backed out of the llqtwebkit build for now.
2010-03-11merge.Tofu Linden
2010-03-04EXT-5969 build and merge a shippable pixmap-based llqtwebkit for ↵Tofu Linden
viewer2.0/linux Maybe also: EXT-4495 flash content crashes Webkit on Linux
2010-03-04Add #if'd code that can deal with the newer QPixmap-based LLQtWebkits.Tofu Linden
Disabled for now.
2010-02-27duh, with added buildability.Tofu Linden
2010-02-27give audio visualization on faces with audio-only media. linux/gstreamer only.Tofu Linden
2010-02-23slightly reduce the overhead of 'EXT-5601: Linux: volume adjustment of ↵Tofu Linden
web-based media / Flash'
2010-02-22support LL_PULSEAUDIO_ENABLED=0 - probably.Tofu Linden
2010-02-22Do the necessary stuff to package pulseaudio's headers and make it (in ↵Tofu Linden
theory, not yet in practice) optional.
2010-02-22trivial cleanup.Tofu Linden
2010-02-22comment improvement.Tofu Linden
2010-02-22EXT-5601 Linux: volume adjustment of web-based media / FlashTofu Linden
Dynamic loading of pulseaudio works now. All that's left is to package-up the pulseaudio headers...
2010-02-22more work on dynamic grabbing of PA syms.Tofu Linden
2010-02-22start dynamic sym loading work.Tofu Linden
2010-02-22minor comment tweak.Tofu Linden
2010-02-22Do some decent cleanup in LinuxVolumeCatcherImpl's destructor. Though I ↵Tofu Linden
don't think media plugins are really 'destroyed' as we know it, their process just ends.
2010-02-22Well, whaddyaknow.. it works.Tofu Linden
More cleanup needed: need to dlopen()-ize the pulseaudio stuff
2010-02-22comment tweak.Tofu Linden
2010-02-22document the linux_volume_catcher high-level designTofu Linden
2010-02-22Wire the linux volume catcher into the webkit plugin.Tofu Linden
2010-02-22Got this building okay now. It's not hooked-up to the webkit plugin yet, so ↵Tofu Linden
I don't know if it *works*.
2010-02-22bunch o'fixingTofu Linden
2010-02-22pretty fleshed-out, now needs fixing-up.Tofu Linden
2010-02-22Really start to fill the implementation in.Tofu Linden
2010-02-22more work on the volume-catcher interface.Tofu Linden
2010-02-22more work on the linux volume-catcher.Tofu Linden
2010-02-22fill out the interface.Tofu Linden
2010-02-22code codeTofu Linden
2010-02-22start to build up this codeTofu Linden
2010-02-22start of work on EXT-5601 Linux: volume adjustment of web-based media / FlashTofu Linden
these libs are a temporary requirement - we'll dlopen() them when this is finished.
2010-02-09EXT-3651 DEV-44500 Keyboard interaction does not work with Flash mediaTofu Linden
This change lets Linux pass keys through to Flash.
2010-02-09EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event use the proper cmake include() so glib is really found!
2010-02-09EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event restore part of this fix - glib-compatible Qt needs it, and flash needs a glib-compatible Qt.
2010-02-09mergeTofu Linden
2010-02-09Backed out changeset 0664cf2c9edfTofu Linden
2010-02-09Backed out changeset b1c241040751Tofu Linden
2010-02-09HACK HACK HACK to unbreak linux build while I wait for access to the new ↵Tofu Linden
llqtwebkit code. only affects linux. may harm webkit functionality temporarily. to be backed-out.
2010-02-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Monroe Linden
2010-02-05Changed LLWindowWin32::getNativeKeyData() to use platform-specific names in ↵Monroe Linden
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-05fix hook whine.Tofu Linden
2010-02-05EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
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-04Merge with tipCallum Prentice