Pd-cvs July 2007

pd-cvs@lists.iem.at

20 participants
623 discussions

pd/src s_audio.c,1.5.4.16.2.20.2.14,1.5.4.16.2.20.2.15
by Mathieu Bouchard 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26721 Modified Files: Tag: desiredata s_audio.c Log Message: first use of a C++ standard library component, std::stdostream Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.20.2.14 retrieving revision 1.5.4.16.2.20.2.15 diff -C2 -d -r1.5.4.16.2.20.2.14 -r1.5.4.16.2.20.2.15 *** s_audio.c 9 Jul 2007 20:17:39 -0000 1.5.4.16.2.20.2.14 --- s_audio.c 9 Jul 2007 21:07:37 -0000 1.5.4.16.2.20.2.15 *************** *** 20,23 **** --- 20,24 ---- #include <string.h> #include <errno.h> + #include <sstream> #define SYS_DEFAULTCH 2 *************** *** 444,448 **** } - /* start an audio settings dialog window */ void glob_audio_properties(t_pd *dummy, t_floatarg flongform) { --- 445,448 ---- *************** *** 457,472 **** /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; ! int nindevs = 0, noutdevs = 0, canmulti = 0, i; ! char indevliststring[MAXNDEV*(DEVDESCSIZE+4)+80], ! outdevliststring[MAXNDEV*(DEVDESCSIZE+4)+80]; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! strcpy(indevliststring, "{"); ! for (i = 0; i < nindevs; i++) ! sprintf(indevliststring+strlen(indevliststring), "\"%s\" ", indevlist + i * DEVDESCSIZE); ! strcat(indevliststring, "}"); ! strcpy(outdevliststring, "{"); ! for (i = 0; i < noutdevs; i++) ! sprintf(outdevliststring+strlen(outdevliststring), "\"%s\" ", outdevlist + i * DEVDESCSIZE); ! strcat(outdevliststring, "}"); sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); --- 457,470 ---- /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; ! int nindevs = 0, noutdevs = 0, canmulti = 0; ! std::ostringstream indevliststring; ! std::ostringstream outdevliststring; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! indevliststring << "{"; ! for (int i=0; i<nindevs; i++) indevliststring << "{" << (indevlist + i*DEVDESCSIZE) << "} "; ! indevliststring << "}"; ! outdevliststring << "{"; ! for (int i=0; i<noutdevs; i++) outdevliststring << "{" << (outdevlist + i*DEVDESCSIZE) << "} "; ! outdevliststring << "}"; sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); *************** *** 491,496 **** audiooutchan4 = (naudiooutdev > 3 ? choutdev[3] : 0); sys_vgui("pdtk_audio_dialog %s {%d %d %d %d} {%d %d %d %d} %s {%d %d %d %d} {%d %d %d %d} %d %d %d %d %d\n", ! indevliststring, audioindev1, audioindev2, audioindev3, audioindev4, audioinchan1, audioinchan2, audioinchan3, audioinchan4, ! outdevliststring, audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4, rate, dacblocksize, advance, canmulti, flongform!=0); } --- 489,494 ---- audiooutchan4 = (naudiooutdev > 3 ? choutdev[3] : 0); sys_vgui("pdtk_audio_dialog %s {%d %d %d %d} {%d %d %d %d} %s {%d %d %d %d} {%d %d %d %d} %d %d %d %d %d\n", ! indevliststring.str().data(), audioindev1, audioindev2, audioindev3, audioindev4, audioinchan1, audioinchan2, audioinchan3, audioinchan4, ! outdevliststring.str().data(), audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4, rate, dacblocksize, advance, canmulti, flongform!=0); }

1 0

externals Makefile,1.149,1.150
by Hans-Christoph Steiner 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25327 Modified Files: Makefile Log Message: added moonlib to default build, and alphabetized the build order for the libraries so it's easy to tell where things are at when building Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.149 retrieving revision 1.150 diff -C2 -d -r1.149 -r1.150 *** Makefile 9 Jul 2007 20:57:12 -0000 1.149 --- Makefile 9 Jul 2007 21:04:06 -0000 1.150 *************** *** 125,129 **** # WARNING! this MUST be all on one line because the automatic package # building scripts rely on it being that way. ! LIB_TARGETS = boids bsaylor creb cxc cyclone deprecated ekext ext13 flatspace flib freeverb ggee hardware hcs iem_ambi iem_bin_ambi iemlib jasch_lib loaders mapping markex maxlib mjlib motex mrpeach msd oscx pan pddp pdogg pmpd sigpack smlib toxy unauthorized vbap zexy pdcontainer adaptive iem_delay iem_roomsim iem_spec2 iem_tab flashserver iemgui iem_adaptfilt iemmatrix iem_matrix iemxmlrpc earplug # this is for libraries that don't compile (yet) on all platforms --- 125,129 ---- # WARNING! this MUST be all on one line because the automatic package # building scripts rely on it being that way. ! LIB_TARGETS = adaptive boids bsaylor creb cxc cyclone deprecated earplug ekext ext13 flashserver flatspace flib freeverb ggee hardware hcs iem_ambi iem_bin_ambi iemlib iemgui iem_adaptfilt iemmatrix iem_matrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders mapping markex maxlib mjlib moonlib motex mrpeach msd oscx pan pdcontainer pddp pdogg pmpd sigpack smlib toxy unauthorized vbap zexy # this is for libraries that don't compile (yet) on all platforms

