X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/4883c610168ebeb51a54ae8cce12d24638034b08..81fa921043ee6335a578360e220d1d6e3bf838ad:/ITByteStream.m?ds=sidebyside diff --git a/ITByteStream.m b/ITByteStream.m index eff6eb7..664e1a0 100755 --- a/ITByteStream.m +++ b/ITByteStream.m @@ -17,27 +17,55 @@ { 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]; } +-setDelegate:(id )d +{ + id old = delegate; + [delegate release]; + delegate = [d retain]; + return old; +} + +-delegate +{ + return delegate; +} + -(int) availableDataLength { int len; @@ -49,25 +77,54 @@ -(NSData*) readDataOfLength:(int)length { - NSData *ret, *tmp; + NSData *ret; NSRange range = {0, length}; [lock lock]; ret = [data subdataWithRange:range]; -#if MAC_OS_X_VERSION_10_2 <= MAC_OS_X_VERSION_MAX_ALLOWED [data replaceBytesInRange:range withBytes:nil length:0]; -#else - range = {length, [data length]}; - tmp = [data subdataWithRange:range]; - [data setData:tmp]; -#endif [lock unlock]; 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:(in char *)b len:(long)length +{ + [lock lock]; + [data appendBytes:b length:length]; + [lock unlock]; + [delegate newDataAdded:self]; +} + +-(void) lockStream +{ + [lock lock]; +} + +-(void) unlockStream +{ + [lock unlock]; +} + +-(void) shortenData:(long)length +{ + NSRange range = {0, length}; + [data replaceBytesInRange:range withBytes:nil length:0]; } @end