SoundStream.st
changeset 2321 6f4cc7b644db
parent 1853 b9c4a09bfc6a
child 2418 4ea40741b2b5
--- a/SoundStream.st	Tue Oct 27 13:19:01 2009 +0100
+++ b/SoundStream.st	Wed Oct 28 21:59:16 2009 +0100
@@ -1086,7 +1086,7 @@
 
     |fd|
 
-    filePointer notNil ifTrue:[
+    handle notNil ifTrue:[
 	fd := self fileDescriptor.
 	fd isNil ifTrue:[
 	self errorNotOpen.
@@ -1120,7 +1120,7 @@
 
     |fd|
 
-    filePointer notNil ifTrue:[
+    handle notNil ifTrue:[
 	fd := self fileDescriptor.
 	fd isNil ifTrue:[
 	    self errorNotOpen.
@@ -1267,7 +1267,7 @@
 
     |fd|
 
-    filePointer notNil ifTrue:[
+    handle notNil ifTrue:[
 	fd := self fileDescriptor.
 	fd isNil ifTrue:[
 	    self errorNotOpen.
@@ -1328,7 +1328,7 @@
 
     |fd|
 
-    filePointer notNil ifTrue:[
+    handle notNil ifTrue:[
 	fd := self fileDescriptor.
 	fd isNil ifTrue:[
 	    self errorNotOpen.
@@ -1367,7 +1367,7 @@
 
     |fd|
 
-    filePointer notNil ifTrue:[
+    handle notNil ifTrue:[
 	fd := self fileDescriptor.
 	fd isNil ifTrue:[
 	    self errorNotOpen.
@@ -1658,9 +1658,9 @@
     int fd;
     FILE *f;
 
-    if ((fp = __INST(filePointer)) != nil) {
+    if ((fp = __INST(handle)) != nil) {
 	f = __FILEVal(fp);
-	__INST(filePointer) = nil;
+	__INST(handle) = nil;
 # ifdef LINUX
 	sigsetmask(~0);
 # endif
@@ -1718,7 +1718,7 @@
 isOpen
     handle1 notNil ifTrue:[^ true].
     handle2 notNil ifTrue:[^ true].
-    ^ filePointer notNil
+    ^ handle notNil
 !
 
 nextBytes:count into:anObject startingAt:start
@@ -1772,7 +1772,7 @@
     FILE *f;
     int fd;
 
-    if ((fp = __INST(filePointer)) != nil) {
+    if ((fp = __INST(handle)) != nil) {
 	f = __FILEVal(fp);
 	if (__INST(mode) != @symbol(writeonly)) {
 	    if (__bothSmallInteger(count, start)) {
@@ -1824,7 +1824,7 @@
 	    ^ super nextPutBytes:count from:anObject startingAt:start
 	].
     ].
-    filePointer isNil ifTrue:[^ self errorNotOpen].
+    handle isNil ifTrue:[^ self errorNotOpen].
     (mode == #writeonly) ifTrue:[^ self errorWriteOnly].
     self primitiveFailed
 !
@@ -2042,7 +2042,7 @@
     FILE *f;
     int fd;
 
-    if ((fp = __INST(filePointer)) != nil) {
+    if ((fp = __INST(handle)) != nil) {
 	f = __FILEVal(fp);
 	if (__INST(mode) != @symbol(readonly)) {
 	    if (__bothSmallInteger(count, start)) {
@@ -2385,8 +2385,8 @@
 	  }
 	  setbuf(f, NULL);
 	  __INST(buffered) = false;
-	  __INST(filePointer) = __MKOBJ(f);
-	  __STORESELF(filePointer);
+	  __INST(handle) = __MKOBJ(f);
+	  __STORESELF(handle);
 
 #if defined(PCM_ENABLE_OUTPUT) && defined(PCM_ENABLE_INPUT)
 # if defined(SNDCTL_DSP_SETTRIGGER)
@@ -2695,7 +2695,7 @@
 !SoundStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.70 2007-03-14 13:56:46 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.71 2009-10-28 20:59:16 cg Exp $'
 ! !
 
 SoundStream initialize!