X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;h=5eefdc98ecfd78c84127bdce18faadd85cbcdac5;hb=HEAD;hp=ef706e364c2dabd5af947c53af40e4335ca16211;hpb=a61217f0a6d0ef48b6471f632c4600255867e831;p=fw%2Faltos

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index ef706e36..a0cf325d 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -16,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_12;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosUILib extends AltosLib {
 
@@ -36,6 +36,7 @@ public class AltosUILib extends AltosLib {
 	final public static int font_size_small = 1;
 	final public static int font_size_medium = 2;
 	final public static int font_size_large = 3;
+	final public static int font_size_huge = 4;
 
 	final public static int position_top_left = 0;
 	final public static int position_top = 1;
@@ -69,6 +70,11 @@ public class AltosUILib extends AltosLib {
 			status_size = 30;
 			table_size = 17;
 			break;
+		case font_size_huge:
+			brief_size = 30;
+			status_size = 36;
+			table_size = 24;
+			break;
 		}
 		label_font = new Font("Dialog", Font.PLAIN, brief_size);
 		value_font = new Font("Monospaced", Font.PLAIN, brief_size);
@@ -83,33 +89,31 @@ public class AltosUILib extends AltosLib {
 	static public boolean loaded_library = false;
 	static public boolean has_bluetooth = false;
 
-	static final String[] library_names_32 = { "altos", "altos32", "altos64" };
-	static final String[] library_names_64 = { "altos", "altos64", "altos32" };
+	static final String[] library_names = {
+		"altos",
+		"altos32",
+		"altos64",
+		"altos_i686",
+		"altos_amd64",
+		"altos_aarch64",
+		"altos_armel",
+		"altos_armhf"
+	};
 
 	public static boolean load_library() {
 		if (!initialized) {
-			String model = System.getProperty("sun.arch.data.model", "missing");
-			boolean is_64 = false;
-			if (model.equals("64")) {
-				is_64 = true;
-			} else if (model.equals("32")) {
-				;
-			} else {
-				String arch = System.getProperty("os.arch", "missing");
-				if (arch.endsWith("64"))
-					is_64 = true;
-			}
-			for (String name : is_64 ? library_names_64 : library_names_32) {
+			for (String name : library_names) {
 				try {
 					System.loadLibrary(name);
 					libaltos.altos_init();
 					loaded_library = true;
 					break;
 				} catch (UnsatisfiedLinkError e) {
-					System.out.printf("Link error %s\n", e.getMessage());
 					loaded_library = false;
 				}
 			}
+			if (!loaded_library)
+				System.out.printf("Cannot find 'libaltos' device access library\n");
 
 			String OS = System.getProperty("os.name");