curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-10 05:41:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

adding kotlin-test to dependencies

Browse Source
This commit is contained in:
minjaesong
2024-01-09 22:28:49 +09:00
parent 0104d80152
commit c4c76a41fb
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/App.java
View File

@@ -391,14 +391,18 @@ public class App implements ApplicationListener {
processorVendor = "Unknown CPU";
}
if (processor.startsWith("Apple M") && systemArch.equals("aarch64")) {
if (processor != null && processor.startsWith("Apple M") && systemArch.equals("aarch64")) {
isAppleM = true;
System.out.println("Apple Proprietary "+processor+" detected; don't expect smooth sailing...");
}
if (processor.startsWith("Apple M") && !systemArch.equals("aarch64")) {
if (processor != null && processor.startsWith("Apple M") && !systemArch.equals("aarch64")) {
undesirableConditions = "apple_execution_through_rosetta";
}
if (processor == null) {
processor = "null";
}
if (!IS_DEVELOPMENT_BUILD) {
var p = UnsafeHelper.INSTANCE.allocate(64);
p.destroy();

3
src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt
View File

@@ -77,7 +77,8 @@ class TerrarumAudioMixerTrack(
throw IllegalArgumentException("Cannot add master track as a sidechain")
if (sidechainInputs.map { it.first }.any { it.hash == input.hash })
throw IllegalArgumentException("The track '${input.hash}' already exists")
//throw IllegalArgumentException("The track '${input.hash}' already exists")
return
if (getSidechains().any { mySidechain ->
val theirSidechains = mySidechain?.getSidechains()