Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5569 in orxonox.OLD for branches


Ignore:
Timestamp:
Nov 15, 2005, 9:13:32 AM (19 years ago)
Author:
patrick
Message:

network: some very small changes on the DataStream (because I got the UML Diagram wrong), to make it compile under linux

Location:
branches/network/src/lib/network
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r5562 r5569  
    2828 */
    2929DataStream::DataStream(DataStream& upStream, DataStream& downStream)
    30 { 
    31      
     30{
     31
    3232}
    3333
    … …  
    3737DataStream::DataStream(Synchronizeable& sync, NetworkSocket& socket)
    3838{
    39  
     39
    4040}
    4141
    … …  
    4545DataStream::~DataStream()
    4646{
    47      
     47
    4848}
    4949
    5050/**
    51  * This function connects this stream to another stream. The connected DataStream is an up-stream, meaning 
     51 * This function connects this stream to another stream. The connected DataStream is an up-stream, meaning
    5252 * that the stream is "further away" from the NetworkSocket. The local reference upStream will be set to this
    5353 * Stream
    … …  
    5555void DataStream::connectUpStream(DataStream& upStream)
    5656{
    57      
     57
    5858}
    5959
    6060/**
    61  * This function connects this stream to another stream. The connected DataStream is an down-stream, meaning 
     61 * This function connects this stream to another stream. The connected DataStream is an down-stream, meaning
    6262 * that the stream is "closer" to the NetworkSocket.
    6363 */
    6464void DataStream::connectDownStream(DataStream& upStream)
    6565{
    66      
     66
    6767}
    6868
    … …  
    7272void DataStream::disconnectUpStream()
    7373{
    74      
     74
    7575}
    7676
    … …  
    8080void DataStream::disconnectDownStream()
    8181{
    82      
     82
    8383}
    8484
    … …  
    8989void DataStream::processData()
    9090{
    91      
     91
    9292}
    9393
    … …  
    9797 * it.
    9898 */
    99 void DataStream::write()
     99void DataStream::write(byte& data)
    100100{
    101      
     101
    102102}
    103103
    … …  
    110110byte& DataStream::read()
    111111{
    112      
     112
    113113}

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

    r5562 r5569  
    1313#include "netdefs.h"
    1414
     15class Synchronizeable;
     16class NetworkSocket;
     17
    1518class DataStream : public BaseObject
    1619{
    … …  
    1821      DataStream(Synchronizeable& sync, NetworkSocket& socket);
    1922      ~DataStream();
    20      
    21       protected: 
     23
     24      protected:
    2225      byte inBuffer [];
    2326      byte outBuffer [];
    2427      unsigned int bufferSize;
    25       DataStream& upStream;
    26       DataStream& downStream;
    27      
     28      DataStream* upStream;
     29      DataStream* downStream;
     30
    2831      public:
    2932      void connectUpStream(DataStream& upStream);
    30      
     33
    3134      void disconnectUpStream();
    32      
     35
    3336      void connectDownStream(DataStream& downStream);
    34      
     37
    3538      void disconnectDownStream();
    36      
     39
    3740      virtual void processData() = 0;
    38      
     41
    3942      protected:
    4043      void write(byte& data);
    41      
    42       byte& read();     
     44
     45      byte& read();
    4346};
    4447
Note: See TracChangeset for help on using the changeset viewer.