Changeset 499:9ff36d6cab14

Timestamp:

04/07/13 06:33:43 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

xplane

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

The simulator interface used depends on the type given

File:

• src/mlx/fs.py (modified) (2 diffs)

src/mlx/fs.py

@@ -5 +5 @@
 import os
 
-if os.name=="nt" or "FORCE_PYUIPC_SIM" in os.environ:
-    import fsuipc as sim
-else:
-    import xplane as sim
+import fsuipc
+import xplane
 
 import threading
@@ -62 +60 @@
     FIXME: add info
     """
-    assert type in [const.SIM_MSFS9, const.SIM_MSFSX], \
-           "Only MS Flight Simulator 2004 and X are supported"
-    return sim.Simulator(connectionListener, connectAttempts = 3)
+    if type in [const.SIM_MSFS9, const.SIM_MSFSX]:
+        return fsuipc.Simulator(connectionListener, connectAttempts = 3)
+    elif type in [const.SIM_XPLANE9, const.SIM_XPLANE10]:
+        return xplane.Simulator(connectionListener, connectAttempts = 3)
+    else:
+        "Only MS Flight Simulator 2004 and X or X-Plane 9 and 10 are supported"
 
 #-------------------------------------------------------------------------------