Doesn't crash now. Of course, there's still lots of problems.
[ITFoundation.git] / ITByteStream.m
index eff6eb7..67ecf31 100755 (executable)
           {
           data = [[NSMutableData alloc] init];
           lock = [[NSLock alloc] init];
+          delegate = nil;
           }
     return self;
 }
 
--(id) initWithStream:(ITByteStream*)stream
+-(id) initWithDelegate:(id)d
+{
+    if (self == [super init])
+          {
+          data = [[NSMutableData alloc] init];
+          lock = [[NSLock alloc] init];
+          delegate = [d retain];
+          }
+    return self;
+}
+
+-(id) initWithStream:(ITByteStream*)stream delegate:(id)d
 {
     if (self == [super init])
           {
           data = [stream->data copy];
           lock = [[NSLock alloc] init];
+          delegate = [d retain];
           }
     return 0;
 }
 
--(void) dealloc
+-(oneway void) dealloc
 {
+    [lock lock];
     [data release];
+    [lock unlock];
     [lock release];
     [super dealloc];
 }
 
+-(void) setDelegate:(id <ITByteStreamDelegate>)d
+{
+    [delegate release];
+    delegate = [d retain];
+}
+
 -(int) availableDataLength
 {
     int len;
     return ret;
 }
 
--(void) writeData:(NSData*)_data
+-(NSData*) readAllData
+{
+    NSData *ret;
+    [lock lock];
+    ret = [data autorelease];
+    data = [[NSMutableData alloc] init];
+    [lock unlock];
+    return ret;
+}
+
+-(void) writeData:(in NSData*)_data
 {
     [lock lock];
     [data appendData:_data];
     [lock unlock];
+    [delegate newDataAdded:self];
+}
+
+-(void) writeBytes:(char *)b len:(long)length
+{
+    [lock lock];
+    [data appendBytes:b length:length];
+    [lock unlock];
+    [delegate newDataAdded:self];
 }
 @end