Skip to content

Commit 6dcb934

Browse files
author
Lily
committed
make it only crm and add mobile readme
1 parent 0d7e26f commit 6dcb934

File tree

9 files changed

+7
-35
lines changed

9 files changed

+7
-35
lines changed

art/ffmpeg-android/ffmpeg-arm64

-34 MB
Binary file not shown.

art/ffmpeg-android/ffmpeg-armv7a

-30.5 MB
Binary file not shown.

art/ffmpeg-android/ffmpeg-x86

-41.3 MB
Binary file not shown.

art/ffmpeg-android/ffmpeg-x86_64

-43.8 MB
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
if you're on mobile, you might need install termux or PC and ffmpeg and after that copy render folder and use this command: `ffmpeg -r (video fps) -i "(render folder)/%07d.(png or jpg)" "(output name).mp4"`

source/ClientPrefs.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class ClientPrefs { //default settings if it can't find a save file containing y
192192
public static var unlockFPS:Bool = false;
193193
public static var renderBitrate:Float = 5.0;
194194
public static var vidEncoder:String = 'libx264';
195-
public static var oldFFmpegMode:Bool = false;
195+
public static var oldFFmpegMode:Bool = #if mobile true #else false #end;
196196
public static var lossless:Bool = false;
197197
public static var quality:Int = 50;
198198
public static var renderGCRate:Float = 5.0;

source/PlayState.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6777,7 +6777,7 @@ class PlayState extends MusicBeatState
67776777

67786778
private function initRender():Void
67796779
{
6780-
if (!FileSystem.exists(#if linux 'ffmpeg' #elseif android android.content.Context.getFilesDir() + '/ffmpeg' #else 'ffmpeg.exe' #end))
6780+
if (!FileSystem.exists(#if linux 'ffmpeg' #else 'ffmpeg.exe' #end))
67816781
{
67826782
trace("\"FFmpeg\" not found! (Is it in the same folder as JSEngine?)");
67836783
return;
@@ -6795,7 +6795,7 @@ class PlayState extends MusicBeatState
67956795

67966796
ffmpegExists = true;
67976797

6798-
process = new Process(#if android '${android.content.Context.getFilesDir()}/ffmpeg' #else 'ffmpeg' #end, [
6798+
process = new Process('ffmpeg', [
67996799
'-v',
68006800
'quiet',
68016801
'-y',

source/mobile/CopyState.hx

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,6 @@ class CopyState extends MusicBeatState
7777
}
7878

7979
CoolUtil.showPopUp("Seems like you have some missing files that are necessary to run the game\nPress OK to begin the copy process", "Notice!");
80-
81-
#if android
82-
switch (getArch().toLowerCase())
83-
{
84-
case "armv7" | "armv7l" | "armv8l":
85-
archPrefix = "armv7a";
86-
case "arm64" | "aarch64" | "armv8":
87-
archPrefix = "arm64";
88-
case "x86" | "i386" | "i686":
89-
archPrefix = "x86";
90-
case "x86_64" | "amd64":
91-
archPrefix = "x86_64";
92-
}
93-
94-
if (!FileSystem.exists(android.content.Context.getFilesDir() + '/ffmpeg'))
95-
{
96-
File.saveBytes(android.content.Context.getFilesDir() + '/ffmpeg', getFileBytes(getFile('ffmpeg-$archPrefix')));
97-
Sys.command('chmod', ['777', android.content.Context.getFilesDir() + '/ffmpeg']);
98-
}
99-
#end
10080

10181
shouldCopy = true;
10282

@@ -256,16 +236,5 @@ class CopyState extends MusicBeatState
256236

257237
return (maxLoopTimes < 0);
258238
}
259-
260-
#if (android && cpp)
261-
@:functionCode('
262-
struct utsname osInfo{};
263-
uname(&osInfo);
264-
return ::String(osInfo.machine);
265-
')
266-
@:noCompletion
267-
private function getArch():String
268-
return null;
269-
#end
270239
}
271240
#end

source/options/GameRendererSettingsSubState.hx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,17 @@ class GameRendererSettingsSubState extends BaseOptionsMenu
9292
'vidEncoder',
9393
'string',
9494
'libx264',
95-
['libx264', 'libx264rgb' #if !android , 'libx265', 'libxvid', 'libsvtav1' #end, 'mpeg2video']);
95+
['libx264', 'libx264rgb' #if !mobile , 'libx265', 'libxvid', 'libsvtav1' #end, 'mpeg2video']);
9696
addOption(option);
9797

98+
#if !mobile
9899
var option:Option = new Option('Classic Rendering Mode', //Name
99100
'If checked, the game will use the old Rendering Mode from 1.20.0.',
100101
'oldFFmpegMode',
101102
'bool',
102103
false);
103104
addOption(option);
105+
#end
104106

105107
var option:Option = new Option('Lossless Screenshots',
106108
"If checked, screenshots will save as PNGs.\nOtherwise, It uses JPEG.",

0 commit comments

Comments
 (0)