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

Modified Files: Tag: desiredata s_main.c s_inter.c makefile.in Log Message: s_main.c goes c++

Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.24 retrieving revision 1.4.4.2.2.21.2.25 diff -C2 -d -r1.4.4.2.2.21.2.24 -r1.4.4.2.2.21.2.25 *** makefile.in 28 Jun 2007 04:08:16 -0000 1.4.4.2.2.21.2.24 --- makefile.in 28 Jun 2007 04:43:07 -0000 1.4.4.2.2.21.2.25 *************** *** 21,27 **** CFLAGS += -DINSTALL_PREFIX="$(prefix)"

! SRCXX = desire.c kernel.c builtins.c builtins_dsp.c s_path.c s_inter.c SRC = m_fifo.c m_simd.c \ ! m_sched.c s_main.c s_loader.c s_audio.c s_midi.c \ d_ugen.c d_mayer_fft.c d_fftroutine.c d_resample.c d_soundfile.c

--- 21,27 ---- CFLAGS += -DINSTALL_PREFIX="$(prefix)"

! SRCXX = desire.c kernel.c builtins.c builtins_dsp.c s_path.c s_inter.c s_main.c SRC = m_fifo.c m_simd.c \ ! m_sched.c s_loader.c s_audio.c s_midi.c \ d_ugen.c d_mayer_fft.c d_fftroutine.c d_resample.c d_soundfile.c

Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.14 retrieving revision 1.5.4.10.2.25.2.15 diff -C2 -d -r1.5.4.10.2.25.2.14 -r1.5.4.10.2.25.2.15 *** s_inter.c 28 Jun 2007 04:08:15 -0000 1.5.4.10.2.25.2.14 --- s_inter.c 28 Jun 2007 04:43:07 -0000 1.5.4.10.2.25.2.15 *************** *** 594,598 **** extern t_text *manager;

! extern "C" int sys_startgui() { #ifdef _WIN32 short version = MAKEWORD(2, 0); --- 594,598 ---- extern t_text *manager;

! int sys_startgui() { #ifdef _WIN32 short version = MAKEWORD(2, 0);

Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.16 retrieving revision 1.7.4.17.2.22.2.17 diff -C2 -d -r1.7.4.17.2.22.2.16 -r1.7.4.17.2.22.2.17 *** s_main.c 28 Jun 2007 02:21:46 -0000 1.7.4.17.2.22.2.16 --- s_main.c 28 Jun 2007 04:43:07 -0000 1.7.4.17.2.22.2.17 *************** *** 5,9 **** /* Zmölnig added advanced multidevice-support (2001) */

! char pd_version[] = "DesireData 2007.06.27\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 5,9 ---- /* Zmölnig added advanced multidevice-support (2001) */

! char pd_version[] = "DesireData 2007.06.27"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; *************** *** 35,47 **** #endif

! void pd_init(void); ! int sys_argparse(int argc, char **argv); void sys_findprogdir(char *progname); int sys_startgui(void); ! void sys_init_idle_callbacks(void); ! int sys_rcfile(void); ! int m_scheduler(void); void sys_addhelppath(char *p); ! void alsa_adddev(char *name);

#ifdef THREADED_SF --- 35,48 ---- #endif

! extern "C" void pd_init(void); ! extern "C" int sys_argparse(int argc, char **argv); void sys_findprogdir(char *progname); int sys_startgui(void); ! extern "C" void sys_init_idle_callbacks(void); ! extern "C" int sys_rcfile(void); ! extern "C" int m_scheduler(void); void sys_addhelppath(char *p); ! extern "C" void alsa_adddev(char *name); ! extern "C" int sys_parsercfile(char*filename);

#ifdef THREADED_SF *************** *** 119,124 ****

/* this is called from main() in s_entry.c */ ! int sys_main(int argc, char **argv) ! { int noprefs = 0, i; class_table = hash_new(127); --- 120,124 ----

/* this is called from main() in s_entry.c */ ! extern "C" int sys_main(int argc, char **argv) { int noprefs = 0, i; class_table = hash_new(127); *************** *** 339,343 **** void sys_findprogdir(char *progname) { ! char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING], *sp; char *lastslash; #ifdef UNISTD --- 339,343 ---- void sys_findprogdir(char *progname) { ! char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING]; char *lastslash; #ifdef UNISTD *************** *** 416,422 **** #endif

- /* defined in s_path.c */ - int sys_parsercfile(char*filename); - #undef NOT_HERE #define NOT_HERE fprintf(stderr,"option %s not compiled into this pd\n", *argv) --- 416,419 ---- *************** *** 426,431 ****

int sys_argparse(int argc, char **argv) { - char sbuf[MAXPDSTRING]; - int i; while ((argc > 0) && **argv == '-') { if (ARG("-r",2)) { --- 423,426 ---- *************** *** 458,462 **** NEXT(2); } ! if (ARG("-sleepgrain",2)) {sys_sleepgrain = 1000 * atof(argv[1]); NEXT(2);}

/* from tim */ --- 453,457 ---- NEXT(2); } ! if (ARG("-sleepgrain",2)) {sys_sleepgrain = int(1000 * atof(argv[1])); NEXT(2);}

/* from tim */ *************** *** 646,650 **** usage: if (argc) fprintf(stderr, "Can't handle option '%s'.\n",*argv); ! for (i = 0; i < sizeof(usagemessage)/sizeof(*usagemessage); i++) fprintf(stderr, "%s", usagemessage[i]); return 1; --- 641,645 ---- usage: if (argc) fprintf(stderr, "Can't handle option '%s'.\n",*argv); ! for (size_t i=0; i < sizeof(usagemessage)/sizeof(*usagemessage); i++) fprintf(stderr, "%s", usagemessage[i]); return 1;