diff --git a/Build/Vlc4LinuxCloneMakeInstall.sh b/Build/Vlc4LinuxCloneMakeInstall.sh deleted file mode 100755 index 607e96e5..00000000 --- a/Build/Vlc4LinuxCloneMakeInstall.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -set -x - -# Control if ./Plugins/VlcMedia/ folder exists. -if [ ! -d "./Plugins/VlcMedia/" ]; then - printf "./Plugins/VlcMedia/ folder doesn't exist.\nRun bash script from Project (GAME) folder\n" - exit 1 -fi - -# clean-up and configure the VlcMedia plugin -installDir=$PWD -installDir+="/Plugins/VlcMedia/ThirdParty/vlc/Linux/x86_64-unknown-linux-gnu/" -rm -rf $installDir -mkdir -p $installDir -rm -rf ./protobuf/ -rm -rf ./vlc/ - -# update Ubuntu and remove vlc -sudo apt purge vlc -sudo snap remove vlc -sudo add-apt-repository --remove ppa:videolan/master-daily -sudo apt update -sudo apt upgrade -sudo apt autoremove - -# To build vlc from source, the following tools are needed -sudo apt install autoconf automake libtool curl make g++ unzip -sudo apt install git build-essential pkg-config libtool autopoint gettext -sudo apt install subversion yasm cvs cmake ragel -sudo apt install gperf default-jdk ant flex flex-old bison -sudo apt install libcaca-dev libncursesw5-dev libasound2-dev lua5.2-dev libxcb-keysyms1-dev -sudo apt install lua5.2 openjdk-8-jdk ant nasm libxcb-composite0 libxcb-composite0-dev -sudo apt install libxcb-xv0 libxcb-xv0-dev wayland-protocols - -# Protocol Buffers - Google's data interchange format -git clone git://github.com/google/protobuf.git -cd protobuf -./autogen.sh -./configure -make -make check -sudo make install -make clean -sudo ldconfig # refresh shared library cache -cd .. - -# install vlc and make it available to the VlcMedia plugin -git clone git://git.videolan.org/vlc.git -cd vlc -git checkout tags/4.0.0-dev -b 4.0.0-dev -./bootstrap -# VLC contribs system, included in the VLC source -cd contrib -mkdir native -cd native -../bootstrap - -make # Create VLC contribs system code to Hotfix it -# Hotfix for `ERROR: libmp3lame >= 3.98.3 not found` problem. -# CREDIT # https://stackoverflow.com/a/46756012/4510033 -sed -i -e 's/\(3.98.3..lame.lame.h.lame.set.VBR.quality..lmp3lame\)/\1 -lm/' ./ffmpeg/configure - -make -cd .. -cd .. - -./configure --disable-srt --disable-dca --disable-libass --disable-css --disable-upnp --disable-chromaprint --disable-freetype --prefix=$installDir -make -make install -make clean -cd .. - diff --git a/Build/Vlc4LinuxMakeInstall.sh b/Build/Vlc4LinuxMakeInstall.sh deleted file mode 100755 index fc5646ff..00000000 --- a/Build/Vlc4LinuxMakeInstall.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -set -x - -# Control if ./Plugins/VlcMedia/ folder exists. -if [ ! -d "./Plugins/VlcMedia/" ]; then - printf "./Plugins/VlcMedia/ folder doesn't exist.\nRun bash script from Project (GAME) folder\n" - exit 1 -fi - -# clean-up and configure the VlcMedia plugin -installDir=$PWD -installDir+="/Plugins/VlcMedia/ThirdParty/vlc/Linux/x86_64-unknown-linux-gnu/" -rm -rf $installDir -mkdir -p $installDir -#rm -rf ./protobuf/ -#rm -rf ./vlc/ - -# update Ubuntu and remove vlc -sudo apt purge vlc -sudo snap remove vlc -sudo add-apt-repository --remove ppa:videolan/master-daily -sudo apt update -sudo apt upgrade -sudo apt autoremove - -# To build vlc from source, the following tools are needed -sudo apt install autoconf automake libtool curl make g++ unzip -sudo apt install git build-essential pkg-config libtool autopoint gettext -sudo apt install subversion yasm cvs cmake ragel -sudo apt install gperf default-jdk ant flex flex-old bison -sudo apt install libcaca-dev libncursesw5-dev libasound2-dev lua5.2-dev libxcb-keysyms1-dev -sudo apt install lua5.2 openjdk-8-jdk ant nasm libxcb-composite0 libxcb-composite0-dev -sudo apt install libxcb-xv0 libxcb-xv0-dev wayland-protocols - -# Protocol Buffers - Google's data interchange format -#git clone git://github.com/google/protobuf.git -cd protobuf -./autogen.sh -./configure -make clean -make -make check -sudo make install -make clean -sudo ldconfig # refresh shared library cache -cd .. - -# install vlc and make it available to the VlcMedia plugin -#git clone git://git.videolan.org/vlc.git -cd vlc -#git checkout tags/4.0.0-dev -b 4.0.0-dev -./bootstrap -# VLC contribs system, included in the VLC source -cd contrib -mkdir native -cd native -../bootstrap - -make # Create VLC contribs system code to Hotfix it -# Hotfix for `ERROR: libmp3lame >= 3.98.3 not found` problem. -# CREDIT # https://stackoverflow.com/a/46756012/4510033 -sed -i -e 's/\(3.98.3..lame.lame.h.lame.set.VBR.quality..lmp3lame\)/\1 -lm/' ./ffmpeg/configure - -make -cd .. -cd .. - -./configure --disable-srt --disable-dca --disable-libass --disable-css --disable-upnp --disable-chromaprint --disable-freetype --prefix=$installDir -make clean -make -make install -make clean -cd .. - diff --git a/Source/VlcMedia/Private/Shared/VlcMediaUtils.cpp b/Source/VlcMedia/Private/Shared/VlcMediaUtils.cpp index 4d555b16..da5dfe12 100644 --- a/Source/VlcMedia/Private/Shared/VlcMediaUtils.cpp +++ b/Source/VlcMedia/Private/Shared/VlcMediaUtils.cpp @@ -31,13 +31,13 @@ namespace VlcMedia case ELibvlcEventType::MediaPlayerEncounteredError: return TEXT("Player Encountered Error"); case ELibvlcEventType::MediaPlayerTimeChanged: return FString::Printf(TEXT("Player Time Changed: %s"), *FTimespan::FromMilliseconds(Event->Descriptor.MediaPlayerTimeChanged.NewTime).ToString()); case ELibvlcEventType::MediaPlayerPositionChanged: return FString::Printf(TEXT("Position Changed: %f"), Event->Descriptor.MediaPlayerPositionChanged.NewPosition); - case ELibvlcEventType::MediaPlayerSeekableChanged: return FString::Printf(TEXT("Player Seekable Changed: %s"), Event->Descriptor.MediaPlayerSeekableChanged.new_seekable ? *GTrue.ToString() : *GFalse.ToString()); - case ELibvlcEventType::MediaPlayerPausableChanged: return FString::Printf(TEXT("Player Pausable Changed: %s"), Event->Descriptor.MediaPlayerPausableChanged.NewPausable ? *GTrue.ToString() : *GFalse.ToString()); + case ELibvlcEventType::MediaPlayerSeekableChanged: return FString::Printf(TEXT("Player Seekable Changed: %s"), Event->Descriptor.MediaPlayerSeekableChanged.new_seekable ? *FCoreTexts::Get().True.ToString() : *FCoreTexts::Get().False.ToString()); + case ELibvlcEventType::MediaPlayerPausableChanged: return FString::Printf(TEXT("Player Pausable Changed: %s"), Event->Descriptor.MediaPlayerPausableChanged.NewPausable ? *FCoreTexts::Get().True.ToString() : *FCoreTexts::Get().False.ToString()); case ELibvlcEventType::MediaPlayerTitleChanged: return FString::Printf(TEXT("Player Title Changed: %s"), Event->Descriptor.MediaPlayerTitleChanged.NewTitle); case ELibvlcEventType::MediaPlayerSnapshotTaken: return TEXT("Player Snapshot Taken"); case ELibvlcEventType::MediaPlayerLengthChanged: return FString::Printf(TEXT("Player Length Changed: %i"), Event->Descriptor.MediaPlayerLengthChanged.NewLength); case ELibvlcEventType::MediaPlayerVout: return FString::Printf(TEXT("Player Vout: %i"), Event->Descriptor.MediaPlayerVout.NewCount); - case ELibvlcEventType::MediaPlayerScrambledChanged: return FString::Printf(TEXT("Player Scambled Changed: %s"), Event->Descriptor.MediaPlayerScrambledChanged.NewScrambled ? *GTrue.ToString() : *GFalse.ToString()); + case ELibvlcEventType::MediaPlayerScrambledChanged: return FString::Printf(TEXT("Player Scambled Changed: %s"), Event->Descriptor.MediaPlayerScrambledChanged.NewScrambled ? *FCoreTexts::Get().True.ToString() : *FCoreTexts::Get().False.ToString()); case ELibvlcEventType::MediaPlayerESAdded: return TEXT("Player ES Added"); case ELibvlcEventType::MediaPlayerESDeleted: return TEXT("Player ES Deleted"); case ELibvlcEventType::MediaPlayerESSelected: return TEXT("Player ES Selected"); diff --git a/Source/VlcMedia/Private/VlcMediaModule.cpp b/Source/VlcMedia/Private/VlcMediaModule.cpp index 2b57d15a..a0f08d07 100644 --- a/Source/VlcMedia/Private/VlcMediaModule.cpp +++ b/Source/VlcMedia/Private/VlcMediaModule.cpp @@ -202,7 +202,7 @@ class FVlcMediaModule // forward message to log ANSICHAR Message[1024]; - FCStringAnsi::GetVarArgs(Message, ARRAY_COUNT(Message), ARRAY_COUNT(Message) - 1, Format, Args); + FCStringAnsi::GetVarArgs(Message, UE_ARRAY_COUNT(Message), Format, Args); switch (Level) { diff --git a/VlcMedia.uplugin b/VlcMedia.uplugin index 6340ff5a..9da581d1 100644 --- a/VlcMedia.uplugin +++ b/VlcMedia.uplugin @@ -7,7 +7,7 @@ "CreatedBy" : "Epic Games Inc", "CreatedByURL" : "http://epicgames.com", "DocsURL" : "https://github.com/ue4plugins/VlcMedia", - "EngineVersion" : "4.20.0", + "EngineVersion" : "4.26.0", "Description" : "Implements a media player using the Video LAN Codec (libvlc).", "Category" : "Media Players", "EnabledByDefault" : true,