Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11121
Modified Files: Tag: desiredata s_main.c Log Message: move definition of pd_version after #include so as to placate the petty whims of some versions of G++ 4.1
Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.19 retrieving revision 1.7.4.17.2.22.2.20 diff -C2 -d -r1.7.4.17.2.22.2.19 -r1.7.4.17.2.22.2.20 *** s_main.c 28 Jun 2007 05:56:41 -0000 1.7.4.17.2.22.2.19 --- s_main.c 29 Jun 2007 22:17:36 -0000 1.7.4.17.2.22.2.20 *************** *** 5,13 **** /* Zmölnig added advanced multidevice-support (2001) */
- char pd_version[] = "DesireData 2007.06.27"; - char pd_compiletime[] = __TIME__; - char pd_compiledate[] = __DATE__; - #include "desire.h" #include <sys/types.h> #include <sys/stat.h> --- 5,10 ---- /* Zmölnig added advanced multidevice-support (2001) */
#include "desire.h" + #include "s_stuff.h" #include <sys/types.h> #include <sys/stat.h> *************** *** 31,35 ****
#ifdef DAZ ! #define _MM_DENORM_ZERO_ON 0x0040 #include <xmmintrin.h> #endif --- 28,32 ----
#ifdef DAZ ! #define _MM_DENORM_ZERO_ON 0x0040 #include <xmmintrin.h> #endif *************** *** 50,53 **** --- 47,54 ---- #endif /* THREDED_SF */
+ char pd_version[] = "DesireData 2007.07.07"; + char pd_compiletime[] = __TIME__; + char pd_compiledate[] = __DATE__; + int sys_verbose; int sys_noloadbang; *************** *** 631,637 **** int sys_getblksize() {return sys_dacblocksize;}
! /* stuff to do, once, after calling sys_argparse() -- which may itself ! be called more than once (first from "settings, second from .pdrc, then ! from command-line arguments */ static void sys_afterargparse() { char sbuf[MAXPDSTRING]; --- 632,638 ---- int sys_getblksize() {return sys_dacblocksize;}
! /* stuff to do, once, after calling sys_argparse() -- which may itself ! be called more than once (first from "settings, second from .pdrc, then ! from command-line arguments */ static void sys_afterargparse() { char sbuf[MAXPDSTRING]; *************** *** 652,702 **** strcat(sbuf, "/doc/5.reference"); sys_helppath = namelist_append_files(sys_helppath, sbuf); ! /* correct to make audio and MIDI device lists zero based. On ! MMIO, however, "1" really means the second device (the first one ! is "mapper" which is was not included when the command args were ! set up, so we leave it that way for compatibility. */ ! if (!sys_mmio) ! { ! for (i = 0; i < sys_nsoundin; i++) ! sys_soundindevlist[i]--; ! for (i = 0; i < sys_nsoundout; i++) ! sys_soundoutdevlist[i]--; } ! for (i = 0; i < sys_nmidiin; i++) ! sys_midiindevlist[i]--; ! for (i = 0; i < sys_nmidiout; i++) ! sys_midioutdevlist[i]--; ! if (sys_listplease) ! sys_listdevs();
! /* get the current audio parameters. These are set ! by the preferences mechanism (sys_loadpreferences()) or ! else are the default. Overwrite them with any results ! of argument parsing, and store them again. */ sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblksize, &advance, &scheduler); if (sys_nchin >= 0) { ! nchindev = sys_nchin; ! for (i=0; i<nchindev; i++) chindev[i] = sys_chinlist[i]; } else nchindev = naudioindev; if (sys_nsoundin >= 0) { ! naudioindev = sys_nsoundin; ! for (i=0; i<naudioindev; i++) audioindev[i] = sys_soundindevlist[i]; } if (sys_nchout >= 0) { ! nchoutdev = sys_nchout; ! for (i=0; i<nchoutdev; i++) choutdev[i] = sys_choutlist[i]; } else nchoutdev = naudiooutdev; if (sys_nsoundout >= 0) { ! naudiooutdev = sys_nsoundout; ! for (i=0; i<naudiooutdev; i++) audiooutdev[i] = sys_soundoutdevlist[i]; } if (sys_nmidiin >= 0) { ! nmidiindev = sys_nmidiin; ! for (i=0; i<nmidiindev; i++) midiindev[i] = sys_midiindevlist[i]; } if (sys_nmidiout >= 0) { ! nmidioutdev = sys_nmidiout; ! for (i=0; i<nmidioutdev; i++) midioutdev[i] = sys_midioutdevlist[i]; } if (sys_main_advance) advance = sys_main_advance; --- 653,689 ---- strcat(sbuf, "/doc/5.reference"); sys_helppath = namelist_append_files(sys_helppath, sbuf); ! /* correct to make audio and MIDI device lists zero based. On ! MMIO, however, "1" really means the second device (the first one ! is "mapper" which is was not included when the command args were ! set up, so we leave it that way for compatibility. */ ! if (!sys_mmio) { ! for (i = 0; i < sys_nsoundin ; i++) sys_soundindevlist[i]--; ! for (i = 0; i < sys_nsoundout; i++) sys_soundoutdevlist[i]--; } ! for (i = 0; i < sys_nmidiin; i++) sys_midiindevlist[i]--; ! for (i = 0; i < sys_nmidiout; i++) sys_midioutdevlist[i]--; ! if (sys_listplease) sys_listdevs();
! /* get the current audio parameters. These are set by the preferences mechanism (sys_loadpreferences()) or ! else are the default. Overwrite them with any results of argument parsing, and store them again. */ sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblksize, &advance, &scheduler); if (sys_nchin >= 0) { ! nchindev = sys_nchin; for (i=0; i< nchindev; i++) chindev[i] = sys_chinlist[i]; } else nchindev = naudioindev; if (sys_nsoundin >= 0) { ! naudioindev = sys_nsoundin; for (i=0; i< naudioindev; i++) audioindev[i] = sys_soundindevlist[i]; } if (sys_nchout >= 0) { ! nchoutdev = sys_nchout; for (i=0; i< nchoutdev; i++) choutdev[i] = sys_choutlist[i]; } else nchoutdev = naudiooutdev; if (sys_nsoundout >= 0) { ! naudiooutdev = sys_nsoundout;for (i=0; i<naudiooutdev; i++) audiooutdev[i] = sys_soundoutdevlist[i]; } if (sys_nmidiin >= 0) { ! nmidiindev = sys_nmidiin; for (i=0; i< nmidiindev; i++) midiindev[i] = sys_midiindevlist[i]; } if (sys_nmidiout >= 0) { ! nmidioutdev = sys_nmidiout; for (i=0; i< nmidioutdev; i++) midioutdev[i] = sys_midioutdevlist[i]; } if (sys_main_advance) advance = sys_main_advance;