X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;h=8fa7dfe69d937b1833c0452282d112aeeefeb875;hp=18c4c3d9eee0bc2035331eddab9b76bbdaf0dd21;hb=b1f1844aa514893228080704da3b3ccf855bda1e;hpb=8bff2822c242d2878b408b9c0d8a7647108ea4b1 diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java index 18c4c3d9..8fa7dfe6 100644 --- a/altosuilib/AltosUILib.java +++ b/altosuilib/AltosUILib.java @@ -15,12 +15,12 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_1; +package org.altusmetrum.altosuilib_3; import java.awt.*; import libaltosJNI.*; -import org.altusmetrum.altoslib_3.*; +import org.altusmetrum.altoslib_5.*; public class AltosUILib extends AltosLib { @@ -80,6 +80,7 @@ public class AltosUILib extends AltosLib { static public boolean initialized = false; static public boolean loaded_library = false; + static public boolean has_bluetooth = false; static final String[] library_names = { "altos", "altos32", "altos64" }; @@ -87,17 +88,22 @@ public class AltosUILib extends AltosLib { if (!initialized) { for (String name : library_names) { try { - System.out.printf ("Trying library %s\n", name); System.loadLibrary(name); libaltos.altos_init(); loaded_library = true; - System.out.printf ("Using library %s\n", name); break; } catch (UnsatisfiedLinkError e) { System.out.printf("Link error %s\n", e.getMessage()); loaded_library = false; } } + + String OS = System.getProperty("os.name"); + + if (OS.startsWith("Linux")) { + has_bluetooth = true; + } + initialized = true; } return loaded_library;