--- a/SoundStream.st	Fri Jul 11 14:48:15 2003 +0200
+++ b/SoundStream.st	Sat Jul 12 17:07:49 2003 +0200
@@ -272,8 +272,6 @@
     |newStream|
     newStream := (self basicNew) initialize.
     newStream openForReadWrite isNil ifTrue:[^nil].
-    newStream buffered:false.
-    newStream binary.
     ^ newStream
 
     "SoundStream readWrite"
@@ -285,8 +283,6 @@
     |newStream|
     newStream := (self basicNew) initialize.
     newStream openForReading isNil ifTrue:[^nil].
-    newStream buffered:false.
-    newStream binary.
     ^ newStream
 
     "SoundStream reading"
@@ -301,8 +297,6 @@
 
     newStream := (self basicNew) initialize.
     newStream openForWriting isNil ifTrue:[^nil].
-    newStream buffered:false.
-    newStream binary.
     ^ newStream
 
     "
@@ -320,8 +314,6 @@
     |newStream|
 
     newStream := (self basicNew) initialize.
-    newStream buffered:false.
-    newStream binary.
     newStream bitsPerSample:16.
     newStream openForWriting isNil ifTrue:[^nil].
     ^ newStream
@@ -339,11 +331,9 @@
     |newStream|
 
     OperatingSystem getCPUType ~= 'irix' ifTrue:[
-	self error:'unsupported audio mode'.
+        self error:'unsupported audio mode'.
     ].
     newStream := (self basicNew) initialize.
-    newStream buffered:false.
-    newStream binary.
     newStream bitsPerSample:16.
     newStream numberOfChannels:2.
     newStream openForWriting isNil ifTrue:[^nil].
@@ -743,7 +733,6 @@
 
     soundStream := self writing.
     soundStream isNil ifTrue:[self error:'cannot open sound device'].
-    soundStream buffered:false.
 
     startTime := AbsoluteTime now.
     totalCount := 0.
@@ -839,7 +828,7 @@
 
     fd := self fileDescriptor.
     fd isNil ifTrue:[
-        self error.
+        self errorNotOpen.
         ^ nil
     ].
     audioFormat == #S16 ifTrue:[
@@ -1038,6 +1027,7 @@
     "initialize for least common mode"
 
     buffered := false.
+    binary := true.
     bitsPerSample := self class defaultBitsPerSample.
     audioFormat := self class defaultAudioFormat.
     numberOfChannels := self class defaultNumberOfChannels.
@@ -1045,12 +1035,12 @@
     pathName := nil.
 
     OperatingSystem getOSType ~= 'win32' ifTrue:[
-	'/dev/audio' asFilename exists ifTrue:[
-	    "/
-	    "/ sunos or linux
-	    "/
-	    pathName := '/dev/audio'.
-	].
+        '/dev/audio' asFilename exists ifTrue:[
+            "/
+            "/ sunos or linux
+            "/
+            pathName := '/dev/audio'.
+        ].
     ].
 
     "Created: 17.11.1995 / 17:28:14 / cg"
@@ -1062,11 +1052,11 @@
     |fd|
 
     filePointer notNil ifTrue:[
-	fd := self fileDescriptor.
-	fd isNil ifTrue:[
-	    self error.
-	    ^ nil
-	]
+        fd := self fileDescriptor.
+        fd isNil ifTrue:[
+        self errorNotOpen.
+            ^ nil
+        ]
     ].
 %{
     int f = __intVal(fd);
@@ -1075,9 +1065,9 @@
 #if defined(DEV_AUDIO)
     if (__isSmallInteger(fd)) {
 # if defined(SNDCTL_DSP_RESET)
-	if (ioctl(f, SNDCTL_DSP_RESET, &__dummy) >= 0) {
-	    RETURN (self);
-	}
+        if (ioctl(f, SNDCTL_DSP_RESET, &__dummy) >= 0) {
+            RETURN (self);
+        }
 # endif
     }
 #endif
@@ -1098,7 +1088,7 @@
     filePointer notNil ifTrue:[
         fd := self fileDescriptor.
         fd isNil ifTrue:[
-            self error.
+            self errorNotOpen.
             ^ nil
         ]
     ].
@@ -1245,7 +1235,7 @@
     filePointer notNil ifTrue:[
         fd := self fileDescriptor.
         fd isNil ifTrue:[
-            self error.
+            self errorNotOpen.
             ^ nil
         ]
     ].
@@ -1304,11 +1294,11 @@
     |fd|
 
     filePointer notNil ifTrue:[
-	fd := self fileDescriptor.
-	fd isNil ifTrue:[
-	    self error.
-	    ^ nil
-	]
+        fd := self fileDescriptor.
+        fd isNil ifTrue:[
+            self errorNotOpen.
+            ^ nil
+        ]
     ].
 %{
     int f = __intVal(fd);
@@ -1316,19 +1306,19 @@
 
 #if defined(DEV_AUDIO) 
     if (__isSmallInteger(fd) && __isSmallInteger(blockSize)) {
-	__blockSize = __intVal(blockSize);
+        __blockSize = __intVal(blockSize);
 # if defined(SNDCTL_DSP_SETFRAGMENT)
-	if (ioctl(f, SNDCTL_DSP_SETFRAGMENT, &__blockSize) >= 0) {
-	    /* __INST(blockSize) = blockSize; */
-	    RETURN (self);
-	}
+        if (ioctl(f, SNDCTL_DSP_SETFRAGMENT, &__blockSize) >= 0) {
+            /* __INST(blockSize) = blockSize; */
+            RETURN (self);
+        }
 # endif
 # ifdef AUDIO_SET_CHANNELS /* hpux */
-	if (ioctl (f, AUDIO_SET_TXBUFSIZE, __blockSize)) {
-	    /* fprintf(stderr, "got err-ret from AUDIO_SET_TXBUFSIZE\n"); */
-	    /* __INST(blockSize) = blockSize; */
-	    RETURN (self);
-	}
+        if (ioctl (f, AUDIO_SET_TXBUFSIZE, __blockSize)) {
+            /* fprintf(stderr, "got err-ret from AUDIO_SET_TXBUFSIZE\n"); */
+            /* __INST(blockSize) = blockSize; */
+            RETURN (self);
+        }
 # endif
     }
 #endif
@@ -1345,7 +1335,7 @@
     filePointer notNil ifTrue:[
         fd := self fileDescriptor.
         fd isNil ifTrue:[
-            self error.
+            self errorNotOpen.
             ^ nil
         ]
     ].
@@ -1424,7 +1414,7 @@
 
     fd := self fileDescriptor.
     fd isNil ifTrue:[
-        self error.
+        self errorNotOpen.
         ^ nil
     ].
 %{
@@ -2702,7 +2692,7 @@
 !SoundStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.60 2003-03-02 18:43:32 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.61 2003-07-12 15:07:49 stefan Exp $'
 ! !
 
 SoundStream initialize!