1 0

externals/moonlib/help joystik-help.pd,1.1.1.1,NONE
by Hans-Christoph Steiner 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/externals/moonlib/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24085/help Removed Files: joystik-help.pd Log Message: removed joystick since it does not build and it's probably very out of date anyway --- joystik-help.pd DELETED ---

1 0

externals/moonlib joystik.c,1.2,NONE
by Hans-Christoph Steiner 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/externals/moonlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24085 Removed Files: joystik.c Log Message: removed joystick since it does not build and it's probably very out of date anyway --- joystik.c DELETED ---

1 0

externals Makefile,1.148,1.149
by Hans-Christoph Steiner 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22206 Modified Files: Makefile Log Message: got moonlib compiling with some minor tweaks Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.148 retrieving revision 1.149 diff -C2 -d -r1.148 -r1.149 *** Makefile 11 Jun 2007 08:13:12 -0000 1.148 --- Makefile 9 Jul 2007 20:57:12 -0000 1.149 *************** *** 1551,1554 **** --- 1551,1590 ---- + + #------------------------------------------------------------------------------# + # MOONLIB + MOONLIB_NAME=moonlib + MOONLIB_OBJECTS := $(wildcard $(externals_src)/moonlib/*.c) + moonlib: $(MOONLIB_OBJECTS:.c=.$(EXTENSION)) + + moonlib_install: moonlib + install -d $(objectsdir)/$(MOONLIB_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(MOONLIB_NAME) \ + --author "Antoine Rousseau" \ + --version "0.2" + install -p $(MOONLIB_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(MOONLIB_NAME) + install -d $(helpdir)/$(MOONLIB_NAME) + install -p $(externals_src)/moonlib/help/*.pd $(helpdir)/$(MOONLIB_NAME) + install -p $(externals_src)/moonlib/help/*.gif $(helpdir)/$(MOONLIB_NAME) + install -d $(helpdir)/$(MOONLIB_NAME)/d + install -p $(externals_src)/moonlib/help/d/*.gif $(helpdir)/$(MOONLIB_NAME)/d + # install -d $(manualsdir)/$(MOONLIB_NAME) + # install -p $(externals_src)/moonlib/manual.txt \ + # $(manualsdir)/$(MOONLIB_NAME) + install -d $(readmesdir) + install -p $(externals_src)/moonlib/README.txt \ + $(readmesdir)/$(MOONLIB_NAME).txt + install -d $(examplesdir)/$(MOONLIB_NAME) + # install -p $(externals_src)/moonlib/examples/*.pd \ + # $(examplesdir)/$(MOONLIB_NAME) + + moonlib_clean: + -rm -f -- $(MOONLIB_OBJECTS:.c=.$(EXTENSION)) + -rm -f -- $(MOONLIB_OBJECTS:.c=.o) + -rm -f -- $(externals_src)/moonlib/*.bak + -rm -f -- $(externals_src)/moonlib/*.*~ + + + #------------------------------------------------------------------------------# # MOTEX

1 0

externals/moonlib dinlet~.c, 1.1.1.1, 1.2 joystik.c, 1.1.1.1, 1.2 wac.c, 1.1.1.1, 1.2
by Hans-Christoph Steiner 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/externals/moonlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22206/moonlib Modified Files: dinlet~.c joystik.c wac.c Log Message: got moonlib compiling with some minor tweaks Index: dinlet~.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/dinlet~.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dinlet~.c 9 Jul 2007 20:45:57 -0000 1.1.1.1 --- dinlet~.c 9 Jul 2007 20:57:12 -0000 1.2 *************** *** 122,126 **** t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->x_canvas = canvas_getcurrent(); ! x->x_inlet = canvas_addinlet(x->x_canvas, &x->x_obj.ob_pd, &s_signal,0); x->x_endbuf = x->x_buf = (t_float *)getbytes(0); x->x_bufsize = 0; --- 122,126 ---- t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->x_canvas = canvas_getcurrent(); ! x->x_inlet = canvas_addinlet(x->x_canvas, &x->x_obj.ob_pd, &s_signal); x->x_endbuf = x->x_buf = (t_float *)getbytes(0); x->x_bufsize = 0; Index: joystik.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/joystik.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** joystik.c 9 Jul 2007 20:45:57 -0000 1.1.1.1 --- joystik.c 9 Jul 2007 20:57:12 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + #ifdef __gnu_linux__ /* 'pd_joystik' (An external library for Miller Puckette's 'PD' software *************** *** 190,191 **** --- 191,193 ---- } + #endif /* __gnu_linux__ */ Index: wac.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/wac.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** wac.c 9 Jul 2007 20:45:58 -0000 1.1.1.1 --- wac.c 9 Jul 2007 20:57:12 -0000 1.2 *************** *** 3,7 **** */ ! #include <m_imp.h> #include <sys/types.h> --- 3,8 ---- */ ! #include <m_pd.h> ! #include <s_stuff.h> #include <sys/types.h>

