Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21562

Modified Files: Tag: desiredata m_sched.c s_audio_alsamm.c s_audio_oss.c Log Message: removed unused vars

Index: s_audio_oss.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_oss.c,v retrieving revision 1.6.4.2.2.2 retrieving revision 1.6.4.2.2.2.2.1 diff -C2 -d -r1.6.4.2.2.2 -r1.6.4.2.2.2.2.1 *** s_audio_oss.c 30 Nov 2005 13:36:58 -0000 1.6.4.2.2.2 --- s_audio_oss.c 20 Dec 2006 08:28:13 -0000 1.6.4.2.2.2.2.1 *************** *** 140,146 **** void oss_configure(t_oss_dev *dev, int srate, int dac, int skipblocksize) { /* IOhannes */ ! int orig, param, nblk, fd = dev->d_fd, wantformat; int nchannels = dev->d_nchannels; - int advwas = sys_schedadvance;

audio_buf_info ainfo; --- 140,145 ---- void oss_configure(t_oss_dev *dev, int srate, int dac, int skipblocksize) { /* IOhannes */ ! int orig, param, fd = dev->d_fd, wantformat; int nchannels = dev->d_nchannels;

audio_buf_info ainfo; *************** *** 276,283 **** int n, i, fd, flags; char buf[OSS_MAXSAMPLEWIDTH * sys_dacblocksize * OSS_MAXCHPERDEV]; - int num_devs = 0; int wantmore=0; - int spread = 0; - audio_buf_info ainfo;

linux_nindevs = linux_noutdevs = 0; --- 275,279 ---- *************** *** 552,556 **** static void oss_doresync( void) { ! int dev, zeroed = 0, wantsize; char buf[OSS_MAXSAMPLEWIDTH * sys_dacblocksize * OSS_MAXCHPERDEV]; audio_buf_info ainfo; --- 548,552 ---- static void oss_doresync( void) { ! int dev, zeroed = 0; char buf[OSS_MAXSAMPLEWIDTH * sys_dacblocksize * OSS_MAXCHPERDEV]; audio_buf_info ainfo; *************** *** 631,635 **** { float *fp1, *fp2; - long fill; int i, j, dev, rtnval = SENDDACS_YES; char buf[OSS_MAXSAMPLEWIDTH * sys_dacblocksize * OSS_MAXCHPERDEV]; --- 627,630 ---- *************** *** 676,680 **** if (linux_adcs[dev].d_space == 0) { - audio_buf_info ainfo; sys_microsleep(sys_sleepgrain); /* tb: changed to sys_sleepgrain */ oss_calcspace(); --- 671,674 ----

Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.21.2.2 retrieving revision 1.5.4.35.2.21.2.3 diff -C2 -d -r1.5.4.35.2.21.2.2 -r1.5.4.35.2.21.2.3 *** m_sched.c 8 Dec 2006 04:47:36 -0000 1.5.4.35.2.21.2.2 --- m_sched.c 20 Dec 2006 08:28:13 -0000 1.5.4.35.2.21.2.3 *************** *** 196,200 **** int sys_addhist(int phase) { ! int i, j, phasewas = sys_histphase; double newtime = sys_getrealtime(); int msec = (newtime - sys_histtime) * 1000.; --- 196,200 ---- int sys_addhist(int phase) { ! int j, phasewas = sys_histphase; double newtime = sys_getrealtime(); int msec = (newtime - sys_histtime) * 1000.; *************** *** 237,241 **** void glob_audiostatus(void) { ! int dev, nresync, nresyncphase, i; nresync = (oss_nresync >= NRESYNC ? NRESYNC : oss_nresync); nresyncphase = oss_resyncphase - 1; --- 237,241 ---- void glob_audiostatus(void) { ! int nresync, nresyncphase, i; nresync = (oss_nresync >= NRESYNC ? NRESYNC : oss_nresync); nresyncphase = oss_resyncphase - 1;

Index: s_audio_alsamm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_alsamm.c,v retrieving revision 1.1.4.5.2.2.2.1 retrieving revision 1.1.4.5.2.2.2.2 diff -C2 -d -r1.1.4.5.2.2.2.1 -r1.1.4.5.2.2.2.2 *** s_audio_alsamm.c 8 Dec 2006 06:36:12 -0000 1.1.4.5.2.2.2.1 --- s_audio_alsamm.c 20 Dec 2006 08:28:13 -0000 1.1.4.5.2.2.2.2 *************** *** 69,90 **** */

- /* the concept is holding data for each device - where a device is in and output and has one name. - - but since we can use only ins or only outs or both - on each hardware we list them in used_???device - for alsa seperated for inputs and outputs - - due the need to link in and out-device on one card - and do only one mmap prepare and start for in and out - the concept turns out to be not very efficient, - so i will change it maybe in future... - */ - - static int alsamm_incards = 0; - static t_alsa_dev *alsamm_indevice[ALSA_MAXDEV]; - static int alsamm_outcards = 0; - static t_alsa_dev *alsamm_outdevice[ALSA_MAXDEV]; - /* we need same samplerate, buffertime and so on for --- 69,72 ---- *************** *** 163,172 ****

/* protos */ ! static char *alsamm_getdev(int nr); ! ! static int set_hwparams(snd_pcm_t *handle, ! snd_pcm_hw_params_t *params, int *chs); ! static int set_swparams(snd_pcm_t *handle, ! snd_pcm_sw_params_t *swparams, int playback);

static int alsamm_start(void); --- 145,150 ----

/* protos */ ! static int set_hwparams(snd_pcm_t *handle, snd_pcm_hw_params_t *params, int *chs); ! static int set_swparams(snd_pcm_t *handle, snd_pcm_sw_params_t *swparams, int playback);

static int alsamm_start(void); *************** *** 185,190 **** { int err; - char devname[80]; - char *cardname; snd_pcm_hw_params_t* hw_params; snd_pcm_sw_params_t* sw_params; --- 163,166 ---- *************** *** 197,203 ****

int i; - short* tmp_buf; - unsigned int tmp_uint; - snd_pcm_hw_params_alloca(&hw_params); snd_pcm_sw_params_alloca(&sw_params); --- 173,176 ---- *************** *** 322,327 ****

for(i=0; i<(alsa_noutdev < alsa_nindev ? alsa_noutdev:alsa_nindev); i++){ - t_alsa_dev *ad = &alsa_outdev[i]; - if (alsa_outdev[i].a_devno == alsa_indev[i].a_devno){ if ((err = snd_pcm_link (alsa_indev[i].a_handle, --- 295,298 ---- *************** *** 430,434 **** unsigned int rrate; int err, dir; - int channels_allocated = 0;

/* choose all parameters */ --- 401,404 ---- *************** *** 861,868 **** int err = 0; int devno; ! int chn,nchns; ! ! const snd_pcm_channel_area_t *mm_areas; ! #ifdef ALSAMM_DEBUG if(sys_verbose) --- 831,835 ---- int err = 0; int devno; ! int chn; #ifdef ALSAMM_DEBUG if(sys_verbose) *************** *** 1068,1073 **** t_sample *fpo, *fpi, *fp1, *fp2; int i, err, devno; - - const snd_pcm_channel_area_t *my_areas; snd_pcm_sframes_t size; snd_pcm_sframes_t commitres; --- 1035,1038 ---- *************** *** 1369,1374 **** int err; snd_pcm_status_t *status; - snd_output_t *output = NULL; - snd_pcm_status_alloca(&status); if ((err = snd_pcm_status(handle, status)) < 0) { --- 1334,1337 ----