Changeset 33:080fa73274f8 in xplra

Timestamp:

02/09/13 11:19:09 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Using the multi-get and multi-set commands in unregistered multi-dataref getters and setters, respectively

Location:

src/client/c/hu/varadiistvan/xplra

Files:

• MultiBuffer.cc (modified) (2 diffs)
• MultiBuffer.h (modified) (1 diff)
• MultiGetter.cc (modified) (2 diffs)
• MultiGetter.h (modified) (1 diff)
• MultiSetter.cc (modified) (2 diffs)

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

@@ -339 +339 @@
         xplane.checkStream();
 
-        xplane.stream->writeU8(registerCommand);
-        xplane.stream->writeU32(dataRefs.size());
-
-        for(vector<DataRef>::const_iterator i = dataRefs.begin();
-            i!=dataRefs.end(); ++i)
-        {
-            const DataRef& dataRef = *i;
-            xplane.stream->writeString(dataRef.name);
-            xplane.stream->writeU8(dataRef.type);
-            if (dataRef.isArray()) {
-                xplane.stream->writeS32(dataRef.length);
-                xplane.stream->writeS32(dataRef.offset);
-            }
-        }
-
-        xplane.stream->flush();
-
-        uint8_t result = xplane.stream->readU8();
+        writeSpec(registerCommand);
+
         uint32_t id = xplane.stream->readU32();
         xplane.checkStream();
-        xplane.checkResult(result);
 
         registeredID = static_cast<int>(id);
@@ -609 +592 @@
 //------------------------------------------------------------------------------
 
+void MultiBuffer::writeSpec(uint8_t command) const throw(Exception)
+{
+    xplane.stream->writeU8(command);
+    xplane.stream->writeU32(dataRefs.size());
+
+    for(vector<DataRef>::const_iterator i = dataRefs.begin();
+        i!=dataRefs.end(); ++i)
+    {
+        const DataRef& dataRef = *i;
+        xplane.stream->writeString(dataRef.name);
+        xplane.stream->writeU8(dataRef.type);
+        if (dataRef.isArray()) {
+            xplane.stream->writeS32(dataRef.length);
+            xplane.stream->writeS32(dataRef.offset);
+        }
+    }
+
+    xplane.stream->flush();
+    xplane.checkResult();
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++

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

@@ -475 +475 @@
     virtual void doExecuteUnregistered() throw(Exception) = 0;
 
+    /**
+     * Write the data specification with the given command. It also
+     * checks the result
+     */
+    void writeSpec(uint8_t command) const throw(Exception);
+
 private:
     /**

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

@@ -99 +99 @@
     xplane.checkResult();
 
-    for(vector<DataRef>::const_iterator i = dataRefs.begin();
-        i!=dataRefs.end(); ++i)
-    {
-        xplane.checkStream();
-        const DataRef& dataRef = *i;
-        read(dataRef);
-    }
+    readValues();
 }
 
@@ -113 +107 @@
 void MultiGetter::doExecuteUnregistered() throw(Exception)
 {
+    writeSpec(Protocol::COMMAND_GET_MULTI);
+
+    readValues();
+}
+
+//------------------------------------------------------------------------------
+
+void MultiGetter::readValues() throw(Exception)
+{
     for(vector<DataRef>::const_iterator i = dataRefs.begin();
         i!=dataRefs.end(); ++i)
     {
+        xplane.checkStream();
         const DataRef& dataRef = *i;
-        xplane.stream->writeU8(Protocol::COMMAND_GET_SINGLE);
-        xplane.stream->writeString(dataRef.name);
-        xplane.stream->writeU8(dataRef.type);
-        if (dataRef.isArray()) {
-            xplane.stream->writeS32(dataRef.length);
-            xplane.stream->writeS32(dataRef.offset);
-        }
-        xplane.stream->flush();
-        xplane.checkResult();
         read(dataRef);
     }

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

@@ -68 +68 @@
     void read(const DataRef& dataRef) throw(Exception);
 
+    /**
+     * Read all the values.
+     */
+    void readValues() throw(Exception);
+
     friend class XPlane;
 };

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

@@ -106 +106 @@
 void MultiSetter::doExecuteUnregistered() throw(Exception)
 {
+    xplane.stream->writeU8(Protocol::COMMAND_SET_MULTI);
+    xplane.stream->writeU32(dataRefs.size());
     for(vector<DataRef>::const_iterator i = dataRefs.begin();
         i!=dataRefs.end(); ++i)
     {
         const DataRef& dataRef = *i;
-        xplane.stream->writeU8(Protocol::COMMAND_SET_SINGLE);
         xplane.stream->writeString(dataRef.name);
         xplane.stream->writeU8(dataRef.type);
@@ -118 +119 @@
         }
         write(dataRef);
-        xplane.stream->flush();
-        xplane.checkResult();
     }
+    xplane.stream->flush();
+    xplane.checkResult();
 }