replace hxcodec with hxvlc

Vortex2Oblivion · Feb 6, 2024 · c12fdba · c12fdba
1 parent a3cb437
commit c12fdba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -44,7 +44,7 @@ jobs:
           haxelib install away3d
           haxelib install systools
           haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod
-          haxelib install hxCodec
+          haxelib install hxvlc
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
           haxelib git flixelTextureAtlas https://github.com/Smokey555/Flixel-TextureAtlas.git
           haxelib git fnf-modcharting-tools https://github.com/EdwhakKB/FNF-Modcharting-Tools
@@ -140,7 +140,7 @@ jobs:
           haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod
           haxelib install away3d
           haxelib git hxNoise https://github.com/whuop/hxNoise
-          haxelib git hxCodec https://github.com/polybiusproxy/hxCodec
+          haxelib git hxvlc https://github.com/polybiusproxy/hxvlc
           haxelib git openfl https://github.com/openfl/openfl
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
           haxelib git flixelTextureAtlas https://github.com/Smokey555/Flixel-TextureAtlas.git
@@ -189,7 +189,7 @@ jobs:
           haxelib git linc_luajit https://github.com/Leather128/linc_luajit.git
           haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved
           haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod
-          haxelib git hxCodec https://github.com/polybiusproxy/hxCodec
+          haxelib git hxvlc https://github.com/polybiusproxy/hxvlc
           haxelib git hxNoise https://github.com/whuop/hxNoise
           haxelib git openfl https://github.com/openfl/openfl
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc

diff --git a/Project.xml b/Project.xml
@@ -110,11 +110,10 @@
 	<haxelib name="flxanimate" />
 	<haxelib name="flixelTextureAtlas" />
 	<haxelib name="discord_rpc" if="desktop" />
-	<haxelib name="cocktail4X" if="DOCS_ALLOWED" rename="cocktail" />
 	<haxelib name="linc_luajit" if="LUA_ALLOWED" />
 	<haxelib name="flixel-screenshot-plugin" if="SCREENSHOTS_ALLOWED"/>
 	<haxelib name="away3d" if="THREE_D_ALLOWED" />
-	<haxelib name="hxCodec" if="VIDEOS_ALLOWED" />
+	<haxelib name="hxvlc" if="VIDEOS_ALLOWED" />
 	<haxelib name="hxNoise"/>
 	<haxelib name="systools" if="cpp" />
 	<haxelib name="fnf-modcharting-tools" url="https://github.com/EdwhakKB/FNF-Modcharting-Tools" />
@@ -132,8 +131,10 @@
 	<define name="MODCHARTING_TOOLS" if="fnf-modcharting-tools" />
 	<define name="LEATHER" if="MODCHARTING_TOOLS" />
 
-	<!-- Show debug traces for hxCodec -->
-	<define name="HXC_DEBUG_TRACE" if="debug" />
+	<!-- Show debug traces for hxvlc -->
+	<!--These defines are mostly for testing (aren't required to be used)-->
+	<haxedef name="HXVLC_VERBOSE" value="2" />
+	<haxedef name="HXVLC_LOGGING" />
 
 	<!-- Akways enable Null Object Reference check for crash dialog -->
 	<haxedef name="HXCPP_CHECK_POINTER" if="release" />

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -13,7 +13,7 @@ import utilities.Discord.DiscordClient;
 import polymod.backends.PolymodAssets;
 #end
 #if VIDEOS_ALLOWED
-import hxcodec.flixel.FlxVideo;
+import hxvlc.flixel.FlxVideo;
 #end
 #if MODCHARTING_TOOLS
 import modcharting.ModchartFuncs;
@@ -1582,7 +1582,8 @@ class PlayState extends MusicBeatState {
 		video_handler.onEndReached.add(video_handler.dispose);
 
 
-		video_handler.play(PolymodAssets.getPath(Paths.video(name, ext)));
+		video_handler.load(PolymodAssets.getPath(Paths.video(name, ext)));
+		video_handler.play();
 		#else
 		bruhDialogue(endSongVar);
 		#end