Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update VLC and Dullahan. Update vcredist deployment. Thanks Alchemy!

Browse Source
This commit is contained in:
Liru Færs
2020-02-25 03:21:27 -05:00
parent 0c3e144547
commit 2afd2c500b
14 changed files with 82 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/plugins/cef/media_plugin_cef.cpp
View File

@@ -547,7 +547,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.background_color = 0xff282828;
settings.cache_enabled = true;
settings.cache_path = mCachePath;
settings.cookie_store_path = mCookiePath;
//settings.cookie_store_path = mCookiePath;
settings.cookies_enabled = mCookiesEnabled;
settings.disable_gpu = mDisableGPU;
settings.flash_enabled = mPluginsEnabled;
@@ -708,10 +708,13 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
{
S32 x = message_in.getValueS32("x");
S32 y = message_in.getValueS32("y");
S32 delta_x = message_in.getValueS32("clicks_x");
S32 delta_y = message_in.getValueS32("clicks_y");
const int scaling_factor = 40;
y *= -scaling_factor;
delta_x *= -scaling_factor;
delta_y *= -scaling_factor;
mCEFLib->mouseWheel(x, y);
mCEFLib->mouseWheel(x, y, delta_x, delta_y);
}
else if (message_name == "text_event")
{

6
indra/plugins/libvlc/media_plugin_libvlc.cpp
View File

@@ -1,5 +1,3 @@
// This is an open source non-commercial project. Dear PVS-Studio, please check it.
// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
/**
* @file media_plugin_libvlc.cpp
* @brief LibVLC plugin for LLMedia API plugin system
@@ -36,6 +34,8 @@
#include "llpluginmessageclasses.h"
#include "media_plugin_base.h"
#define ssize_t SSIZE_T
#include "vlc/vlc.h"
#include "vlc/libvlc_version.h"
@@ -320,7 +320,7 @@ void MediaPluginLibVLC::logCallback(void *data, int level, const libvlc_log_t *c
//
void MediaPluginLibVLC::playMedia()
{
if (mURL.length() == 0)
if (mURL.length() == 0 || mWidth == 0 || mHeight == 0)
{
return;
}