From 96216d42580cac3db05b0c6bba537d747933ddcf Mon Sep 17 00:00:00 2001
From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com>
Date: Sat, 23 Sep 2023 11:38:10 +0300
Subject: [PATCH] Implement `hxvlc`. (#207)

* Implement hxvlc.

* Better define for `VIDEO_CUTSCENES`.

* Update linux.yml

* Removed the libraries that aren't required

* Ok?
---
 .github/workflows/linux.yml                   |  3 ++
 libs.xml                                      | 30 +++++++++----------
 project.xml                                   | 30 +++++++------------
 .../backend/system/macros/ScriptsMacro.hx     |  2 +-
 source/funkin/game/cutscenes/VideoCutscene.hx |  2 +-
 5 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 08e9b4d2..f7e7ef90 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -25,6 +25,9 @@ jobs:
             export/release/linux/obj/
           restore-keys: |
             cache-build-linux
+      - name: Installing LibVLC
+        run: |
+          sudo apt-get install libvlc-dev libvlccore-dev
       - name: Installing/Updating libraries
         run: |
           haxe -cp commandline -D analyzer-optimize --run Main setup
diff --git a/libs.xml b/libs.xml
index aad494a6..70e72592 100644
--- a/libs.xml
+++ b/libs.xml
@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <libraries>
-    <!-- Flixel -->
-    <git name="flixel" url="https://github.com/FNF-CNE-Devs/flixel"/>
-    <git name="flixel-addons" url="https://github.com/FNF-CNE-Devs/flixel-addons"/>
+	<!-- OpenFL & Lime (Required for Flixel) -->
+	<lib name="openfl" />
+	<lib name="lime" />
 
-    <!-- Other Libraries -->
+	<!-- Flixel -->
+	<git name="flixel" url="https://github.com/FNF-CNE-Devs/flixel" />
+	<git name="flixel-addons" url="https://github.com/FNF-CNE-Devs/flixel-addons" />
+
+	<!-- Other Libraries -->
 	<git name="hscript-improved" url="https://www.github.com/FNF-CNE-Devs/hscript-improved" ref="custom-classes" />
-    <git name="discord-rpc" url="https://github.com/Aidan63/linc_discord-rpc"/>
-	<git name="flxanimate" url="https://github.com/FNF-CNE-Devs/flxanimate/" />
-
-	<git name="hxCodec-cne" url="https://github.com/FNF-CNE-Devs/hxCodec-cne"/>
+	<git name="discord-rpc" url="https://github.com/Aidan63/linc_discord-rpc" />
+	<git name="flxanimate" url="https://github.com/FNF-CNE-Devs/flxanimate" />
+	<git name="hxvlc" url="https://github.com/MAJigsaw77/hxvlc" />
 
 	<!-- Documentation and other features -->
-    <lib name="dox"/>
-    <lib name="away3d" />
+	<lib name="away3d" />
+	<!-- <lib name="dox" /> -->
 	<lib name="format" />
 	<lib name="markdown" />
-	<lib name="hxcpp-debug-server" />
-
-    <!-- OpenFL & Lime (Required for Flixel) -->
-    <lib name="openfl" />
-    <lib name="lime" />
 </libraries>
diff --git a/project.xml b/project.xml
index d8bc062f..f6dbb443 100644
--- a/project.xml
+++ b/project.xml
@@ -21,7 +21,6 @@
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
-	<!-- <app preloader="Preloader" resizable="true" /> -->
 	<app preloader="flixel.system.FlxPreloader" />
 
 	<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
@@ -53,12 +52,11 @@
 	<set name="BUILD_DIR" value="export/release-32bit" if="32bit" unless="debug" />
 	<set name="BUILD_DIR" value="latest/" if="beta" />
 
-	<classpath name="source" />
+	<source name="source" />
 
 	<define name="PRELOAD_ALL" unless="web" />
 	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL"/>
 
-
 	<library name="assets"    preload="true"  if="PRELOAD_ALL"/>
 	<library name="assets"    preload="false" if="NO_PRELOAD_ALL" />
 
@@ -74,17 +72,11 @@
 
 	<haxeflag name="--macro" value="funkin.backend.system.macros.NewHaxeWarning.warn()" />
 
-	<!--Enable the Flixel core recording system-->
-	<!--<haxedef name="FLX_RECORD" />-->
-
 	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
 
 	<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
 	<haxedef name="FLX_NO_DEBUG" unless="debug" />
 
-	<!--Enable this for Nape release builds for a serious performance improvement-->
-	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
-
 	<!-- _________________________________ Custom _______________________________ -->
 
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
@@ -113,10 +105,12 @@
 
 	<!-- Fixes thing with macros -->
 	<define name="HL" if="hl"/>
-	<define name="SYS" if="desktop || hl"/>
+	<define name="SYS" if="cpp || hl || neko"/>
 
 	<!-- Comment this out to disable Discord RPC !-->
-	<define name="DISCORD_RPC" unless="web || hl || neko"/>
+	<section if="cpp">
+		<define name="DISCORD_RPC" if="desktop"/>
+	</section>
 
 	<!-- Comment this out to disable GitHub API integration !-->
 	<define name="GITHUB_API" unless="web || hl"/>
@@ -157,7 +151,9 @@
 	<define name="THREE_D_SUPPORT" />
 
 	<!-- Comment this out to disable video cutscene support, in case of compilation errors. !-->
-	<define name="VIDEO_CUTSCENES" unless="web || linux || hl" />
+	<section if="cpp">
+		<define name="VIDEO_CUTSCENES" if="desktop || android" />
+	</section>
 
 	<!-- Comment this out to disable commit number on FPS -->
 	<define name="SHOW_BUILD_ON_FPS" />
@@ -177,18 +173,13 @@
 	<haxelib name="flixel" />
 	<haxelib name="flixel-addons" />
 
-	<haxelib name="hxCodec-cne" if="VIDEO_CUTSCENES" />
-	<section if="THREE_D_SUPPORT">
-		<haxelib name="away3d" />
-	</section>
+	<haxelib name="hxvlc" if="VIDEO_CUTSCENES" />
+	<haxelib name="away3d" if="THREE_D_SUPPORT" />
 	<haxelib name="format" />
 	<haxelib name="flxanimate" />
 
-	<haxedev set='webgl' />
-
 	<haxelib name="hscript-improved" />
 	<haxelib name="discord-rpc" if="DISCORD_RPC"/>
-
 	<haxelib name="markdown" />
 
 	<haxedef name="no-deprecation-warnings"/>
@@ -208,5 +199,6 @@
 	<haxedef name="HXCPP_CHECK_POINTER" if="release" />
 	<haxedef name="HXCPP_STACK_LINE" if="release" />
 	<haxedef name="HXCPP_DEBUG_LINK" if="release" />
+
 	<haxedef name="hscriptPos" /> <!-- for logging -->
 </project>
diff --git a/source/funkin/backend/system/macros/ScriptsMacro.hx b/source/funkin/backend/system/macros/ScriptsMacro.hx
index c6509335..555dc8c1 100644
--- a/source/funkin/backend/system/macros/ScriptsMacro.hx
+++ b/source/funkin/backend/system/macros/ScriptsMacro.hx
@@ -21,7 +21,7 @@ class ScriptsMacro {
 			"flixel.addons.util",
 			// OTHER LIBRARIES & STUFF
 			"away3d", "flx3d",
-			#if VIDEO_CUTSCENES "hxcodec.flixel", "hxcodec.openfl", "hxcodec.lime", #end
+			#if VIDEO_CUTSCENES "hxvlc.flixel", "hxvlc.openfl", #end
 			// BASE HAXE
 			"DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting"
 		])
diff --git a/source/funkin/game/cutscenes/VideoCutscene.hx b/source/funkin/game/cutscenes/VideoCutscene.hx
index 301cd9d3..68a86b92 100644
--- a/source/funkin/game/cutscenes/VideoCutscene.hx
+++ b/source/funkin/game/cutscenes/VideoCutscene.hx
@@ -9,7 +9,7 @@ import sys.io.File;
 import funkin.backend.FunkinText;
 import haxe.xml.Access;
 #if VIDEO_CUTSCENES
-import hxcodec.flixel.FlxVideo;
+import hxvlc.flixel.FlxVideo;
 #end
 
 /**