projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark master branch as past the 1.5 point
[fw/altos]
/
altosuilib
/
AltosUILib.java
diff --git
a/altosuilib/AltosUILib.java
b/altosuilib/AltosUILib.java
index 9fcaf6d4d636979ef4272b1171ff0a982f75a758..8fa7dfe69d937b1833c0452282d112aeeefeb875 100644
(file)
--- a/
altosuilib/AltosUILib.java
+++ b/
altosuilib/AltosUILib.java
@@
-15,12
+15,12
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 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 java.awt.*;
import libaltosJNI.*;
-import org.altusmetrum.altoslib_
2
.*;
+import org.altusmetrum.altoslib_
5
.*;
public class AltosUILib extends AltosLib {
public class AltosUILib extends AltosLib {
@@
-80,22
+80,30
@@
public class AltosUILib extends AltosLib {
static public boolean initialized = false;
static public boolean loaded_library = false;
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" };
public static boolean load_library() {
if (!initialized) {
public static boolean load_library() {
if (!initialized) {
- try {
- System.loadLibrary("altos");
- libaltos.altos_init();
- loaded_library = true;
- } catch (UnsatisfiedLinkError e) {
+ for (String name : library_names) {
try {
try {
- System.loadLibrary(
"altos64"
);
+ System.loadLibrary(
name
);
libaltos.altos_init();
loaded_library = true;
libaltos.altos_init();
loaded_library = true;
- } catch (UnsatisfiedLinkError e2) {
+ break;
+ } catch (UnsatisfiedLinkError e) {
+ System.out.printf("Link error %s\n", e.getMessage());
loaded_library = false;
}
}
loaded_library = false;
}
}
+
+ String OS = System.getProperty("os.name");
+
+ if (OS.startsWith("Linux")) {
+ has_bluetooth = true;
+ }
+
initialized = true;
}
return loaded_library;
initialized = true;
}
return loaded_library;