Changeset 5600 in orxonox.OLD

Timestamp:

Nov 16, 2005, 2:47:41 PM (18 years ago)

Author:

bknecht

Message:

new Constructors and BaseObject registration for DataStream

Location:

branches/network/src/lib/network

Files:

• data_stream.cc (modified) (5 diffs)
• data_stream.h (modified) (2 diffs)

branches/network/src/lib/network/data_stream.cc

@@ -29 +29 @@
 DataStream::DataStream(DataStream& upStream, DataStream& downStream)
 {
-
+    this->setClassID(CL_DATA_STREAM, "DataStream");
 }
 
@@ -37 +37 @@
 DataStream::DataStream(Synchronizeable& sync, NetworkSocket& socket)
 {
+    this->setClassID(CL_DATA_STREAM, "DataStream");
+}
 
+/**
+ * This constructor creates a new DataStream and connects the Synchronizeable to it
+ */
+DataStream::DataStream(Synchronizable& sync, DataStream& downStream)
+{
+    this->setClassID(CL_DATA_STREAM, "DataStream");
+}
+
+/**
+ * This constructor creates a new DataStream and connects the NetworkSocket to it
+ */
+DataStream::DataStream(DataStream& upStream, NetworkSocekt& socket)
+{
+     this->setClassID(CL_DATA_STREAM, "DataStream");
 }
 
@@ -92 +108 @@
 }
 
+/**
+ * Following functions are protected and only visible inside the object and from derived classes
+ */
 
 /**
@@ -97 +116 @@
  * it.
  */
-void DataStream::write(byte& data)
+void DataStream::writeBytes(byte& data)
 {
 
@@ -108 +127 @@
  * This function is only called from other connected DataStreams to read the data.
  */
-byte& DataStream::read()
+byte& DataStream::readBytes()
 {
 

branches/network/src/lib/network/data_stream.h

@@ -20 +20 @@
       DataStream(DataStream& upStream, DataStream& downStream);
       DataStream(Synchronizeable& sync, NetworkSocket& socket);
+      DataStream(DataStream& upStream, NetworkSocket& socket);
+      DataStream(Synchronizeable& sync, DataStream& downStream);
+      
       ~DataStream();
 
@@ -41 +44 @@
 
       protected:
-      void write(byte& data);
+      void writeBytes(byte& data);
 
-      byte& read();
+      byte& readBytes();
 };