comparison vamp-client/qt/ProcessQtTransport.h @ 170:590b1a1fd955

More work on error and exception handling

  
 #ifndef PIPER_PROCESS_QT_TRANSPORT_H
 #define PIPER_PROCESS_QT_TRANSPORT_H
 
 #include "../SynchronousTransport.h"
+#include "../Exceptions.h"
 
 #include <QProcess>
 #include <QString>
 #include <QMutex>
 #include <QTime>

             if (!byteCount) {
 
                 if (responseStarted) {
                     if (duringResponseTimeout > 0 && ms > duringResponseTimeout) {
                         log("Server timed out during response");
-                        throw std::runtime_error("Request timed out");
+                        m_crashed = true;
+                        throw RequestTimedOut();
                     }
                 } else {
                     if (beforeResponseTimeout > 0 && ms > beforeResponseTimeout) {
                         log("Server timed out before response");
-                        throw std::runtime_error("Request timed out");
+                        m_crashed = true;
+                        throw RequestTimedOut();
                     }
                 }
                 
 #ifdef DEBUG_TRANSPORT
                 std::cerr << "waiting for data from server (slow = " << slow << ")..." << std::endl;

                 buffer.resize(formerSize + byteCount);
                 m_process->read(buffer.data() + formerSize, byteCount);
                 switch (m_completenessChecker->check(buffer)) {
                 case MessageCompletenessChecker::Complete: complete = true; break;
                 case MessageCompletenessChecker::Incomplete: break;
-                case MessageCompletenessChecker::Invalid:
-                    throw std::runtime_error
-                        ("Invalid message received: corrupt stream from server?");
+                case MessageCompletenessChecker::Invalid: throw ProtocolError();
                 }
                 (void)t.restart(); // reset timeout when we read anything
             }
         }