Changeset 36:29e3b676c0c2 in xplra for src/client

Timestamp:

02/10/13 08:21:47 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

Added a new command to query the versions

Location:

src/client

Files:

• c/hu/varadiistvan/xplra/XPlane.cc (modified) (1 diff)
• c/hu/varadiistvan/xplra/XPlane.h (modified) (1 diff)
• c/hu/varadiistvan/xplra/xplra.cc (modified) (1 diff)
• c/hu/varadiistvan/xplra/xplra.h (modified) (1 diff)
• python/xplra.py (modified) (3 diffs)

src/client/c/hu/varadiistvan/xplra/XPlane.cc

@@ -193 +193 @@
 //------------------------------------------------------------------------------
 
+void XPlane::getVersions(int& xplaneVersion, int& xplmVersion, int& xplraVersion)
+    throw(Exception)
+{
+    stream->writeU8(Protocol::COMMAND_GET_VERSIONS);
+    stream->flush();
+    checkResult();
+
+    xplaneVersion = stream->readS32();
+    xplmVersion = stream->readS32();
+    xplraVersion = stream->readS32();
+
+    checkStream();
+}
+
+//------------------------------------------------------------------------------
+
 void XPlane::getScalar(const char* name, uint8_t type) throw(Exception)
 {

src/client/c/hu/varadiistvan/xplra/XPlane.h

@@ -145 +145 @@
 
     /**
+     * Get the versions of X-Plane, XPLM and the XPLRA plugin.
+     */
+    void getVersions(int& xplaneVersion, int& xplmVersion, int& xplraVersion) throw(Exception);
+
+    /**
      * Get the integer value of the dataref with the given name.
      */

src/client/c/hu/varadiistvan/xplra/xplra.cc

@@ -498 +498 @@
 //------------------------------------------------------------------------------
 
+extern "C"int xplra_get_versions(int connectionID,
+                                 int* xplaneVersion, int* xplmVersion,
+                                 int* xplraVersion)
+{
+    Connection* connection = ConnectionSlot::getValue(connectionID);
+    if (connection==0) return -1;
+    try {
+        connection->getVersions(*xplaneVersion, *xplmVersion, *xplraVersion);
+        return 0;
+    } catch (...) {
+        connection->handleException();
+        return -1;
+    }
+}
+
+//------------------------------------------------------------------------------
+
 extern "C" int xplra_get_int(int* value, int connectionID, const char* name)
 {

src/client/c/hu/varadiistvan/xplra/xplra.h

@@ -130 +130 @@
 
 /*----------------------------------------------------------------------------*/
+
+/**
+ * Get the versions of X-Plane, the XPLM library and XPLRA
+ */
+int xplra_get_versions(int connectionID,
+                       int* xplaneVersion, int* xplmVersion,
+                       int* xplraVersion);
+
+/*----------------------------------------------------------------------------*/
 /* Single dataref support                                                     */
 /*----------------------------------------------------------------------------*/

src/client/python/xplra.py

@@ -27 +27 @@
 
 COMMAND_EXECUTE_SET_MULTI = 0x23
+
+COMMAND_GET_VERSIONS = 0x31
 
 TYPE_INT = 0x01
@@ -135 +137 @@
         """Create a new multi-dataref setter for this X-Plane object."""
         return MultiSetter(self)
+
+    def getVersions(self):
+        """Get the versions of X-Plane, XPLM and XPLRA as a tuple."""
+        self._writeU8(COMMAND_GET_VERSIONS)
+        self._flush()
+        self._checkResult()
+        return (self._readS32(), self._readS32(), self._readS32())
 
     def getInt(self, name):
@@ -392 +401 @@
 
         self._registeredID = None
+
+    @property
+    def values(self):
+        """Query the values as a list."""
+        if self._values is None:
+            self.finalize()
+        return self._values
 
     def addInt(self, name):