1 0

pd/src s_audio.c, 1.5.4.16.2.20.2.13, 1.5.4.16.2.20.2.14 desire.tk, 1.1.2.600.2.210, 1.1.2.600.2.211
by Mathieu Bouchard 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4479 Modified Files: Tag: desiredata s_audio.c desire.tk Log Message: simplify pdtk_audio_dialog Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.210 retrieving revision 1.1.2.600.2.211 diff -C2 -d -r1.1.2.600.2.210 -r1.1.2.600.2.211 *** desire.tk 9 Jul 2007 20:10:02 -0000 1.1.2.600.2.210 --- desire.tk 9 Jul 2007 20:17:39 -0000 1.1.2.600.2.211 *************** *** 7292,7305 **** } ! proc pdtk_audio_dialog {id indevlist indev1 indev2 indev3 indev4 \ ! inchan1 inchan2 inchan3 inchan4 \ ! outdevlist outdev1 outdev2 outdev3 outdev4 \ ! outchan1 outchan2 outchan3 outchan4 \ ! sr dspblock advance multi longform} { ! pdrc audio_properties $indevlist [list $indev1 $indev2 $indev3 $indev4] \ ! [list $inchan1 $inchan2 $inchan3 $inchan4] \ ! $outdevlist [list $outdev1 $outdev2 $outdev3 $outdev4] \ ! [list $outchan1 $outchan2 $outchan3 $outchan4] $sr $dspblock \ ! $advance $multi } --- 7292,7297 ---- } ! proc pdtk_audio_dialog {indevlist indevs inchans outdevlist outdevs outchans sr dspblock advance multi longform} { ! pdrc audio_properties $indevlist $indevs $inchans $outdevlist $outdevs $outchans $sr $dspblock $advance $multi } Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.20.2.13 retrieving revision 1.5.4.16.2.20.2.14 diff -C2 -d -r1.5.4.16.2.20.2.13 -r1.5.4.16.2.20.2.14 *** s_audio.c 9 Jul 2007 17:41:02 -0000 1.5.4.16.2.20.2.13 --- s_audio.c 9 Jul 2007 20:17:39 -0000 1.5.4.16.2.20.2.14 *************** *** 4,8 **** /* machine-independent (well, mostly!) audio layer. Stores and recalls ! audio settings from argparse routine and from dialog window. */ --- 4,8 ---- /* machine-independent (well, mostly!) audio layer. Stores and recalls ! audio settings from argparse routine and from dialog window. */ *************** *** 25,29 **** typedef long t_pa_sample; #define SYS_SAMPLEWIDTH sizeof(t_pa_sample) ! #define SYS_BYTESPERCHAN (sys_dacblocksize * SYS_SAMPLEWIDTH) #define SYS_XFERSAMPS (SYS_DEFAULTCH*sys_dacblocksize) #define SYS_XFERSIZE (SYS_SAMPLEWIDTH * SYS_XFERSAMPS) --- 25,29 ---- typedef long t_pa_sample; #define SYS_SAMPLEWIDTH sizeof(t_pa_sample) ! #define SYS_BYTESPERCHAN (sys_dacblocksize * SYS_SAMPLEWIDTH) #define SYS_XFERSAMPS (SYS_DEFAULTCH*sys_dacblocksize) #define SYS_XFERSIZE (SYS_SAMPLEWIDTH * SYS_XFERSAMPS) *************** *** 61,67 **** } ! static void audio_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int *canmulti, ! int maxndev, int devdescsize); /* these are set in this file when opening audio, but then may be reduced, --- 61,66 ---- } ! static void audio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, ! int devdescsize); /* these are set in this file when opening audio, but then may be reduced, *************** *** 109,115 **** static int audio_isopen(void) { ! return (audio_state && ! ((audio_naudioindev > 0 && audio_audiochindev[0] > 0) ! || (audio_naudiooutdev > 0 && audio_audiochoutdev[0] > 0))); } --- 108,114 ---- static int audio_isopen(void) { ! return audio_state ! && ((audio_naudioindev > 0 && audio_audiochindev[0] > 0) ! || (audio_naudiooutdev > 0 && audio_audiochoutdev[0] > 0)); } *************** *** 119,127 **** int *prate, int *pdacblocksize, int *padvance, int *pscheduler) { - int i; *pnaudioindev = audio_naudioindev; *pnaudiooutdev = audio_naudiooutdev; ! for (i = 0; i < MAXAUDIOINDEV; i++) paudioindev[i] = audio_audioindev[i], chindev[i] = audio_audiochindev[i]; ! for (i = 0; i < MAXAUDIOOUTDEV; i++) paudiooutdev[i] = audio_audiooutdev[i], choutdev[i] = audio_audiochoutdev[i]; *prate = audio_rate; *pdacblocksize = audio_dacblocksize; --- 118,125 ---- int *prate, int *pdacblocksize, int *padvance, int *pscheduler) { *pnaudioindev = audio_naudioindev; *pnaudiooutdev = audio_naudiooutdev; ! for (int i=0; i<MAXAUDIOINDEV; i++) {paudioindev[i] = audio_audioindev[i]; chindev[i] = audio_audiochindev[i]; } ! for (int i=0; i<MAXAUDIOOUTDEV; i++) {paudiooutdev[i] = audio_audiooutdev[i]; choutdev[i] = audio_audiochoutdev[i];} *prate = audio_rate; *pdacblocksize = audio_dacblocksize; *************** *** 131,143 **** void sys_save_audio_params( ! int naudioindev, int *audioindev, int *chindev, ! int naudiooutdev, int *audiooutdev, int *choutdev, ! int rate, int dacblocksize, int advance, int scheduler) ! { ! int i; audio_naudioindev = naudioindev; audio_naudiooutdev = naudiooutdev; ! for (i = 0; i < MAXAUDIOINDEV; i++) audio_audioindev[i] = audioindev[i], audio_audiochindev[i] = chindev[i]; ! for (i = 0; i < MAXAUDIOOUTDEV; i++) audio_audiooutdev[i] = audiooutdev[i], audio_audiochoutdev[i] = choutdev[i]; audio_rate = rate; audio_dacblocksize = dacblocksize; --- 129,139 ---- void sys_save_audio_params( ! int naudioindev, int *audioindev, int *chindev, ! int naudiooutdev, int *audiooutdev, int *choutdev, ! int rate, int dacblocksize, int advance, int scheduler) { audio_naudioindev = naudioindev; audio_naudiooutdev = naudiooutdev; ! for (int i=0; i<MAXAUDIOINDEV; i++) audio_audioindev[i] = audioindev[i], audio_audiochindev[i] = chindev[i]; ! for (int i=0; i<MAXAUDIOOUTDEV; i++) audio_audiooutdev[i] = audiooutdev[i], audio_audiochoutdev[i] = choutdev[i]; audio_rate = rate; audio_dacblocksize = dacblocksize; *************** *** 152,157 **** #endif ! static void audio_init( void) ! { static int initted = 0; if (initted) --- 148,152 ---- #endif ! static void audio_init() { static int initted = 0; if (initted) *************** *** 161,165 **** oss_init(); #endif ! } /* set channels and sample rate. */ --- 156,160 ---- oss_init(); #endif ! } /* set channels and sample rate. */ *************** *** 217,221 **** int indevs = 0, outdevs = 0, canmulti = 0; audio_getdevs(indevlist, &indevs, outdevlist, &outdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! /* jsarlo { (*/ if (sys_externalschedlib) return; --- 212,216 ---- int indevs = 0, outdevs = 0, canmulti = 0; audio_getdevs(indevlist, &indevs, outdevlist, &outdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! /* jsarlo { (*/ if (sys_externalschedlib) return; *************** *** 231,235 **** audio device vector, or vice versa, we fill the shorter one in to match the longer one. Also, if both are empty, we fill in ! one device (the default) and two channels. */ if (naudioindev == -1) { /* no input audio devices specified */ if (nchindev == -1) { --- 226,230 ---- audio device vector, or vice versa, we fill the shorter one in to match the longer one. Also, if both are empty, we fill in ! one device (the default) and two channels. */ if (naudioindev == -1) { /* no input audio devices specified */ if (nchindev == -1) { *************** *** 306,310 **** #ifdef USEAPI_PORTAUDIO if (sys_audioapi == API_PORTAUDIO) ! pa_open_audio(inchans, outchans, rate, advance, (naudiooutdev > 0 ? audioindev[0] : 0), (naudiooutdev > 0 ? audiooutdev[0] : 0), schedmode); --- 301,305 ---- #ifdef USEAPI_PORTAUDIO if (sys_audioapi == API_PORTAUDIO) ! pa_open_audio(inchans, outchans, rate, advance, (naudiooutdev > 0 ? audioindev[0] : 0), (naudiooutdev > 0 ? audiooutdev[0] : 0), schedmode); *************** *** 312,316 **** #endif #ifdef USEAPI_JACK ! if (sys_audioapi == API_JACK) jack_open_audio((naudioindev > 0 ? realinchans[0] : 0), (naudiooutdev > 0 ? realoutchans[0] : 0), rate, schedmode); --- 307,311 ---- #endif #ifdef USEAPI_JACK ! if (sys_audioapi == API_JACK) jack_open_audio((naudioindev > 0 ? realinchans[0] : 0), (naudiooutdev > 0 ? realoutchans[0] : 0), rate, schedmode); *************** *** 495,509 **** audiooutchan3 = (naudiooutdev > 2 ? choutdev[2] : 0); audiooutchan4 = (naudiooutdev > 3 ? choutdev[3] : 0); ! sys_vgui("pdtk_audio_dialog %%s \ ! %s %d %d %d %d %d %d %d %d \ ! %s %d %d %d %d %d %d %d %d \ ! %d %d %d %d %d\n", ! indevliststring, ! audioindev1, audioindev2, audioindev3, audioindev4, ! audioinchan1, audioinchan2, audioinchan3, audioinchan4, ! outdevliststring, ! audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, ! audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4, ! rate, dacblocksize, advance, canmulti, (flongform != 0)); } --- 490,497 ---- audiooutchan3 = (naudiooutdev > 2 ? choutdev[2] : 0); audiooutchan4 = (naudiooutdev > 3 ? choutdev[3] : 0); ! sys_vgui("pdtk_audio_dialog %s {%d %d %d %d} {%d %d %d %d} %s {%d %d %d %d} {%d %d %d %d} %d %d %d %d %d\n", ! indevliststring, audioindev1, audioindev2, audioindev3, audioindev4, audioinchan1, audioinchan2, audioinchan3, audioinchan4, ! outdevliststring, audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4, ! rate, dacblocksize, advance, canmulti, flongform!=0); } *************** *** 655,659 **** int rate, dacblocksize, advance, scheduler; if (f == sys_getsr()) return; ! sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); sys_close_audio(); --- 643,647 ---- int rate, dacblocksize, advance, scheduler; if (f == sys_getsr()) return; ! sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); sys_close_audio(); *************** *** 685,689 **** int rate, dacblocksize, advance, scheduler; if ((int)f == audio_dacblocksize) return; ! sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); sys_close_audio(); --- 673,677 ---- int rate, dacblocksize, advance, scheduler; if ((int)f == audio_dacblocksize) return; ! sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); sys_close_audio();

