1 files changed, 21 insertions, 2 deletions
diff --git a/src/camera.h b/src/camera.h
index 5190954..44901aa 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -28,6 +28,10 @@
 #ifndef __CAMERA_H__
 #define __CAMERA_H__
 
+#include <string>
+using namespace std;
+#include "error.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,19 +50,34 @@
 
 #include <qwidget.h>
 
+/**
+ * This class represents the symbolic representation of the camera and 
+ * the network functionality.
+ */
 class Camera {
 public:
-  Camera(const char *ip,
-         const int port);
+  Camera();
   ~Camera();
+  void connect(const char *ip,
+               const int port);
+
   void setCpr(char *newcpr);
+
+  // Camera actions
   void start();
   void stop();
   void freeze();
   void unfreeze();
   void snapshot();
 
+  // Status methods
+  bool hasError();
+  string getErrorString();
+
 private:
+  // Error object passed to all sub objects.
+  Error *errorstatus;
+
 	pthread_t playertid;
 	pthread_t decodetid;
 	pthread_t encodetid;