Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UE v 4.25 #79

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

UE v 4.25 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b9fad3
version
Jan 21, 2020
8ad7dc7
upgrade 4.25
May 29, 2020
56e510e
replacement of deprecated code
Nov 5, 2020
5727e39
UE4 Array
Nov 16, 2020
6563956
fix: update engine version
brugr9 Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 0 additions & 72 deletions Build/Vlc4LinuxCloneMakeInstall.sh
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions Build/Vlc4LinuxMakeInstall.sh
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions Source/VlcMedia/Private/Shared/VlcMediaUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion Source/VlcMedia/Private/VlcMediaModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion VlcMedia.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down