Commit Graph

142 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Tofu Linden 68c5a7f25c EXT-7889 FIXED Linux fails to load splash screen and side panel home tab. 2010-06-22 12:20:45 +01:00
Tofu Linden 81597463be hairy merge of glib restoration 2010-06-22 11:11:58 +01:00
Tofu Linden 7295e1ee03 EXT-7889 PARTIAL Linux fails to load splash screen and side panel home tab.
Start to restore manual glib handling.

Backed out changeset ff86a9f5b917
2010-06-22 11:07:35 +01:00
Monroe Linden 79c4c1241b Enable the call to LLQtWebKit::setWindowOpenBehavior() on Linux, since the llqtwebkit build has been updated. 2010-06-15 14:11:26 -07:00
Tofu Linden 2fc77b8ee8 VWR-19683 llmediaimplgstreamervidplug gcc 4.4 build errors 2010-06-15 13:13:24 +01:00
Tofu Linden e79b9d9bab SNOW-541 PARTIAL GSTREAMER fail to load (slplugin?)
Robustify the plugin a bunch more, and turn off a dodgy-and-unused visualization feature.
(transplanted from 43273f751dac21d53dba83a90d7f9e057865f789)
2010-06-13 12:36:02 +01:00
Monroe Linden 79f697ad51 Fix for EXT-5667 (support window.open() in shared media so google docs will work).
Moved the processing of clicks on _external and _blank targeted links from LLMediaCtrl to LLViewerMediaImpl.

Removed LLMediaCtrl::setOpenInExternalBrowser() since that functionality is available through the use of the _external target attribute in web content.

Removed LLMediaCtrl:: setOpenInInternalBrowser() since it was unimplemented and not used.

