hg/stx-libbasic2: comparison SoundStream.st

equal deleted inserted replaced

-:ddec037c4b4c
+:a45ac92afbc8
 "
 "{ Package: 'stx:libbasic2' }"
 FileStream subclass:#SoundStream
-	instanceVariableNames:'sampleRate numberOfChannels bitsPerSample audioFormat alPort
+	instanceVariableNames:'sampleRate numberOfChannels bitsPerSample audioFormat
 		handle1 handle2 bufferOffset bufferSize'
 	classVariableNames:'UnsupportedOperationSignal'
 	poolDictionaries:''
 	category:'Streams-External'
 !
 !SoundStream primitiveDefinitions!
 %{
+#ifdef WIN32
+# define xxxUSE_WIN32_DIRECTSOUND
+#endif
 #ifdef IRIS
 # ifndef IRIX5
-#  define IRIS_AUDIO
+#  define USE_IRIS_AUDIO
 # endif
 #endif
-#ifdef IRIS_AUDIO
+#ifndef USE_IRIS_AUDIO
+# ifndef USE_ALSA_AUDIO
+#  ifdef LINUX
+#   define USE_DEV_AUDIO
+#  endif
+# endif
+#endif
+#ifdef USE_IRIS_AUDIO
+# define IRIS_AUDIO
 # include <audio.h>
 # define __ALportVal(o)  (ALport)(__externalAddressVal(o))
+# define alPort handle1
 #endif
-#ifdef LINUX
+#ifdef USE_ALSA_AUDIO
-# include <stdio.h>
+# ifdef LINUX
-# include <sys/soundcard.h>
+#  define ALSA_AUDIO
-# define DEV_AUDIO_DEFAULT_FREQ (8000)
+#  include <alsa/asoundlib.h>
-# define DEV_AUDIO_DEFAULT_BUFFERSIZE (16384)
+#  define MAX_NR_OF_CHANNELS 8
-# define DEV_AUDIO
+#  define DEBUG_SOUND
+#  define readHandle handle1
+#  define writeHandle handle2
+# endif
 #endif
-#ifdef FREEBSD
+#ifdef USE_DEV_AUDIO
-# include <stdio.h>
+# ifdef LINUX
-# include <sys/time.h>
+#  include <stdio.h>
-# include <sys/ioctl.h>
+#  include <sys/soundcard.h>
-# include <machine/pcaudioio.h>
+#  define DEV_AUDIO_DEFAULT_FREQ (8000)
-# define DEV_AUDIO_DEFAULT_FREQ (8000)
+#  define DEV_AUDIO_DEFAULT_BUFFERSIZE (16384)
-# define DEV_AUDIO_DEFAULT_BUFFERSIZE (16384)
+#  define DEV_AUDIO
-# define DEV_AUDIO
+# endif
-#endif
+# ifdef FREEBSD
-#if defined(sunos) || defined(solaris)
+#  include <stdio.h>
-# include <stdio.h>
+#  include <sys/time.h>
-# ifdef solaris
+#  include <sys/ioctl.h>
-#  include <sys/audioio.h>
+#  include <machine/pcaudioio.h>
-# else
+#  define DEV_AUDIO_DEFAULT_FREQ (8000)
-#  include <sun/audioio.h>
+#  define DEV_AUDIO_DEFAULT_BUFFERSIZE (16384)
-# endif
+#  define DEV_AUDIO
-# define DEV_AUDIO_DEFAULT_FREQ (8000)
+# endif
-# define DEV_AUDIO_DEFAULT_BUFFERSIZE (16384)
-# define DEV_AUDIO
+# if defined(sunos) || defined(solaris)
-#endif
+#  include <stdio.h>
+#  ifdef solaris
-#if defined(hpux)
+#   include <sys/audioio.h>
-# include <stdio.h>
+#  else
-# include <sys/ioctl.h>
+#   include <sun/audioio.h>
-# include <sys/inode.h>
+#  endif
-# include <sys/audio.h>
+#  define DEV_AUDIO_DEFAULT_FREQ (8000)
-# include <sys/time.h>
+#  define DEV_AUDIO_DEFAULT_BUFFERSIZE (16384)
-# include <unistd.h>
+#  define DEV_AUDIO
-# define DEV_AUDIO_DEFAULT_FREQ (22050)
+# endif
-# define DEV_AUDIO_DEFAULT_BUFFERSIZE (16384)
-# define DEV_AUDIO
+# if defined(hpux)
-#endif
+#  include <stdio.h>
+#  include <sys/ioctl.h>
+#  include <sys/inode.h>
+#  include <sys/audio.h>
+#  include <sys/time.h>
+#  include <unistd.h>
+#  define DEV_AUDIO_DEFAULT_FREQ (22050)
+#  define DEV_AUDIO_DEFAULT_BUFFERSIZE (16384)
+#  define DEV_AUDIO
+# endif
+#endif /* USE_DEV_AUDIO */
 #ifndef WIN32
 # ifndef O_WRONLY
 #  include <sys/fcntl.h>
 # endif
-# ifndef EINTR
+# include <errno.h>
-#  include <errno.h>
-# endif
 #endif
 #ifdef WIN32
 # define _WIN32
 /* # include <stdarg.h> /* */
 # include <stdio.h> /* */
 # include <windows.h>
-# ifdef USE_DIRECTSOUND
+# ifdef USE_WIN32_DIRECTSOUND
+#  define WIN32_DIRECTSOUND
 #  define CINTERFACE
 #  include "dsound.h"
 #  define __DirectSoundVal(o) (LPDIRECTSOUND)(__externalAddressVal(o))
 #  define __DSBufferVal(o)    (LPDIRECTSOUNDBUFFER)(__externalAddressVal(o))
 #  define pDirectSound handle1
 #  define pDSBuffer    handle2
 # else /* USE WAVE... */
+#  define WIN32_WAVE
 #  define __WaveHandleVal(o)    (HWAVEOUT)(__externalAddressVal(o))
 #  define MAXBUF      10        /* Maximum number of buffers */
 #  define DATALEN     2048      /* Size of wave data buffer */
 struct buf {
 # define INT int
 #endif /* WIN32 */
+#ifdef DEBUG_SOUND
+# define DPRINTF(x) printf x
+#else
+# define DPRINTF(x) /* as nothing */
+#endif
 %}
 ! !
 !SoundStream primitiveFunctions!
 %{
-#ifdef WIN32
+#ifdef WIN32_WAVE
-# ifndef USE_DIRECTSOUND
 static void CALLBACK
 waveCallBack(HWAVE waveHandle, UINT msg, DWORD inst, DWORD p1, DWORD p2)
 {
 if (msg == MM_WOM_DONE) {
 	SetEvent(free_buffer_event);
 	LeaveCriticalSection(&free_list_lock);
 }
 }
-# endif
+#endif /* WIN32_WAVE */
-#endif
 %}
 ! !
 !SoundStream class methodsFor:'documentation'!
 int __stereo = __channels > 1;
 int __format = -1;
 if (0) {
 }
+else if (__INST(audioFormat) == @symbol(MU_LAW)) {
 #  ifdef AFMT_MU_LAW
-else if (__INST(audioFormat) == @symbol(MU_LAW)) {
 	__format = AFMT_MU_LAW;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(A_LAW)) {
 #  ifdef AFMT_A_LAW
-else if (__INST(audioFormat) == @symbol(A_LAW)) {
 	__format = AFMT_A_LAW;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(IMA_ADPCM)) {
 #  ifdef AFMT_IMA_ADPCM
-else if (__INST(audioFormat) == @symbol(IMA_ADPCM)) {
 	__format = AFMT_IMA_ADPCM;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(U8)) {
 #  ifdef AFMT_U8
-else if (__INST(audioFormat) == @symbol(U8)) {
 	__format = AFMT_U8;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(S16_LE)) {
 #  ifdef AFMT_S16_LE
-else if (__INST(audioFormat) == @symbol(S16_LE)) {
 	__format = AFMT_S16_LE;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(S16_BE)) {
 #  ifdef AFMT_S16_BE
-else if (__INST(audioFormat) == @symbol(S16_BE)) {
 	__format = AFMT_S16_BE;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(S8)) {
 #  ifdef AFMT_S8
-else if (__INST(audioFormat) == @symbol(S8)) {
 	__format = AFMT_S8;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(U16_LE)) {
 #  ifdef AFMT_U16_LE
-else if (__INST(audioFormat) == @symbol(U16_LE)) {
 	__format = AFMT_U16_LE;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(U16_BE)) {
 #  ifdef AFMT_U16_BE
-else if (__INST(audioFormat) == @symbol(U16_BE)) {
 	__format = AFMT_U16_BE;
-}
 #  endif
+}
+else if (__INST(audioFormat) == @symbol(MPEG)) {
 #  ifdef AFMT_MPEG
-else if (__INST(audioFormat) == @symbol(MPEG)) {
 	__format = AFMT_MPEG;
-}
 #  endif
-else {
-	__format = -1;
 }
 #if defined(DEV_AUDIO)
 channels = nil;
 blockSize = nil;
 	if (ioctl(f, SNDCTL_DSP_RESET, &__dummy) >= 0) {
 	    RETURN (self);
 	}
 # endif
 }
-#endif
+#endif /* DEV_AUDIO */
 %}.
 ^ UnsupportedOperationSignal raise
 "
 self writing resetSoundCard; dumpSettings; close
 if ((port = __INST(alPort)) != nil) {
 	__INST(alPort) = nil;
 	ALcloseport(__ALportVal(port));
 }
 RETURN (self);
-#endif
+#endif /* IRIS_AUDIO */
-#ifdef WIN32
+#ifdef WIN32_DIRECTSOUND
-# ifdef USE_DIRECTSOUND
 OBJ oDirectSound, oDSBuffer;
 LPDIRECTSOUND       t_pDirectSound;
 LPDIRECTSOUNDBUFFER t_pDSBuffer;
 if ((oDSBuffer = __INST(pDSBuffer)) != nil) {
 	t_pDirectSound = __DirectSoundVal(oDirectSound);
 	if (t_pDirectSound) {
 	    IDirectSound_Release(t_pDirectSound);
 	}
 }
-# else
+RETURN (self);
+#endif /* WIN32_DIRECTSOUND */
+#ifdef WIN32_WAVE
 struct buf *bp, *next;
 int r;
 HWAVEOUT t_waveHandle;
 OBJ oWaveHandle;
 if ((oWaveHandle = __INST(waveHandle)) != nil) {
 	t_waveHandle = __WaveHandleVal(oWaveHandle);
-#  ifdef NO_WAIT_IN_CLOSE
+# ifdef NO_WAIT_IN_CLOSE
 	/* Force cancellation of any pending buffers */
 	(void)waveOutReset(t_waveHandle);
-#  endif
+# endif
 	/* Wait until all pending buffers have been freed */
 	while (free_buffers < total_buffers) {
 	    WaitForSingleObject(free_buffer_event, INFINITE);
 	}
-#  ifndef NO_WAIT_IN_CLOSE
+# ifndef NO_WAIT_IN_CLOSE
 	/* Force cancellation of any pending buffers */
 	(void)waveOutReset(t_waveHandle);
-#  endif
+# endif
 	/* Close the device */
 	if ((r = waveOutClose(t_waveHandle)) != 0) {
 	    printf("waveOutClose\n");
 	    RETURN(self);
 	LeaveCriticalSection(&free_list_lock);
 	__INST(waveHandle) = nil;
 }
-# endif
 RETURN (self);
-#endif
+# endif /* WIN32_WAVE */
 #if defined(DEV_AUDIO)
 OBJ fp;
 int fd;
 FILE *f;
 	while (ALgetfilled(p) > 0) {
 	    sginap(1);
 	}
 }
 RETURN(self);
-#endif
+#endif /* IRIS_AUDIO */
 #if defined(DEV_AUDIO)
 if (__isSmallInteger(fd)) {
 	int f = __intVal(fd);
 	/* ... */
 }
-#endif
+#endif /* DEV_AUDIO */
 %}.
 "dont know how to wait on non-iris systems"
 ^ self
 !
 isOpen
-alPort notNil ifTrue:[^ true].
 handle1 notNil ifTrue:[^ true].
+handle2 notNil ifTrue:[^ true].
 ^ filePointer notNil
 !
 nextBytes:count into:anObject startingAt:start
 "read the next count bytes into an object and return the number of
 		}
 	    }
 	}
 }
 }
-#endif
+#endif /* IRIS_AUDIO */
 #if defined(DEV_AUDIO)
-#include <errno.h>
 /*
 * redefine to work around a bug in the linux sound driver;
 * if a write is interrupted (EINTR), it is not defined, how many
 * bytes have been read from the device.
 *
 		}
 		RETURN (count);
 	    }
 	}
 }
-#endif
+#endif /* DEV_AUDIO */
 %}.
 OperatingSystem getOSType = 'irix' ifFalse:[
 	OperatingSystem getOSType = 'win32' ifFalse:[
 	    ^ super nextPutBytes:count from:anObject startingAt:start
 		}
 	    }
 	}
 }
 }