1 0

pd/src desire.tk,1.1.2.600.2.209,1.1.2.600.2.210
by Mathieu Bouchard 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv929 Modified Files: Tag: desiredata desire.tk Log Message: remove extra backslashes (let's say maximum line length is approx 128 chars) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.209 retrieving revision 1.1.2.600.2.210 diff -C2 -d -r1.1.2.600.2.209 -r1.1.2.600.2.210 *** desire.tk 9 Jul 2007 17:07:16 -0000 1.1.2.600.2.209 --- desire.tk 9 Jul 2007 20:10:02 -0000 1.1.2.600.2.210 *************** *** 774,779 **** meterbutton meters ctrls_meter_on {netsend [list pd meters $ctrls_meter_on]} } { ! pack [checkbutton .controls.$w -text [say $x] \ ! -variable $y -anchor w -command $z] -side left } button .controls.clear -text [say console_clear] -command {.log.1 delete 0.0 end} -padx 2 -pady 0 --- 774,778 ---- meterbutton meters ctrls_meter_on {netsend [list pd meters $ctrls_meter_on]} } { ! pack [checkbutton .controls.$w -text [say $x] -variable $y -anchor w -command $z] -side left } button .controls.clear -text [say console_clear] -command {.log.1 delete 0.0 end} -padx 2 -pady 0 *************** *** 993,998 **** def Client open_file {} { global pd_opendir patch_filetypes ! set filename [tk_getOpenFile -defaultextension .pd \ ! -filetypes $patch_filetypes -initialdir $pd_opendir] if {$filename != ""} {$self open_file_really $filename} } --- 992,996 ---- def Client open_file {} { global pd_opendir patch_filetypes ! set filename [tk_getOpenFile -defaultextension .pd -filetypes $patch_filetypes -initialdir $pd_opendir] if {$filename != ""} {$self open_file_really $filename} } *************** *** 1038,1043 **** if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)} } ! $menu add command -label [say $name] -command "$self $name" \ ! -accelerator [accel_munge $k] } } --- 1036,1040 ---- if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)} } ! $menu add command -label [say $name] -command "$self $name" -accelerator [accel_munge $k] } } *************** *** 1396,1401 **** def Canvas print {} { ! set filename [tk_getSaveFile -initialfile pd.ps -defaultextension .ps \ ! -filetypes { {{postscript} {.ps}} }] if {$filename != ""} {[$self widget] postscript -file $filename} } --- 1393,1397 ---- def Canvas print {} { ! set filename [tk_getSaveFile -initialfile pd.ps -defaultextension .ps -filetypes { {{postscript} {.ps}} }] if {$filename != ""} {[$self widget] postscript -file $filename} } *************** *** 1412,1417 **** def Client documentation {} { ! set filename [tk_getOpenFile -defaultextension .pd \ ! -filetypes { {{documentation} {.pd .txt .htm}} } -initialdir $::docdir] if {$filename != ""} { if {[string first .txt $filename] >= 0} { --- 1408,1412 ---- def Client documentation {} { ! set filename [tk_getOpenFile -defaultextension .pd -filetypes { {{documentation} {.pd .txt .htm}} } -initialdir $::docdir] if {$filename != ""} { if {[string first .txt $filename] >= 0} { *************** *** 1457,1462 **** frame $w.1 frame $w.2 ! pack [text $w.1.text -relief raised -bd 2 \ ! -yscrollcommand "$w.1.scroll set"] -side left -fill both -expand 1 pack [scrollbar $w.1.scroll -command "$w.1.text yview"] -side right -fill y pack [button $w.2.close -text [say close] -command "destroy $w"] -side right --- 1452,1456 ---- frame $w.1 frame $w.2 ! pack [text $w.1.text -relief raised -bd 2 -yscrollcommand "$w.1.scroll set"] -side left -fill both -expand 1 pack [scrollbar $w.1.scroll -command "$w.1.text yview"] -side right -fill y pack [button $w.2.close -text [say close] -command "destroy $w"] -side right *************** *** 2174,2179 **** if {$@gop} { # this was to test if a canvas is graphical array.... ! #if {[llength $@children] != 1 && \ ! # [[lindex $@children 0] class] != "Array"} {$self gop_rect} $self gop_rect } --- 2168,2172 ---- if {$@gop} { # this was to test if a canvas is graphical array.... ! #if {[llength $@children] != 1 && [[lindex $@children 0] class] != "Array"} {$self gop_rect} $self gop_rect } *************** *** 2210,2215 **** set t [[$self get_canvas] widget].${self}text if {![winfo exists $t]} {$self draw_edit} ! $self item text window [l+ $@textoffset [$self xy]] \ ! -window $t -anchor nw -tags "${self}text $self text" } else { set text [$self filter_text] --- 2203,2207 ---- set t [[$self get_canvas] widget].${self}text if {![winfo exists $t]} {$self draw_edit} ! $self item text window [l+ $@textoffset [$self xy]] -window $t -anchor nw -tags "${self}text $self text" } else { set text [$self filter_text] *************** *** 2261,2266 **** $@canvas focus= $self mset {cx cy} [$self xy] ! $self item text window [l+ $@textoffset [$self xy]] \ ! -window $t -anchor nw -tags "${self}text $self text" $t configure -pady 0 -padx 0 $t insert 1.0 $@text --- 2253,2257 ---- $@canvas focus= $self mset {cx cy} [$self xy] ! $self item text window [l+ $@textoffset [$self xy]] -window $t -anchor nw -tags "${self}text $self text" $t configure -pady 0 -padx 0 $t insert 1.0 $@text *************** *** 3020,3025 **** set x [expr [$c canvasx $x]/$zoom] set y [expr [$c canvasy $y]/$zoom] ! set tags [$c gettags [lindex [$c find overlapping \ ! [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]] set target [$@canvas identify_target $x $y -1] mset {type id detail} $target --- 3011,3015 ---- set x [expr [$c canvasx $x]/$zoom] set y [expr [$c canvasy $y]/$zoom] ! set tags [$c gettags [lindex [$c find overlapping [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]] set target [$@canvas identify_target $x $y -1] mset {type id detail} $target *************** *** 3156,3161 **** switch $type { text { ! entry $f.$name -width 10 -relief flat -bg white -borderwidth 0 \ ! -highlightthickness 0 bind $f.$name <Escape> "findmodel delete" bind $f.$name <Return> "$self find" --- 3146,3150 ---- switch $type { text { ! entry $f.$name -width 10 -relief flat -bg white -borderwidth 0 -highlightthickness 0 bind $f.$name <Escape> "findmodel delete" bind $f.$name <Return> "$self find" *************** *** 3225,3230 **** label $f.cmd_l -text Command: -font {helvetica -10} -pady 0 pack $f.cmd_l -side left ! entry $f.cmd -width 30 -relief flat -bg white -borderwidth 0 \ ! -highlightthickness 0 bind $f.cmd <Escape> "$self delete" bind $f.cmd <Control-g> "$self delete" --- 3214,3218 ---- label $f.cmd_l -text Command: -font {helvetica -10} -pady 0 pack $f.cmd_l -side left ! entry $f.cmd -width 30 -relief flat -bg white -borderwidth 0 -highlightthickness 0 bind $f.cmd <Escape> "$self delete" bind $f.cmd <Control-g> "$self delete" *************** *** 3734,3739 **** set i 0 foreach inlet $::subpatcherize(incoming_inlet) { ! netsend [list #X obj [expr $i*100] 0 inlet] \ ! [list $self new_object_subpatcherize_inletconnect $inlet] incr i } --- 3722,3726 ---- set i 0 foreach inlet $::subpatcherize(incoming_inlet) { ! netsend [list #X obj [expr $i*100] 0 inlet] [list $self new_object_subpatcherize_inletconnect $inlet] incr i } *************** *** 3742,3747 **** mset {xcoords ycoords} [$self clipboard_coords 0] set y [expr [lindex [lsort -increasing $ycoords] end] + 20] ! netsend [list #X obj [expr $i*100] $y outlet] \ ! [list $self new_object_subpatcherize_outletconnect $outlet] incr i } --- 3729,3733 ---- mset {xcoords ycoords} [$self clipboard_coords 0] set y [expr [lindex [lsort -increasing $ycoords] end] + 20] ! netsend [list #X obj [expr $i*100] $y outlet] [list $self new_object_subpatcherize_outletconnect $outlet] incr i } *************** *** 5118,5123 **** set x2 [expr $x1+$@xs] set y2 [expr $y1+$@ys] ! set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] \ ! [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2] if {[$self selected?]} {set frcol [$self look selectframe]} {set frcol [$self look frame3]} $self item BASE polygon $points -fill [$self look bg] -outline $frcol -width 1 --- 5104,5108 ---- set x2 [expr $x1+$@xs] set y2 [expr $y1+$@ys] ! set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2] if {[$self selected?]} {set frcol [$self look selectframe]} {set frcol [$self look frame3]} $self item BASE polygon $points -fill [$self look bg] -outline $frcol -width 1 *************** *** 5472,5481 **** pack [frame .$self.radio] -side top foreach {i label} {0 "in new graph" 1 "in last graph"} { ! pack [radiobutton .$self.radio.radio$i -value $i -variable @otherflag -text $label] \ ! -side top -anchor w } } else { ! pack [checkbutton .$self.deleteme -text "delete me" \ ! -variable @otherflag -anchor w] -side top } if {$newone} {.$self.buttonframe.apply configure -state disabled} --- 5457,5464 ---- pack [frame .$self.radio] -side top foreach {i label} {0 "in new graph" 1 "in last graph"} { ! pack [radiobutton .$self.radio.radio$i -value $i -variable @otherflag -text $label] -side top -anchor w } } else { ! pack [checkbutton .$self.deleteme -text "delete me" -variable @otherflag -anchor w] -side top } if {$newone} {.$self.buttonframe.apply configure -state disabled} *************** *** 5940,5945 **** set c [lindex $vu_col [expr int($@peak)]] set y [expr $y1 + ($led_size+1)*(41-$@peak) - ($led_size+1)/2] ! $self item PEAK rectangle [list $x1 $y $x2 [expr $y+$led_size]] \ ! -fill [parse_color $c] -width 0 } --- 5923,5927 ---- set c [lindex $vu_col [expr int($@peak)]] set y [expr $y1 + ($led_size+1)*(41-$@peak) - ($led_size+1)/2] ! $self item PEAK rectangle [list $x1 $y $x2 [expr $y+$led_size]] -fill [parse_color $c] -width 0 } *************** *** 5972,5980 **** canvas $c.${self}DROP -width $xs -height $xs -bg $colour \ -highlightbackground $lcolour -highlightcolor $colour ! $c create window [expr $x1 + 7] [expr $y1 - 2] \ ! -window $c.${self}DROP -anchor nw -tags $c.${self}window if {[catch { ! dnd bindtarget $c.${self}DROP text/uri-list <Drop> \ ! "pd \"x[list ${self}] symbol \[ enquote %D \] ;\"" }]} { post "dropper: dnd not installed" --- 5954,5960 ---- canvas $c.${self}DROP -width $xs -height $xs -bg $colour \ -highlightbackground $lcolour -highlightcolor $colour ! $c create window [expr $x1+7] [expr $y1-2] -window $c.${self}DROP -anchor nw -tags $c.${self}window if {[catch { ! dnd bindtarget $c.${self}DROP text/uri-list <Drop> "pd \"x[list ${self}] symbol \[ enquote %D \] ;\"" }]} { post "dropper: dnd not installed" *************** *** 5993,5998 **** def Cnv draw {} { mset {x1 y1} [$self xy] ! $self item BASE rectangle [list $x1 $y1 [expr $x1+$@w] [expr $y1+$@h]] \ ! -fill [parse_color $@bcol] super } --- 5973,5977 ---- def Cnv draw {} { mset {x1 y1} [$self xy] ! $self item BASE rectangle [list $x1 $y1 [expr $x1+$@w] [expr $y1+$@h]] -fill [parse_color $@bcol] super } *************** *** 6039,6044 **** set x2 [expr $x1 + $width] set line [list $x1 $y $x2 $y] ! $self item elem${i} line $line -fill [$@canvas look compfg] -width 2 \ ! -tags "$self ${self}elem${i}" #.$self.c raise ${self}elem${i} incr i --- 6018,6022 ---- set x2 [expr $x1 + $width] set line [list $x1 $y $x2 $y] ! $self item elem${i} line $line -fill [$@canvas look compfg] -width 2 -tags "$self ${self}elem${i}" #.$self.c raise ${self}elem${i} incr i *************** *** 6256,6261 **** foreach e $butt { mset {icon name cmd} $e ! pack [button $bb._$name -image icon_$icon -border 1 \ ! -command "$@canvas new_object $cmd"] -side left balloon $bb._$name [say $name] } --- 6234,6238 ---- foreach e $butt { mset {icon name cmd} $e ! pack [button $bb._$name -image icon_$icon -border 1 -command "$@canvas new_object $cmd"] -side left balloon $bb._$name [say $name] } *************** *** 6452,6457 **** global class_list super $s ! .$self.title configure -text [format [say how_many_object_classes] \ ! [$@listbox size] [llength $class_list]] } --- 6429,6433 ---- global class_list super $s ! .$self.title configure -text [format [say how_many_object_classes] [$@listbox size] [llength $class_list]] } *************** *** 6762,6767 **** set i 0 foreach part $choices { ! $f.menu add command -label [say $part] \ ! -command [list $self dropmenu_set $f $name $part $i] incr i } --- 6738,6742 ---- set i 0 foreach part $choices { ! $f.menu add command -label [say $part] -command [list $self dropmenu_set $f $name $part $i] incr i } *************** *** 6896,6901 **** set part none ;# in case there are none foreach part $@$trim_name { ! $f.menu add command -label $part \ ! -command [list $self dropmenu_set $f $name $part $i] incr i } --- 6871,6875 ---- set part none ;# in case there are none foreach part $@$trim_name { ! $f.menu add command -label $part -command [list $self dropmenu_set $f $name $part $i] incr i } *************** *** 7153,7162 **** unsupported1 style $top floating sideTitlebar } ! pack [message $top.txt -aspect 10000 -bg lightyellow \ ! -font fixed -text $arg] set wmx [expr [winfo rootx $w]+[winfo width $w]] set wmy [winfo rooty $w] ! wm geometry $top \ ! [winfo reqwidth $top.txt]x[winfo reqheight $top.txt]+$wmx+$wmy raise $top } --- 7127,7134 ---- unsupported1 style $top floating sideTitlebar } ! pack [message $top.txt -aspect 10000 -bg lightyellow -font fixed -text $arg] set wmx [expr [winfo rootx $w]+[winfo width $w]] set wmy [winfo rooty $w] ! wm geometry $top [winfo reqwidth $top.txt]x[winfo reqheight $top.txt]+$wmx+$wmy raise $top } *************** *** 7229,7234 **** for {set i 0} {$i<[llength $preset_colors]} {incr i} { set c [lindex $preset_colors $i] ! $w add command -label " " \ ! -background "#$c" -activebackground "#$c" \ -command [list $self color_popup_select $frame $var [expr 0x$c]] } --- 7201,7205 ---- for {set i 0} {$i<[llength $preset_colors]} {incr i} { set c [lindex $preset_colors $i] ! $w add command -label " " -background "#$c" -activebackground "#$c" \ -command [list $self color_popup_select $frame $var [expr 0x$c]] } *************** *** 7837,7842 **** # "$w.1.scroll set" # i'd like a scrollable frame ! pack [scrollbar .$self.1.scroll \ ! -command "ClientClassTreeDialog_scroll $self"] -side left -fill y -expand y place [frame .$self.1.1.tree] -x 0 -y 0 set w .$self.1.1.tree.1 --- 7808,7812 ---- # "$w.1.scroll set" # i'd like a scrollable frame ! pack [scrollbar .$self.1.scroll -command "ClientClassTreeDialog_scroll $self"] -side left -fill y -expand y place [frame .$self.1.1.tree] -x 0 -y 0 set w .$self.1.1.tree.1 *************** *** 7994,7998 **** def Wire deconstruct {{selcanvas ""}} { - global obj_index_sel # the selcanvas system could be abstracted out using an ObjectList such that # Canvas<ObjectList and $selection class == ObjectList --- 7964,7967 ---- *************** *** 8003,8008 **** } { list #X connect \ ! $obj_index_sel($@canvas:$@obj1) $@port1 \ ! $obj_index_sel($@canvas:$@obj2) $@port2 } } --- 7972,7977 ---- } { list #X connect \ ! $::obj_index_sel($@canvas:$@obj1) $@port1 \ ! $::obj_index_sel($@canvas:$@obj2) $@port2 } }

1 0

pd/src d_soundfile.c, 1.4.4.11.2.10.2.11, 1.4.4.11.2.10.2.12
by Mathieu Bouchard 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv503 Modified Files: Tag: desiredata d_soundfile.c Log Message: template min,max in desire.h Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.11.2.10.2.11 retrieving revision 1.4.4.11.2.10.2.12 diff -C2 -d -r1.4.4.11.2.10.2.11 -r1.4.4.11.2.10.2.12 *** d_soundfile.c 4 Jul 2007 20:57:12 -0000 1.4.4.11.2.10.2.11 --- d_soundfile.c 9 Jul 2007 20:08:58 -0000 1.4.4.11.2.10.2.12 *************** *** 1868,1874 **** } - template <class T> T min(T a, T b) {return a<b?a:b;} - template <class T> T max(T a, T b) {return a>b?a:b;} - /* open method. Called as: open filename [skipframes headersize channels bytespersamp endianness] --- 1868,1871 ----

1 0

pd/src plusminus,NONE,1.1.2.1
by Mathieu Bouchard 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30768 Added Files: Tag: desiredata plusminus Log Message: make stats about diffs --- NEW FILE: plusminus --- (This appears to be a binary file; contents omitted.)

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
63
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs July 2007