Made the webkit media plugin set llqtwebkit's window open behavior to WOB_SIMULATE_BLANK_HREF_CLICK.  This is #ifdefed out on Linux until we get a new Linux build of llqtwebkit.
2010-05-21 15:36:12 -07:00
Richard Nelson abc6aef780 merge 2010-04-30 17:01:41 -07:00
Richard Nelson a1b765189d fix for media not working in release builds
reviewed by Mani
2010-04-28 19:06:08 -07:00
Richard Nelson deb2791e55 added optimization for media volume level of 1.0 (don't do anything) 2010-04-28 18:27:10 -07:00
Monroe Linden cb96bdc188 Fixed default pan value in mac volume catcher, and corrected the filename in the header comment. 2010-04-28 18:06:34 -07:00
Richard Linden f1f07e66e3 fixed potential buffer overrun in volume code 2010-04-29 18:06:09 -07:00
Richard Linden 48b3ac20d9 added some documentation to winmm_shim 2010-04-27 15:50:51 -07:00
Richard Nelson 0c643af528 fixed eol and tabs/spaces problems 2010-04-27 09:47:33 -07:00
Richard Nelson bd08f19894 EXT-6921 - Windows Xp/Vista unified volume control 2010-04-27 09:41:33 -07:00
Richard Nelson 3afda3d1c0 EXT-6921 - Media Volume Changes changes system volume on WinXP
reviewed by Callum
2010-04-19 17:01:47 -07:00
Richard Linden 8cb7af4f73 removed tabs from cmakelist.txt 2010-04-16 14:48:05 -07:00
Richard Linden e6daa50c58 windows_volume_catcher.cpp, now with comments!
also added volume_catcher.h to project
2010-04-16 12:10:57 -07:00
Richard Linden ba35fdd97c EXT-6888 - Implement per-media instance volume control 2010-04-15 17:22:35 -07:00
Monroe Linden d7e4fa17e8 Minor cleanup in mac_volume_catcher.cpp. 2010-04-13 15:16:03 -07:00
Monroe Linden 157bc3071d Initial implementation of mac_volume_catcher.cpp. 2010-04-13 10:10:58 -07:00
Monroe Linden db3641363d Set up volume control code in webkit plugin for platform-specific 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-04-09 12:34:24 -07:00
Monroe Linden e1517318c5 Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the 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-29 18:36:47 -07:00
Monroe Linden 4e7838fb00 Implemented central storage mechanism for media plugin cookies.
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-26 15:39:21 -07:00
Tofu Linden e7d9999359 Merge from viewer-2-0 2010-03-23 14:08:11 +00:00
Callum Prentice cb7fbc8a20 EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to 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-18 16:53:27 -07:00
Monroe Linden 65384d0df5 Fix for build error in media_plugin_example.cpp. 2010-03-16 16:45:25 -07:00
Monroe Linden ce242821dc Added an "init" message in LLPLUGIN_MESSAGE_CLASS_MEDIA, and made 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-16 16:42:31 -07:00
Tofu Linden b6e11798ac merge from viewer-2-0 2010-03-15 15:38:24 +00:00
Monroe Linden 6079a50186 New linux build of llqtwebkit.
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-12 13:49:40 -08:00
Tofu Linden 1b1dd127a4 merge. 2010-03-11 09:19:20 +00:00
Tofu Linden 7498504c92 EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux
Maybe also: EXT-4495 flash content crashes Webkit on Linux
2010-03-04 17:22:22 +00:00
Tofu Linden 496e6e1948 Add #if'd code that can deal with the newer QPixmap-based LLQtWebkits.
Disabled for now.
2010-03-04 14:30:57 +00:00
Tofu Linden f0c897230f duh, with added buildability. 2010-02-27 17:31:27 +00:00
Tofu Linden 753ddd7714 give audio visualization on faces with audio-only media. linux/gstreamer only. 2010-02-27 17:29:30 +00:00
Tofu Linden b0791c3001 Backed out changeset 0664cf2c9edf 2010-02-09 15:07:45 +00:00
Tofu Linden 43a9699de1 slightly reduce the overhead of 'EXT-5601: Linux: volume adjustment of web-based media / Flash' 2010-02-23 13:11:38 +00:00
Tofu Linden 96ddf30a49 support LL_PULSEAUDIO_ENABLED=0 - probably. 2010-02-22 16:55:14 +00:00
Tofu Linden f43a9a181e Do the necessary stuff to package pulseaudio's headers and make it (in theory, not yet in practice) optional. 2010-02-22 16:50:26 +00:00
Tofu Linden 15513ff6d7 trivial cleanup. 2010-02-22 16:20:57 +00:00
Tofu Linden 4cfbfedec5 comment improvement. 2010-02-22 16:19:46 +00:00
Tofu Linden dfe3b9ff1c EXT-5601 Linux: volume adjustment of web-based media / Flash
Dynamic loading of pulseaudio works now.
All that's left is to package-up the pulseaudio headers...
2010-02-22 16:16:26 +00:00
Tofu Linden 03d3e64157 more work on dynamic grabbing of PA syms. 2010-02-22 15:50:49 +00:00
Tofu Linden 71efe007b2 start dynamic sym loading work. 2010-02-22 15:29:57 +00:00
Tofu Linden fa1bae0093 minor comment tweak. 2010-02-22 14:33:26 +00:00
Tofu Linden 95ccfd806c Do some decent cleanup in LinuxVolumeCatcherImpl's destructor. Though I don't think media plugins are really 'destroyed' as we know it, their process just ends. 2010-02-22 14:29:37 +00:00
Tofu Linden b2fbb28dc9 Well, whaddyaknow.. it works.
More cleanup needed: need to dlopen()-ize the pulseaudio stuff
2010-02-22 14:19:10 +00:00
Tofu Linden 66162bfca3 comment tweak. 2010-02-22 14:15:57 +00:00
Tofu Linden 235023d711 document the linux_volume_catcher high-level design 2010-02-22 14:15:15 +00:00
Tofu Linden df43c0e18b Wire the linux volume catcher into the webkit plugin. 2010-02-22 14:08:15 +00:00