-#endif /* SGI_AUDIO */
+#endif /* IRIS_AUDIO */
-#ifdef WIN32
+#ifdef WIN32_DIRECTSOUND
-# ifdef USE_DIRECTSOUND
 {
 HRESULT hr;
 DWORD status;
 LPVOID lpbuf1 = NULL;
 LPVOID lpbuf2 = NULL;
 DWORD dwsize1 = 0;
 DWORD dwsize2 = 0;
 DWORD playPos, safePos, endWrite;
 DWORD millis;
 OBJ oDirectSound, oDSBuffer;
 LPDIRECTSOUND       t_pDirectSound = (LPDIRECTSOUND)0;
 LPDIRECTSOUNDBUFFER t_pDSBuffer = (LPDIRECTSOUNDBUFFER)0;
 int t_cbBufOffset, t_cbBufSize;
 short *buf;
 int cnt, offs;
 if ((oDSBuffer = __INST(pDSBuffer)) != nil) {
-	  t_pDSBuffer = __DSBufferVal(oDSBuffer);
+	t_pDSBuffer = __DSBufferVal(oDSBuffer);
 }
 if ((oDirectSound = __INST(pDirectSound)) != nil) {
-	  t_pDirectSound = __DirectSoundVal(oDirectSound);
+	t_pDirectSound = __DirectSoundVal(oDirectSound);
 }
 if (!t_pDSBuffer || !t_pDirectSound) {
-	  fprintf(stderr, "SoundStream not open!\n");
+	fprintf(stderr, "SoundStream not open!\n");
-	  RETURN (0);
+	RETURN (0);
 }
 t_cbBufOffset = __intVal(__INST(bufferOffset));
 t_cbBufSize = __intVal(__INST(bufferSize));
 cnt = __intVal(count);
 offs = __intVal(start) - 1;
 buf = (short *)__InstPtr(anObject) + OHDR_SIZE + offs;
 // Should be playing, right?
 hr = IDirectSoundBuffer_GetStatus(t_pDSBuffer, &status );
 if (!(status && DSBSTATUS_PLAYING)) {
-	  fprintf(stderr, "Buffer not playing!\n");
+	fprintf(stderr, "Buffer not playing!\n");
-	  RETURN (0);
+	RETURN (0);
 }
 // Sleep until we have enough room in buffer.
 hr = IDirectSoundBuffer_GetCurrentPosition(t_pDSBuffer, &playPos, &safePos );
 if( hr != DS_OK ) {
-	  fprintf(stderr, "Cannot get position!\n");
+	fprintf(stderr, "Cannot get position!\n");
-	  RETURN (0);
+	RETURN (0);
 }
 if( playPos < t_cbBufOffset ) playPos += t_cbBufSize;
 endWrite = t_cbBufOffset + (cnt * sizeof(short));
 while ( playPos < endWrite ) {
-	  // Calculate number of milliseconds until we will have room, as
+	// Calculate number of milliseconds until we will have room, as
-	  // time = distance * (milliseconds/second) / ((bytes/sample) * (samples/second)),
+	// time = distance * (milliseconds/second) / ((bytes/sample) * (samples/second)),
-	  // rounded up.
+	// rounded up.
-	  millis = (DWORD) (1.0 + ((endWrite - playPos) * 1000.0) / ( sizeof(short) * __intVal(__INST(sampleRate))));
+	millis = (DWORD) (1.0 + ((endWrite - playPos) * 1000.0) / ( sizeof(short) * __intVal(__INST(sampleRate))));
-	  // Sleep for that long
+	// Sleep for that long
-	  Sleep( millis );
+	Sleep( millis );
-	  // Wake up, find out where we are now
+	// Wake up, find out where we are now
-	  hr = IDirectSoundBuffer_GetCurrentPosition(t_pDSBuffer, &playPos, &safePos );
+	hr = IDirectSoundBuffer_GetCurrentPosition(t_pDSBuffer, &playPos, &safePos );
-	  if( hr != DS_OK ) {
+	if( hr != DS_OK ) {
-	      fprintf(stderr, "Cannot get position!\n");
+	    fprintf(stderr, "Cannot get position!\n");
-	      RETURN (0);
+	    RETURN (0);
-	  }
+	}
-	  if( playPos < t_cbBufOffset ) playPos += t_cbBufSize; // unwrap offset
+	if( playPos < t_cbBufOffset ) playPos += t_cbBufSize; // unwrap offset
 }
 // Lock free space in the DS
 hr = IDirectSoundBuffer_Lock(t_pDSBuffer, t_cbBufOffset, cnt * sizeof(short), &lpbuf1, &dwsize1, &lpbuf2, &dwsize2, 0);
 if (hr == DS_OK) {
-	  // Copy the buffer into the DS
+	// Copy the buffer into the DS
-	  CopyMemory(lpbuf1, buf, dwsize1);
+	CopyMemory(lpbuf1, buf, dwsize1);
-	  if(NULL != lpbuf2) CopyMemory(lpbuf2, buf+dwsize1, dwsize2);
+	if(NULL != lpbuf2) CopyMemory(lpbuf2, buf+dwsize1, dwsize2);
-	  // Update our buffer offset and unlock sound buffer
+	// Update our buffer offset and unlock sound buffer
-	  t_cbBufOffset = (t_cbBufOffset + dwsize1 + dwsize2) % t_cbBufSize;
+	t_cbBufOffset = (t_cbBufOffset + dwsize1 + dwsize2) % t_cbBufSize;
-	  IDirectSoundBuffer_Unlock(t_pDSBuffer, lpbuf1, dwsize1, lpbuf2, dwsize2);
+	IDirectSoundBuffer_Unlock(t_pDSBuffer, lpbuf1, dwsize1, lpbuf2, dwsize2);
 }
 __INST(buffferOffset) = __MKSMALLINT(t_cbBufOffset);
 RETURN (count);
 }
