Changeset 40:ec5dde8a6ff6 in xplra for src/client/c/hu/varadiistvan/xplra/XPlane.cc

Timestamp:

02/14/13 18:21:47 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Implemented the client support for the new commands and updated the basic test programs with tests showing messages

File:

• src/client/c/hu/varadiistvan/xplra/XPlane.cc (modified) (5 diffs)

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

@@ -73 +73 @@
 //------------------------------------------------------------------------------
 
-void XPlane::checkResult(uint8_t result) throw(ProtocolException)
+void XPlane::checkResult(uint8_t result, bool hasParameter, long parameter)
+    throw(ProtocolException)
 {
     switch(result) {
@@ -79 +80 @@
         return;
       case Protocol::RESULT_INVALID_COMMAND:
-        throw ProtocolException(ProtocolException::INVALID_COMMAND);
+        throw ProtocolException(ProtocolException::INVALID_COMMAND,
+                                hasParameter, parameter);
       case Protocol::RESULT_UNKNOWN_DATAREF:
-        throw ProtocolException(ProtocolException::UNKNOWN_DATAREF);
+        throw ProtocolException(ProtocolException::UNKNOWN_DATAREF,
+                                hasParameter, parameter);
       case Protocol::RESULT_INVALID_TYPE:
-        throw ProtocolException(ProtocolException::INVALID_TYPE);
+        throw ProtocolException(ProtocolException::INVALID_TYPE,
+                                hasParameter, parameter);
       case Protocol::RESULT_INVALID_LENGTH:
-        throw ProtocolException(ProtocolException::INVALID_LENGTH);
+        throw ProtocolException(ProtocolException::INVALID_LENGTH,
+                                hasParameter, parameter);
       case Protocol::RESULT_INVALID_OFFSET:
-        throw ProtocolException(ProtocolException::INVALID_OFFSET);
+        throw ProtocolException(ProtocolException::INVALID_OFFSET,
+                                hasParameter, parameter);
       case Protocol::RESULT_INVALID_COUNT:
-        throw ProtocolException(ProtocolException::INVALID_COUNT);
+        throw ProtocolException(ProtocolException::INVALID_COUNT,
+                                hasParameter, parameter);
       case Protocol::RESULT_INVALID_ID:
-        throw ProtocolException(ProtocolException::INVALID_ID);
+        throw ProtocolException(ProtocolException::INVALID_ID,
+                                hasParameter, parameter);
+      case Protocol::RESULT_INVALID_DURATION:
+        throw ProtocolException(ProtocolException::INVALID_DURATION,
+                                hasParameter, parameter);
       case Protocol::RESULT_OTHER_ERROR:
       default:
-        throw ProtocolException(ProtocolException::OTHER);
+        throw ProtocolException(ProtocolException::OTHER,
+                                hasParameter, parameter);
     }
 }
@@ -100 +112 @@
 //------------------------------------------------------------------------------
 
-void XPlane::checkResult() throw(ProtocolException, IOException)
+void XPlane::checkResult(bool multi) throw(ProtocolException, IOException)
 {
     uint8_t result = stream->readU8();
-    checkStream();
-    checkResult(result);
+    bool hasParameter = false;
+    long parameter = 0;
+    if (multi) {
+        if (result==Protocol::RESULT_UNKNOWN_DATAREF) {
+            parameter = stream->readU32();
+            hasParameter = true;
+        }
+    }
+    checkStream();
+    checkResult(result, hasParameter, parameter);
 }
 
@@ -205 +225 @@
 
     checkStream();
+}
+
+//------------------------------------------------------------------------------
+
+void XPlane::reloadPlugins() throw(Exception)
+{
+    stream->writeU8(Protocol::COMMAND_RELOAD_PLUGINS);
+    stream->flush();
+    checkResult();
 }
 
@@ -457 +486 @@
     }
 }
+
+//------------------------------------------------------------------------------
+
+void XPlane::showMessage(const char* message, float duration) throw(Exception)
+{
+    stream->writeU8(Protocol::COMMAND_SHOW_MESSAGE);
+    stream->writeString(message);
+    stream->writeFloat(duration);
+    stream->flush();
+    checkResult();
+}
+
 //------------------------------------------------------------------------------