Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 01:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(macOS) Made playing of videos work.

Browse source
This commit is contained in:
Leon Styhre 2020-08-23 15:42:10 +02:00
parent 16425b4c32
commit 31fae9678a
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
INSTALL.md
View file

@ -288,6 +288,7 @@ In addition to these, you need to create a `plugins` directory and copy over the
``` ```
libaudio_format_plugin.dylib libaudio_format_plugin.dylib
libauhal_plugin.dylib
libavcodec_plugin.dylib libavcodec_plugin.dylib
libconsole_logger_plugin.dylib libconsole_logger_plugin.dylib
libfilesystem_plugin.dylib libfilesystem_plugin.dylib

19
es-core/src/components/VideoVlcComponent.cpp
View file

@ -12,7 +12,11 @@
#include "PowerSaver.h" #include "PowerSaver.h"
#include "Settings.h" #include "Settings.h"
#if defined(__linux__) || defined(_WIN64) #if defined(__APPLE__)
#include "utils/FileSystemUtil.h"
#endif
#if defined(__linux__) || defined(_WIN64) || defined(__APPLE__)
#include <SDL2/SDL_mutex.h> #include <SDL2/SDL_mutex.h>
#include <SDL2/SDL_timer.h> #include <SDL2/SDL_timer.h>
#else #else
@ -22,7 +26,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#ifdef _WIN64 #if defined(_WIN64)
#include <codecvt> #include <codecvt>
#include <cstring> #include <cstring>
#endif #endif
@ -218,6 +222,17 @@ void VideoVlcComponent::setupVLC(std::string subtitles)
argslen = sizeof(singleargs) / sizeof(singleargs[0]); argslen = sizeof(singleargs) / sizeof(singleargs[0]);
args = singleargs; args = singleargs;
} }
#if defined(__APPLE__)
// It's required to set the VLC_PLUGIN_PATH variable on macOS, or the libVLC
// initialization will fail (with no error message).
std::string vlcPluginPath = Utils::FileSystem::getExePath() + "/plugins";
if (Utils::FileSystem::isDirectory(vlcPluginPath))
setenv("VLC_PLUGIN_PATH", vlcPluginPath.c_str(), 1);
else
setenv("VLC_PLUGIN_PATH", "/Applications/VLC.app/Contents/MacOS/plugins/", 1);
#endif
mVLC = libvlc_new(argslen, args); mVLC = libvlc_new(argslen, args);
} }
} }