aboutsummaryrefslogtreecommitdiff
path: root/desiredata/src
diff options
context:
space:
mode:
authorN.N. <matju@users.sourceforge.net>2009-06-03 02:18:06 +0000
committerN.N. <matju@users.sourceforge.net>2009-06-03 02:18:06 +0000
commit31017c90e2b59870e16e17991516b76b24ddc579 (patch)
tree01469b1b118b55f34601ae478463939e0bbd7d9b /desiredata/src
parent550aa4e2b25d759135a3e693ab18ec45f02db402 (diff)
remove references to "s_stuff.h"
svn path=/trunk/; revision=11641
Diffstat (limited to 'desiredata/src')
-rw-r--r--desiredata/src/s_audio.c1
-rw-r--r--desiredata/src/s_audio_alsa.c1
-rw-r--r--desiredata/src/s_audio_alsamm.c1
-rw-r--r--desiredata/src/s_audio_oss.c1
-rw-r--r--desiredata/src/s_audio_pa.c15
-rwxr-xr-xdesiredata/src/s_audio_portaudio.c1
6 files changed, 8 insertions, 12 deletions
diff --git a/desiredata/src/s_audio.c b/desiredata/src/s_audio.c
index 2b5072b6..b749cee0 100644
--- a/desiredata/src/s_audio.c
+++ b/desiredata/src/s_audio.c
@@ -8,7 +8,6 @@
#define PD_PLUSPLUS_FACE
#include "desire.h"
-#include "s_stuff.h"
#include "m_simd.h"
#include <stdio.h>
#ifdef UNISTD
diff --git a/desiredata/src/s_audio_alsa.c b/desiredata/src/s_audio_alsa.c
index ef68f451..2cbd7721 100644
--- a/desiredata/src/s_audio_alsa.c
+++ b/desiredata/src/s_audio_alsa.c
@@ -10,7 +10,6 @@
#include <alsa/asoundlib.h>
#include "desire.h"
-#include "s_stuff.h"
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/desiredata/src/s_audio_alsamm.c b/desiredata/src/s_audio_alsamm.c
index e3b629f7..1e20e9c1 100644
--- a/desiredata/src/s_audio_alsamm.c
+++ b/desiredata/src/s_audio_alsamm.c
@@ -15,7 +15,6 @@
*/
#include <alsa/asoundlib.h>
#include "desire.h"
-#include "s_stuff.h"
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/desiredata/src/s_audio_oss.c b/desiredata/src/s_audio_oss.c
index d68a6aa9..f6468df3 100644
--- a/desiredata/src/s_audio_oss.c
+++ b/desiredata/src/s_audio_oss.c
@@ -8,7 +8,6 @@
#define PD_PLUSPLUS_FACE
#include "desire.h"
-#include "s_stuff.h"
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/desiredata/src/s_audio_pa.c b/desiredata/src/s_audio_pa.c
index ba0278d2..3649e568 100644
--- a/desiredata/src/s_audio_pa.c
+++ b/desiredata/src/s_audio_pa.c
@@ -3,8 +3,7 @@
* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */
/* this file calls Ross Bencina's and Phil Burk's Portaudio package. It's
- the main way in for Mac OS and, with Michael Casey's help, also into
- ASIO in Windows. */
+ the main way in for Mac OS and, with Michael Casey's help, also into ASIO in Windows. */
/* tb: requires portaudio >= V19 */
@@ -48,6 +47,8 @@ static PaStreamCallback *pa_callback = NULL;
int process (const void *input, void *output, unsigned long frameCount, const PaStreamCallbackTimeInfo* timeInfo,
PaStreamCallbackFlags statusFlags, void *userData);
+/*int naudioindev, int * audioindev, int nchindev, int * chindev,
+int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, int rate, int dummy*/
int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode) {
PaError err;
int j, devno, pa_indev = -1, pa_outdev = -1;
@@ -165,14 +166,14 @@ const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, voi
sys_log_error(ERR_SYSLOCK);
return 0;
}
- for (j = 0; j < sys_inchannels; j++) {
+ for (int j=0; j<sys_inchannels; j++) {
t_sample * in = ((t_sample**)input)[j];
- copyvec(sys_soundin + j * sys_dacblocksize,in,sys_dacblocksize);
+ copyvec( sys_soundin + j * sys_dacblocksize,in,sys_dacblocksize);
}
sched_tick(sys_time + sys_time_per_dsp_tick);
- for (j = 0; j < sys_outchannels; j++) {
- t_sample * out = ((t_sample**)output)[j];
- copyvec(out,sys_soundout + j * sys_dacblocksize,sys_dacblocksize);
+ for (int j=0; j<sys_outchannels; j++) {
+ t_sample *out = ((t_sample**)output)[j];
+ copyvec(out,sys_soundout + j * sys_dacblocksize, sys_dacblocksize);
}
/* update peak meters */
if (sys_meters) sys_peakmeters();
diff --git a/desiredata/src/s_audio_portaudio.c b/desiredata/src/s_audio_portaudio.c
index 3690aba0..9303e468 100755
--- a/desiredata/src/s_audio_portaudio.c
+++ b/desiredata/src/s_audio_portaudio.c
@@ -11,7 +11,6 @@
/* tb: requires portaudio >= V19 */
#include "m_pd.h"
-#include "s_stuff.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>