--- a/SoundStream.st	Thu Nov 02 18:35:46 1995 +0100
+++ b/SoundStream.st	Thu Nov 02 21:11:39 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.15 1995-08-10 18:36:26 claus Exp $
+$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.16 1995-11-02 20:11:39 cg Exp $
 '!
 
 !SoundStream class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.15 1995-08-10 18:36:26 claus Exp $
+$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.16 1995-11-02 20:11:39 cg Exp $
 "
 !
 
@@ -70,7 +70,7 @@
 
 #ifdef IRIS_AUDIO
 # include <audio.h>
-# define MKAUDIO(o)  (ALport)(_intVal(o))
+# define _ALportVal(o)  (ALport)(__MKCP(o))
 #endif
 %}
 ! !
@@ -567,7 +567,7 @@
     ALsetparams(AL_DEFAULT_DEVICE, params, 6);
     p = ALopenport("smallchat", (char *)_stringVal(aMode), config);
     if (p) {
-	_INST(filePointer) = MKOBJ(p);
+	_INST(filePointer) = __MKOBJ(p);
     } else {
 	_INST(filePointer) = nil;
 	RETURN (nil);
@@ -654,7 +654,7 @@
 	    if (__bothSmallInteger(count, start)) {
 		cnt = _intVal(count);
 		offs = _intVal(start) - 1;
-		p = MKAUDIO(_INST(filePointer));
+		p = _ALportVal(_INST(filePointer));
 
 		/*
 		 * compute number of samples
@@ -701,7 +701,7 @@
 	    if (__bothSmallInteger(count, start)) {
 		cnt = _intVal(count);
 		offs = _intVal(start) - 1;
-		p = MKAUDIO(_INST(filePointer));
+		p = _ALportVal(_INST(filePointer));
 		objSize = _Size(anObject) - OHDR_SIZE;
 		if ((offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs))) {
 		    cp = (char *)_InstPtr(anObject) + OHDR_SIZE + offs;
@@ -734,7 +734,7 @@
     ALport p;
 
     if (_INST(filePointer) != nil) {
-	p = MKAUDIO(_INST(filePointer));
+	p = _ALportVal(_INST(filePointer));
 	while (ALgetfilled(p) > 0) {
 	    sginap(1);
 	}
@@ -758,7 +758,7 @@
     ].
 %{ 
 #ifdef IRIS_AUDIO
-    ALcloseport(MKAUDIO(_INST(filePointer)));
+    ALcloseport(_ALportVal(_INST(filePointer)));
 #endif
 %}
 ! !