-# else
+#endif /* WIN32_DIRECTSOUND */
+#ifdef WIN32_WAVE
 {
 struct buf *bp;
 int len, i, r;
 int dataLen, offs;
 char *buf;
 	buf += len;
 	dataLen -= len;
 }
 RETURN (count);
 }
-# endif
+#endif /* WIN32_WAVE */
-#endif /* WIN32 */
 #if defined(DEV_AUDIO)
-#include <errno.h>
 /*
 * redefine to work around a bug in the linux sound driver;
 * if a write is interrupted (EINTR), it is not defined, how many
 * bytes have been written to the device.
 * I.e. a retry of the write may lead to ever-playing without ever
 		}
 		RETURN (count);
 	    }
 	}
 }
-#endif
+#endif /* DEV_AUDIO */
 %}.
 ^ super nextPutBytes:count from:anObject startingAt:start
 !
 ok = true;
 goto out;
 }
 #endif /* IRIS_AUDIO */
-#ifdef WIN32
+#ifdef WIN32_DIRECTSOUND
-# ifdef USE_DIRECTSOUND
 {
 HRESULT result;
 LPDIRECTSOUND       t_pDirectSound;
 LPDIRECTSOUNDBUFFER t_pDSBuffer, t_pDSPrimeBuffer;
 WAVEFORMATEX        wfFormat;
 	t = __MKEXTERNALADDRESS(t_pDirectSound); __INST(pDirectSound) = t; __STORE(self, t);
 }
 ok = true;
 goto out;
 }
