summaryrefslogtreecommitdiff
path: root/indra/media_plugins
AgeCommit message (Collapse)Author
2010-05-01merge from viewer-trunkTofu Linden
2010-04-30mergeRichard Nelson
2010-04-28fix for media not working in release buildsRichard Nelson
reviewed by Mani
2010-04-28added optimization for media volume level of 1.0 (don't do anything)Richard Nelson
2010-04-28Fixed default pan value in mac volume catcher, and corrected the filename in ↵Monroe Linden
the header comment.
2010-04-28merge from viewer-trunkTofu Linden
2010-04-29fixed potential buffer overrun in volume codeRichard Linden
2010-04-27added some documentation to winmm_shimRichard Linden
2010-04-27fixed eol and tabs/spaces problemsRichard Nelson
2010-04-27EXT-6921 - Windows Xp/Vista unified volume controlRichard Nelson
2010-04-20merge from viewer-trunkTofu Linden
2010-04-19EXT-6921 - Media Volume Changes changes system volume on WinXPRichard Nelson
reviewed by Callum
2010-04-16removed tabs from cmakelist.txtRichard Linden
2010-04-16windows_volume_catcher.cpp, now with comments!Richard Linden
also added volume_catcher.h to project
2010-04-19merge from viewer-trunkTofu Linden
2010-04-15EXT-6888 - Implement per-media instance volume controlRichard Linden
2010-04-13Minor cleanup in mac_volume_catcher.cpp.Monroe Linden
2010-04-13Initial implementation of mac_volume_catcher.cpp.Monroe Linden
2010-04-15merge from viewer-trunkTofu Linden
2010-04-12slightly conflicty merge from viewer-trunk, againTofu Linden
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