summaryrefslogtreecommitdiff
path: root/indra/media_plugins
AgeCommit message (Collapse)Author
2016-12-02Remove winmmshim 'hack' from project and set volume directly from CEF media ↵Callum Prentice
plugin using Windows system call. WinMMShim was only needed for XP systems and since we no longer support XP, it is not required.
2016-12-01DRTVWR-418: Until we figure out how to say FIXED:NO to linker, don't.Nat Goodspeed
The present CMake logic wants to pass FIXED:NO to the linker for 64-bit builds, which on the face of it seems like a Good Thing: it permits code to be relocated in memory, preventing collisions if two libraries happen to want to load into overlapping address ranges. However the way it's being specified is wrong and harmful. Passing /FIXED:NO to the compiler command line engages /FI (Forced Include!) of a nonexistent file XED:NO -- producing lots of baffling fatal compile errors. Thanks Callum for diagnosing this!
2016-11-30DRTVWR-418: Update forwarding_api.cpp to match current API signatureNat Goodspeed
Specifically, DriverCallback() was accepting several DWORD arguments that should really be DWORD_PTR arguments. In a 32-bit compile, evidently that was okay, but for 64 bits they're different sizes.
2016-11-23DRTVWR-418: Work around missing LLCEFLibSettings::page_zoom_factor.Nat Goodspeed
2016-11-16DRTVWR-418: pull in new viewer-release via viewer64Nat Goodspeed
2016-11-16Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-11-15DRTVWR-418: Fold windows64 into windows platform with new autobuild.Nat Goodspeed
autobuild 1.1 now supports expanding $variables within a config file -- support that was explicitly added to address this very problem. So now the windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE, $AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle most of the deltas between the windows platform and windows64. This permits removing the windows64 platform definition from autobuild.xml. The one remaining delta between the windows64 and windows platform definitions was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-11-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-10-27MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too ↵pavelkproductengine
small to read
2016-11-14Merged in lindenlab/viewer-cleanupAndreyL ProductEngine
2016-10-11MAINT-5232: Merge up to VLC viewer from viewer-releaseNat Goodspeed
2016-09-15MAINT-5232: Normalize LLSingleton subclasses.Nat Goodspeed
A shocking number of LLSingleton subclasses had public constructors -- and in several instances, were being explicitly instantiated independently of the LLSingleton machinery. This breaks the new LLSingleton dependency-tracking machinery. It seems only fair that if you say you want an LLSingleton, there should only be ONE INSTANCE! Introduce LLSINGLETON() and LLSINGLETON_EMPTY_CTOR() macros. These handle the friend class LLSingleton<whatevah>; and explicitly declare a private nullary constructor. To try to enforce the LLSINGLETON() convention, introduce a new pure virtual LLSingleton method you_must_use_LLSINGLETON_macro() which is, as you might suspect, defined by the macro. If you declare an LLSingleton subclass without using LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() in the class body, you can't instantiate the subclass for lack of a you_must_use_LLSINGLETON_macro() implementation -- which will hopefully remind the coder. Trawl through ALL LLSingleton subclass definitions, sprinkling in LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() as appropriate. Remove all explicit constructor declarations, public or private, along with relevant 'friend class LLSingleton<myself>' declarations. Where destructors are declared, move them into private section as well. Where the constructor was inline but nontrivial, move out of class body. Fix several LLSingleton abuses revealed by making ctors/dtors private: LLGlobalEconomy was both an LLSingleton and the base class for LLRegionEconomy, a non-LLSingleton. (Therefore every LLRegionEconomy instance contained another instance of the LLGlobalEconomy "singleton.") Extract LLBaseEconomy; LLGlobalEconomy is now a trivial subclass of that. LLRegionEconomy, as you might suspect, now derives from LLBaseEconomy. LLToolGrab, an LLSingleton, was also explicitly instantiated by LLToolCompGun's constructor. Extract LLToolGrabBase, explicitly instantiated, with trivial subclass LLToolGrab, the LLSingleton instance. (WARNING: LLToolGrabBase methods have an unnerving tendency to go after LLToolGrab::getInstance(). I DO NOT KNOW what should be the relationship between the instance in LLToolCompGun and the LLToolGrab singleton instance.) LLGridManager declared a variant constructor accepting (const std::string&), with the comment: // initialize with an explicity grid file for testing. As there is no evidence of this being called from anywhere, delete it. LLChicletBar's constructor accepted an optional (const LLSD&). As the LLSD parameter wasn't used, and as there is no evidence of it being passed from anywhere, delete the parameter. LLViewerWindow::shutdownViews() was checking LLNavigationBar:: instanceExists(), then deleting its getInstance() pointer -- leaving a dangling LLSingleton instance pointer, a land mine if any subsequent code should attempt to reference it. Use deleteSingleton() instead. ~LLAppViewer() was calling LLViewerEventRecorder::instance() and then explicitly calling ~LLViewerEventRecorder() on that instance -- leaving the LLSingleton instance pointer pointing to an allocated-but-destroyed instance. Use deleteSingleton() instead.
2016-09-09MAINT-6462 Built-in browser plays video vertically flippedcallum@lindenlab.com
2016-07-27remove use of "override" C++11 feature not supported on gcc 4.6Oz Linden
2016-07-21First pass at enabling time based media (videos) scrubbing controlsCallum Linden
2016-07-21Remove new 'buffering' state for video media - seemed like it'd be useful ↵Callum Linden
but it broke things
2016-07-21Add a comment about order of operation that might be important for those ↵Callum Linden
that follow
2016-07-20MAINT-6578 Broken texture batching - fixed along with misc LibVLC plugin ↵Callum Linden
additions (status, titles, looping)
2016-07-19MAINT-6578 Add back Y Flip into QuickTime plugin used in OS X to match ↵Callum Linden
viewer setting
2016-07-15MAINT-6577 FIX No sound in MOAP or browser videoCallum Linden
2016-07-11MAINT-6527 and MAINT-6528 FIX - max volume and media playing prior URLsCallum Prentice
2016-07-07MAINT-6527 FIX -volume plays at full amount +50m away - volume was not set ↵callum_linden
for media outside attenuation zone so played at random value
2016-07-01MAINT-6481 FIX Media controls not presentcallum_linden
2016-06-02FIX MAINT-6748 content looks correct but page links are flipped verticallycallum_linden
2016-06-02Merged in NickyD/viewer-release-vlc (pull request #2)Callum Prentice
Linux media_plugin_libvlc
2016-06-02BUG-18252 - media flipped on OS X when played in 2D browsercallum_linden
2016-06-01Linux: Use media_plugin_libvlc for media playback.Nicky
2016-05-31Fix windows line endingscallum_linden
2016-05-31Remove local flip (as part of resize) in QuickTime plugin for OSXcallum_linden
2016-05-27Some simple tidy up and added a proper URL for video test button in web ↵callum_linden
content floater
2016-05-27- Make popup appear on the right screen coordinates (this was broken after ↵Nicky
the flipy switch) - Make sure the popup stays until it is dismissed (no need to hold the mouse button to scroll through eg a listbox) [This needs a CEF change.)
2016-05-26Put back QuickTime plugin code for OS X until a LibVLC version is createdCallum Prentice
2016-05-26Put back QuickTime plugin code for OS X only (untested - moving code to OS X ↵callum_linden
dev)
2016-05-23Automated merge with tip of viewer-releasecallum_linden
2016-05-19Automated merge with tip of viewer-release to pick up 4.0.5callum_linden
2016-05-16Added support for some transport controls (pause/play/stop) and setting ↵callum_linden
media volume level.
2016-05-13Additional set of changes to use vlc-bin packagecallum_linden
2016-05-13pull in unflipped version of LLCEFLibcallum_linden
2016-05-10working test button in web browser floater - video invertedcallum_linden
2016-05-10Added support for arbitrary URLs and cleaned up codecallum_linden
2016-05-09Added restart on resize - kind of workscallum_linden
2016-05-06Moving to a private repocallum_linden
2016-04-21DRTVWR-418 remove references (and files) for QuickTimecallum_linden
2016-04-19Remove references to quicktime from the plain old viewer-release buildcallum_linden
2016-04-04merge with 4.0.3-releaseOz Linden
2016-03-16merge changes for DRTVWR-417Oz Linden
2016-03-07MergeRider Linden
2016-03-07merge with El Capitan and packaging fixesOz Linden
2016-03-07Merge fix for MAINT-5360AndreyL ProductEngine
2016-02-26MAINT-5360: restore builds for the EDU packageOz Linden