-# else /* !USE_DIRECTSOUND */
+#endif /* WIN32_DIRECTSOUND */
+#ifdef WIN32_WAVE
 {
 PCMWAVEFORMAT waveFormat;
 int r;
 HWAVEOUT t_waveHandle;
 OBJ oWaveHandle;
 	OBJ t;
 	t = __MKEXTERNALADDRESS(t_waveHandle); __INST(waveHandle) = t; __STORE(self, t);
 }
-#if 0
+# if 0
 /*
 * HACK: If we immediately start writing valid audio data to the device
 * then the sound is choppy in the beginning. Writing a null packet to
 * to the device first seems to fix this problem although I have no idea
 * why - DAC
 	for (i = 0; i < DATALEN; i++) {
 	    null[i] = 127;
 	}
 	audioWrite(null, DATALEN);
 }
-#endif /* 0 */
+# endif /* 0 */
 ok = true;
 goto out;
 }
-# endif /* !USE_DIRECTSOUND */
+#endif /* !WIN32_DIRECTSOUND */
-#endif /* WIN32 */
 #ifdef DEV_AUDIO
-	{
+{
-	    int __fd;
+int __fd;
-	    int __mode;
+int __mode;
-	    FILE *f;
+FILE *f;
-	    if (strcmp(__stringVal(aMode), "w") == 0) {
+if (strcmp(__stringVal(aMode), "w") == 0) {
-		__mode = O_WRONLY;
+	  __mode = O_WRONLY;
-	    } else if (strcmp(__stringVal(aMode), "r") == 0) {
+} else if (strcmp(__stringVal(aMode), "r") == 0) {
-		__mode = O_RDONLY;
+	  __mode = O_RDONLY;
-	    } else {
+} else {
-		__mode = O_RDWR;
+	  __mode = O_RDWR;
-	    }
+}
-	    do {
+do {
-		__BEGIN_INTERRUPTABLE__
+	  __BEGIN_INTERRUPTABLE__
-		__fd = open((char *) __stringVal(__INST(pathName)), __mode /* |O_NDELAY */);
+	  __fd = open((char *) __stringVal(__INST(pathName)), __mode /* |O_NDELAY */);
-		__END_INTERRUPTABLE__
+	  __END_INTERRUPTABLE__
-	    } while ((__fd < 0) && (__threadErrno == EINTR));
+} while ((__fd < 0) && (__threadErrno == EINTR));
-	    if (__fd >= 0) {
+if (__fd >= 0) {
-		/*
+	  /*
-		 * make it a FILE *
+	   * make it a FILE *
-		 */
+	   */
-		f = fdopen(__fd, __stringVal(aMode));
+	  f = fdopen(__fd, __stringVal(aMode));
-		if (! f) {
+	  if (! f) {
-		    __BEGIN_INTERRUPTABLE__
+	      __BEGIN_INTERRUPTABLE__
-		    close(__fd);
+	      close(__fd);
-		    __END_INTERRUPTABLE__
+	      __END_INTERRUPTABLE__
-		    ok = false;
+	      ok = false;
-		    goto out;
+	      goto out;
-		}
+	  }
-		setbuf(f, NULL);
+	  setbuf(f, NULL);
-		__INST(buffered) = false;
+	  __INST(buffered) = false;
-		__INST(filePointer) = __MKOBJ(f);
+	  __INST(filePointer) = __MKOBJ(f);
-		__STORESELF(filePointer);
+	  __STORESELF(filePointer);
 #if defined(PCM_ENABLE_OUTPUT) && defined(PCM_ENABLE_INPUT)
 # if defined(SNDCTL_DSP_SETTRIGGER)
-		if (__mode == O_RDWR) {
+	  if (__mode == O_RDWR) {
-		    int enable_bits = ~(PCM_ENABLE_OUTPUT|PCM_ENABLE_INPUT);
+	      int enable_bits = ~(PCM_ENABLE_OUTPUT|PCM_ENABLE_INPUT);
-		    if (ioctl(__fd, SNDCTL_DSP_SETTRIGGER, &enable_bits) == -1)
+	      if (ioctl(__fd, SNDCTL_DSP_SETTRIGGER, &enable_bits) == -1)
-		    {
+	      {
-			fprintf(stderr, "can't request synchronous start of fullduplex operation");
+		  fprintf(stderr, "can't request synchronous start of fullduplex operation");
-		    }
+	      }
-		}
+	  }
 # endif
 #endif
-		ok = true;
+	  ok = true;
-		goto out;
+	  goto out;
-	    }
+}
-	}
+}
 #endif /* DEV_AUDIO */
 out:;
 %}.
 ok == false ifTrue:[
 	self openError.
 	"not reached"
 ! !
 !SoundStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.67 2005-05-31 18:49:10 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/SoundStream.st,v 1.68 2005-12-22 16:55:51 cg Exp $'
 ! !
 SoundStream initialize!

changeset 1583	a45ac92afbc8
parent 1556	8a78c9a5a8f7
child 1839	c10cd58ec334