From 7ddd3de44aa23ce3167cfa275341af9bfdc70c92 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Thu, 28 May 2009 00:40:24 +0000 Subject: reformat svn path=/trunk/; revision=11537 --- desiredata/src/s_audio_mmio.c | 389 +++++++++++++++++------------------------- 1 file changed, 160 insertions(+), 229 deletions(-) diff --git a/desiredata/src/s_audio_mmio.c b/desiredata/src/s_audio_mmio.c index 73fb20d0..9db21683 100644 --- a/desiredata/src/s_audio_mmio.c +++ b/desiredata/src/s_audio_mmio.c @@ -28,42 +28,29 @@ int nt_realdacblksize; #define DEFBUFFER 30 /* default is about 30x6 = 180 msec! */ static int nt_naudiobuffer = DEFBUFFER; -static int nt_meters; /* true if we're metering */ -static float nt_inmax; /* max input amplitude */ -static float nt_outmax; /* max output amplitude */ -static int nt_nwavein, nt_nwaveout; /* number of WAVE devices in and out */ +static int nt_meters; /* true if we're metering */ +static float nt_inmax, nt_outmax; /* max amplitude */ +static int nt_nwavein, nt_nwaveout; /* number of WAVE devices */ typedef struct _sbuf { HANDLE hData; HPSTR lpData; // pointer to waveform data memory HANDLE hWaveHdr; - WAVEHDR *lpWaveHdr; // pointer to header structure + WAVEHDR *lpWaveHdr; // pointer to header structure } t_sbuf; t_sbuf ntsnd_outvec[NAPORTS][MAXBUFFER]; /* circular buffer array */ +t_sbuf ntsnd_invec [NAPORTS][MAXBUFFER]; /* circular buffer array */ HWAVEOUT ntsnd_outdev[NAPORTS]; /* output device */ +HWAVEIN ntsnd_indev [NAPORTS]; /* input device */ static int ntsnd_outphase[NAPORTS]; /* index of next buffer to send */ +static int ntsnd_inphase [NAPORTS]; /* index of next buffer to read */ -t_sbuf ntsnd_invec[NAPORTS][MAXBUFFER]; /* circular buffer array */ -HWAVEIN ntsnd_indev[NAPORTS]; /* input device */ -static int ntsnd_inphase[NAPORTS]; /* index of next buffer to read */ - -static void nt_waveinerror(const char *s, int err) { - char t[256]; - waveInGetErrorText(err, t, 256); - error(s,t); -} - -static void nt_waveouterror(const char *s, int err) { - char t[256]; - waveOutGetErrorText(err, t, 256); - error(s,t); -} +static void nt_waveinerror( const char *s, int err) {char t[256]; waveInGetErrorText(err, t, 256); error(s,t);} +static void nt_waveouterror(const char *s, int err) {char t[256]; waveOutGetErrorText(err, t, 256); error(s,t);} static void wave_prep(t_sbuf *bp, int setdone) { WAVEHDR *wh; - short *sp; - int i; /* Allocate and lock memory for the waveform data. The memory for waveform data must be globally allocated with * GMEM_MOVEABLE and GMEM_SHARE flags. */ if (!(bp->hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, (DWORD) (CHANNELS_PER_DEVICE * SAMPSIZE * nt_realdacblksize)))) @@ -75,14 +62,15 @@ static void wave_prep(t_sbuf *bp, int setdone) { printf("alloc 2 failed\n"); if (!(wh = bp->lpWaveHdr = (WAVEHDR *) GlobalLock(bp->hWaveHdr))) printf("lock 2 failed\n"); - for (i = CHANNELS_PER_DEVICE * nt_realdacblksize, sp = (short *)bp->lpData; i--; ) *sp++ = 0; + short *sp = (short *)bp->lpData; + for (int i=CHANNELS_PER_DEVICE*nt_realdacblksize; i--; ) *sp++ = 0; wh->lpData = bp->lpData; - wh->dwBufferLength = (CHANNELS_PER_DEVICE * SAMPSIZE * nt_realdacblksize); + wh->dwBufferLength = CHANNELS_PER_DEVICE * SAMPSIZE * nt_realdacblksize; wh->dwFlags = 0; wh->dwLoops = 0L; wh->lpNext = 0; wh->reserved = 0; - /* optionally (for writing) set DONE flag as if we had queued them */ + /* optionally (for writing) set DONE flag as if we had queued them */ if (setdone) wh->dwFlags = WHDR_DONE; } @@ -90,9 +78,7 @@ static UINT nt_whichdac = WAVE_MAPPER, nt_whichadc = WAVE_MAPPER; int mmio_do_open_audio() { PCMWAVEFORMAT form; - int i, j; UINT mmresult; - int nad, nda; static int naudioprepped = 0, nindevsprepped = 0, noutdevsprepped = 0; if (sys_verbose) post("%d devices in, %d devices out", nt_nwavein, nt_nwaveout); form.wf.wFormatTag = WAVE_FORMAT_PCM; @@ -103,71 +89,62 @@ int mmio_do_open_audio() { form.wBitsPerSample = 8 * SAMPSIZE; if (nt_nwavein <= 1 && nt_nwaveout <= 1) nt_noresync(); if (nindevsprepped < nt_nwavein) { - for (i = nindevsprepped; i < nt_nwavein; i++) - for (j = 0; j < naudioprepped; j++) - wave_prep(&ntsnd_invec[i][j], 0); + for (int i=nindevsprepped; i nt_adcjitterbufsallowed ? - nt_dacjitterbufsallowed : nt_adcjitterbufsallowed) - * nt_realdacblksize / sys_getsr(); - diff = sys_getrealtime() - 0.001 * clock_gettimesince(initsystime); + double jittersec = max(nt_dacjitterbufsallowed,nt_adcjitterbufsallowed) * nt_realdacblksize / sys_getsr(); + double diff = sys_getrealtime() - 0.001 * clock_gettimesince(initsystime); if (diff > nt_hibuftime) nt_hibuftime = diff; - if (diff < nt_hibuftime - jittersec) { - post("jitter excess %d %f", dac, diff); - nt_resetmidisync(); - } + if (diff < nt_hibuftime - jittersec) {post("jitter excess %d %f", dac, diff); nt_resetmidisync();} } static double nt_midigettimefor(LARGE_INTEGER timestamp) { @@ -222,62 +190,49 @@ static int nt_fill = 0; #if 0 /* this is used for debugging */ static void nt_printaudiostatus() { - int nad, nda; - for (nad = 0; nad < nt_nwavein; nad++) { - int phase = ntsnd_inphase[nad]; - int phase2 = phase, phase3 = WRAPFWD(phase2), count, ntrans = 0; + for (int n=0; ndwFlags & WHDR_DONE); - int donenext = (ntsnd_invec[nad][phase3].lpWaveHdr->dwFlags & WHDR_DONE); - if (donethis && !donenext) { - if (firstphasebusy >= 0) goto multipleadc; - firstphasebusy = count; - } - if (!donethis && donenext) { - if (firstphasedone >= 0) goto multipleadc; - firstphasedone = count; - } + for (int count=0; countdwFlags & WHDR_DONE); + int donenext = (ntsnd_invec[n][phase3].lpWaveHdr->dwFlags & WHDR_DONE); + if (donethis && !donenext) {if (firstphasebusy >= 0) goto multipleadc; else firstphasebusy = count;} + if (!donethis && donenext) {if (firstphasedone >= 0) goto multipleadc; else firstphasedone = count;} phase2 = phase3; phase3 = WRAPFWD(phase2 + 1); } - post("nad %d phase %d busy %d done %d", nad, phase, firstphasebusy, firstphasedone); + post("nad %d phase %d busy %d done %d", n, phase, firstphasebusy, firstphasedone); continue; multipleadc: - startpost("nad %d phase %d: oops:", nad, phase); - for (count = 0; count < nt_naudiobuffer; count++) { + startpost("nad %d phase %d: oops:", n, phase); + for (int count=0; countdwFlags & WHDR_DONE)); + sprintf(buf, " %d", (ntsnd_invec[n][count].lpWaveHdr->dwFlags & WHDR_DONE)); poststring(buf); } endpost(); } - for (nda = 0; nda < nt_nwaveout; nda++) { - int phase = ntsnd_outphase[nad]; - int phase2 = phase, phase3 = WRAPFWD(phase2), count, ntrans = 0; + for (int n=0; ndwFlags & WHDR_DONE); - int donenext = (ntsnd_outvec[nda][phase3].lpWaveHdr->dwFlags & WHDR_DONE); - if (donethis && !donenext) { - if (firstphasebusy >= 0) goto multipledac; - firstphasebusy = count; - } - if (!donethis && donenext) { - if (firstphasedone >= 0) goto multipledac; - firstphasedone = count; - } + int donethis = (ntsnd_outvec[n][phase2].lpWaveHdr->dwFlags & WHDR_DONE); + int donenext = (ntsnd_outvec[n][phase3].lpWaveHdr->dwFlags & WHDR_DONE); + if (donethis && !donenext) {if (firstphasebusy >= 0) goto multipledac; else firstphasebusy = count;} + if (!donethis && donenext) {if (firstphasedone >= 0) goto multipledac; else firstphasedone = count;} phase2 = phase3; phase3 = WRAPFWD(phase2 + 1); } - if (firstphasebusy < 0) post("nda %d phase %d all %d", nda, phase, (ntsnd_outvec[nad][0].lpWaveHdr->dwFlags & WHDR_DONE)); - else post("nda %d phase %d busy %d done %d", nda, phase, firstphasebusy, firstphasedone); + if (firstphasebusy < 0) post("nda %d phase %d all %d", n, phase, (ntsnd_outvec[n][0].lpWaveHdr->dwFlags & WHDR_DONE)); + else post("nda %d phase %d busy %d done %d", n, phase, firstphasebusy, firstphasedone); continue; multipledac: - startpost("nda %d phase %d: oops:", nda, phase); + startpost("nda %d phase %d: oops:", n, phase); for (count = 0; count < nt_naudiobuffer; count++) { char buf[80]; - sprintf(buf, " %d", (ntsnd_outvec[nad][count].lpWaveHdr->dwFlags & WHDR_DONE)); + sprintf(buf, " %d", (ntsnd_outvec[n][count].lpWaveHdr->dwFlags & WHDR_DONE)); poststring(buf); } endpost(); @@ -285,50 +240,45 @@ static void nt_printaudiostatus() { } #endif /* 0 */ -/* this is a hack to avoid ever resyncing audio pointers in case for whatever -reason the sync testing below gives false positives. */ +/* this is a hack to avoid ever resyncing audio pointers in case for whatever reason the sync testing below gives false positives. */ static int nt_resync_cancelled; - -static void nt_noresync() { - nt_resync_cancelled = 1; -} +static void nt_noresync() {nt_resync_cancelled = 1;} static void nt_resyncaudio() { UINT mmresult; - int nad, nda, count; if (nt_resync_cancelled) return; /* for each open input device, eat all buffers which are marked ready. The next one will thus be "busy". */ post("resyncing audio"); - for (nad = 0; nad < nt_nwavein; nad++) { - int phase = ntsnd_inphase[nad]; - for (count = 0; count < MAXRESYNC; count++) { - WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; - if (!(inwavehdr->dwFlags & WHDR_DONE)) break; - if (inwavehdr->dwFlags & WHDR_PREPARED) waveInUnprepareHeader(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); - inwavehdr->dwFlags = 0L; - waveInPrepareHeader(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); - mmresult = waveInAddBuffer(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); + for (int n=0; ndwFlags & WHDR_DONE)) break; + if (h->dwFlags & WHDR_PREPARED) waveInUnprepareHeader(ntsnd_indev[n], h, sizeof(WAVEHDR)); + h->dwFlags = 0L; + waveInPrepareHeader(ntsnd_indev[n], h, sizeof(WAVEHDR)); + mmresult = waveInAddBuffer(ntsnd_indev[n], h, sizeof(WAVEHDR)); if (mmresult != MMSYSERR_NOERROR) nt_waveinerror("waveInAddBuffer: %s", mmresult); - ntsnd_inphase[nad] = phase = WRAPFWD(phase + 1); + ntsnd_inphase[n] = phase = WRAPFWD(phase+1); } - if (count == MAXRESYNC) post("resync error 1"); + if (count == MAXRESYNC) post("resync error at input"); } /* Each output buffer which is "ready" is filled with zeros and queued. */ - for (nda = 0; nda < nt_nwaveout; nda++) { - int phase = ntsnd_outphase[nda]; - for (count = 0; count < MAXRESYNC; count++) { - WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; - if (!(outwavehdr->dwFlags & WHDR_DONE)) break; - if (outwavehdr->dwFlags & WHDR_PREPARED) waveOutUnprepareHeader(ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); - outwavehdr->dwFlags = 0L; - memset((char *)(ntsnd_outvec[nda][phase].lpData), 0, (CHANNELS_PER_DEVICE * SAMPSIZE * nt_realdacblksize)); - waveOutPrepareHeader( ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); - mmresult = waveOutWrite(ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); + for (int n=0; ndwFlags & WHDR_DONE)) break; + if (h->dwFlags & WHDR_PREPARED) waveOutUnprepareHeader(ntsnd_outdev[n], h, sizeof(WAVEHDR)); + h->dwFlags = 0L; + memset((char *)(ntsnd_outvec[n][phase].lpData), 0, (CHANNELS_PER_DEVICE * SAMPSIZE * nt_realdacblksize)); + waveOutPrepareHeader( ntsnd_outdev[n], h, sizeof(WAVEHDR)); + mmresult = waveOutWrite(ntsnd_outdev[n], h, sizeof(WAVEHDR)); if (mmresult != MMSYSERR_NOERROR) nt_waveouterror("waveOutAddBuffer: %s", mmresult); - ntsnd_outphase[nda] = phase = WRAPFWD(phase + 1); + ntsnd_outphase[n] = phase = WRAPFWD(phase+1); } - if (count == MAXRESYNC) post("resync error 2"); + if (count == MAXRESYNC) post("resync error at output"); } #ifdef MIDI_TIMESTAMP nt_resetmidisync(); @@ -353,7 +303,7 @@ void nt_logerror(int which) { #endif } -int mmio_send_dacs() { +static int mmio_send_dacs() { UINT mmresult; if (!nt_nwavein && !nt_nwaveout) return 0; if (nt_meters) { @@ -373,25 +323,21 @@ int mmio_send_dacs() { /* the "fill pointer" nt_fill controls where in the next I/O buffers we will write and/or read. If it's zero, we first check whether the buffers are marked "done". */ if (!nt_fill) { - for (int nad=0; naddwFlags & WHDR_DONE)) goto idle; + for (int n=0; ndwFlags & WHDR_DONE)) goto idle; } - for (int nda=0; ndadwFlags & WHDR_DONE)) goto idle; + for (int n=0; ndwFlags & WHDR_DONE)) goto idle; } - for (int nad=0; naddwFlags & WHDR_PREPARED) waveInUnprepareHeader(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); + for (int n=0; ndwFlags & WHDR_PREPARED) waveInUnprepareHeader(ntsnd_indev[n], h, sizeof(WAVEHDR)); } - for (int nda=0; ndadwFlags & WHDR_PREPARED) waveOutUnprepareHeader(ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); + for (int n=0; ndwFlags & WHDR_PREPARED) waveOutUnprepareHeader(ntsnd_outdev[n], h, sizeof(WAVEHDR)); } } /* Convert audio output to fixed-point and put it in the output buffer. */ @@ -399,9 +345,9 @@ int mmio_send_dacs() { short *sp1, *sp2; float *fp1, *fp2; fp1 = sys_soundout; - for (int nda=0; ndadwFlags & WHDR_DONE) goto late; + for (int n=0; ndwFlags & WHDR_DONE) goto late; } - for (int nda=0; ndadwFlags & WHDR_DONE) goto late; + for (int n=0; ndwFlags & WHDR_DONE) goto late; } } return 1; @@ -460,15 +404,15 @@ late: return 1; idle: /* If more than nt_adcjitterbufsallowed ADC buffers are ready on any input device, resynchronize */ - for (int nad=0; naddwFlags & WHDR_DONE) {nt_resyncaudio(); return 0;} } /* test dac sync the same way */ - for (int nda=0; ndadwFlags & WHDR_DONE) {nt_resyncaudio(); return 0;} } #ifdef MIDI_TIMESTAMP @@ -479,26 +423,24 @@ idle: /* ------------------- public routines -------------------------- */ -int mmio_open_audio( +static int mmio_open_audio( int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, int rate, int dummy) /* IOhannes */ { - int nbuf; nt_realdacblksize = (sys_blocksize ? sys_blocksize : DEFREALDACBLKSIZE); - nbuf = sys_advance_samples/nt_realdacblksize; + int nbuf = sys_advance_samples/nt_realdacblksize; if (nbuf >= MAXBUFFER) { - post("pd: audio buffering maxed out to %d", (int)(MAXBUFFER * ((nt_realdacblksize * 1000.)/44100.))); + post("pd: audio buffering maxed out to %d", int(MAXBUFFER * ((nt_realdacblksize * 1000.)/44100.))); nbuf = MAXBUFFER; - } - else if (nbuf < 4) nbuf = 4; + } else if (nbuf < 4) nbuf = 4; post("%d audio buffers", nbuf); nt_naudiobuffer = nbuf; - if (nt_adcjitterbufsallowed > nbuf - 2) nt_adcjitterbufsallowed = nbuf - 2; - if (nt_dacjitterbufsallowed > nbuf - 2) nt_dacjitterbufsallowed = nbuf - 2; + if (nt_adcjitterbufsallowed > nbuf-2) nt_adcjitterbufsallowed = nbuf-2; + if (nt_dacjitterbufsallowed > nbuf-2) nt_dacjitterbufsallowed = nbuf-2; nt_nwavein = sys_inchannels / 2; nt_nwaveout = sys_outchannels / 2; nt_whichadc = (naudioindev < 1 ? (nt_nwavein > 1 ? WAVE_MAPPER : -1) : audioindev[0]); nt_whichdac = (naudiooutdev < 1 ? (nt_nwaveout > 1 ? WAVE_MAPPER : -1) : audiooutdev[0]); - if (naudiooutdev > 1 || naudioindev > 1) post("separate audio device choice not supported; using sequential devices."); + if (naudiooutdev>1 || naudioindev>1) post("separate audio device choice not supported; using sequential devices."); mmio_do_open_audio(); return 0; } @@ -506,43 +448,32 @@ int mmio_open_audio( #if 0 /* list the audio and MIDI device names */ void mmio_listdevs() { - UINT wRtn, ndevices; - unsigned int i; - ndevices = waveInGetNumDevs(); - for (i = 0; i < ndevices; i++) { - WAVEINCAPS wicap; - wRtn = waveInGetDevCaps(i, (LPWAVEINCAPS) &wicap, sizeof(wicap)); - if (wRtn) nt_waveinerror("waveInGetDevCaps: %s", wRtn); - else post("audio input device #%d: %s", i+1, wicap.szPname); + UINT ndevices = waveInGetNumDevs(); + for (unsigned i=0; i maxndev) ndev = maxndev; + int ndev = min(maxndev,int(waveInGetNumDevs())); *nindevs = ndev; - for (i = 0; i < ndev; i++) { - WAVEINCAPS wicap; - wRtn = waveInGetDevCaps(i, (LPWAVEINCAPS) &wicap, sizeof(wicap)); - sprintf(indevlist + i * devdescsize, (wRtn ? "???" : wicap.szPname)); + for (int i=0; i maxndev) ndev = maxndev; + ndev = min(maxndev,int(waveOutGetNumDevs())); *noutdevs = ndev; - for (i = 0; i < ndev; i++) { - WAVEOUTCAPS wocap; - wRtn = waveOutGetDevCaps(i, (LPWAVEOUTCAPS) &wocap, sizeof(wocap)); - sprintf(outdevlist + i * devdescsize, (wRtn ? "???" : wocap.szPname)); + for (int i=0; i