lists@iem
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
List overview
Download
Pd-cvs
November 2006
----- 2025 -----
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
pd-cvs@lists.iem.at
16 participants
561 discussions
Start a n
N
ew thread
pd/src s_main.c,1.7.4.17.2.22.2.2,1.7.4.17.2.22.2.3
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20272 Modified Files: Tag: desiredata s_main.c Log Message: fixed new commandline parsing system; removed server-side font stuff. Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.2 retrieving revision 1.7.4.17.2.22.2.3 diff -C2 -d -r1.7.4.17.2.22.2.2 -r1.7.4.17.2.22.2.3 ***
…
[View More]
s_main.c 30 Nov 2006 17:54:21 -0000 1.7.4.17.2.22.2.2 --- s_main.c 30 Nov 2006 18:11:40 -0000 1.7.4.17.2.22.2.3 *************** *** 68,72 **** static t_namelist *sys_messagelist; static int sys_version; - int sys_oldtclversion; /* hack to warn g_rtext.c about old text sel */ int sys_nmidiout = 1; --- 68,71 ---- *************** *** 79,84 **** int sys_midioutdevlist[MAXMIDIOUTDEV] = {1}; - char sys_font[100] = "courier"; /* tb: font name */ - static int sys_main_srate; static int sys_main_dacblocksize = DEFDACBLKSIZE; --- 78,81 ---- *************** *** 121,188 **** /* } jsarlo */ - - - typedef struct _fontinfo - { - int fi_fontsize; - int fi_maxwidth; - int fi_maxheight; - int fi_hostfontsize; - int fi_width; - int fi_height; - } t_fontinfo; - - /* these give the nominal point size and maximum height of the characters - in the six fonts. */ - - static t_fontinfo sys_fontlist[] = { - {8, 5, 9, 0, 0, 0}, {10, 7, 13, 0, 0, 0}, {12, 9, 16, 0, 0, 0}, - {16, 10, 20, 0, 0, 0}, {24, 15, 25, 0, 0, 0}, {36, 25, 45, 0, 0, 0}}; - #define NFONT (sizeof(sys_fontlist)/sizeof(*sys_fontlist)) - - /* here are the actual font size structs on msp's systems: - MSW: - font 8 5 9 8 5 11 - font 10 7 13 10 6 13 - font 12 9 16 14 8 16 - font 16 10 20 16 10 18 - font 24 15 25 16 10 18 - font 36 25 42 36 22 41 - - linux: - font 8 5 9 8 5 9 - font 10 7 13 12 7 13 - font 12 9 16 14 9 15 - font 16 10 20 16 10 19 - font 24 15 25 24 15 24 - font 36 25 42 36 22 41 - */ - - static t_fontinfo *sys_findfont(int fontsize) - { - unsigned int i; - t_fontinfo *fi; - for (i = 0, fi = sys_fontlist; i < (NFONT-1); i++, fi++) - if (fontsize < fi[1].fi_fontsize) return (fi); - return (sys_fontlist + (NFONT-1)); - } - - int sys_nearestfontsize(int fontsize) - { - return (sys_findfont(fontsize)->fi_fontsize); - } - - int sys_hostfontsize(int fontsize) - { - return (sys_findfont(fontsize)->fi_hostfontsize); - } - - int sys_defaultfont; - #ifdef MSW - #define DEFAULTFONT 12 - #else - #define DEFAULTFONT 10 - #endif - static void openit(const char *dirname, const char *filename) { --- 118,121 ---- *************** *** 199,214 **** } - #define NHOSTFONT 7 - - /* this is called from the gui process. The first argument is the cwd, and - succeeding args give the widths and heights of known fonts. We wait until - these are known to open files and send messages specified on the command line. - We ask the GUI to specify the "cwd" in case we don't have a local OS to get it - from; for instance we could be some kind of RT embedded system. However, to - really make this make sense we would have to implement - open(), read(), etc, calls to be served somehow from the GUI too. */ - /* for DesireData this should be eventually nuked */ ! void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv) { char cwd[666]; --- 132,137 ---- } /* for DesireData this should be eventually nuked */ ! void glob_initfromgui(void *dummy, t_symbol *s) { char cwd[666]; *************** *** 233,237 **** namelist_free(sys_messagelist); sys_messagelist = 0; - sys_oldtclversion = atom_getfloatarg(1 + 3 * NHOSTFONT, argc, argv); } --- 156,159 ---- *************** *** 601,605 **** } if (ARG("-blocksize",2)) {sys_setblocksize(atoi(argv[1])); NEXT(2);} ! if (ARG("-dacblocksize",2) && sscanf(argv[1], "%d", &sys_main_dacblocksize) >= 1) NEXT(2); if (ARG("-sleepgrain",2)) {sys_sleepgrain = 1000 * atof(argv[1]); NEXT(2);} --- 523,527 ---- } if (ARG("-blocksize",2)) {sys_setblocksize(atoi(argv[1])); NEXT(2);} ! if (ARG("-dacblocksize",2) && sscanf(argv[1], "%d", &sys_main_dacblocksize) >= 1) {NEXT(2);} if (ARG("-sleepgrain",2)) {sys_sleepgrain = 1000 * atof(argv[1]); NEXT(2);} *************** *** 723,727 **** if (ARG("-helppath",1)) {sys_helppath = namelist_append_files(sys_helppath, argv[1]); NEXT(2);} if (ARG("-open",2)) {sys_openlist = namelist_append_files(sys_openlist, argv[1]); NEXT(2);} ! if (ARG("-lib",2)) {sys_externlist = namelist_append_files(sys_externlist, argv[1]); NEXT(2);} if (ARG("-font",2)) { fprintf(stderr,"Warning: -font ignored by DesireData; use .ddrc instead\n"); --- 645,651 ---- if (ARG("-helppath",1)) {sys_helppath = namelist_append_files(sys_helppath, argv[1]); NEXT(2);} if (ARG("-open",2)) {sys_openlist = namelist_append_files(sys_openlist, argv[1]); NEXT(2);} ! if (ARG("-lib",2)) { ! fprintf(stderr,"found -lib\n"); ! sys_externlist = namelist_append_files(sys_externlist, argv[1]); NEXT(2);} if (ARG("-font",2)) { fprintf(stderr,"Warning: -font ignored by DesireData; use .ddrc instead\n"); *************** *** 733,737 **** NEXT(2); } ! if (ARG("-no-prefs",1)) NEXT(1); /* tim: skip flag, we already parsed it */ /* jmz: read an alternative rcfile { */ if (ARG("-rcfile",2)) {sys_parsercfile(argv[1]); NEXT(2);} /* recursively */ --- 657,661 ---- NEXT(2); } ! if (ARG("-no-prefs",1)) {NEXT(1);} /* tim: skip flag, we already parsed it */ /* jmz: read an alternative rcfile { */ if (ARG("-rcfile",2)) {sys_parsercfile(argv[1]); NEXT(2);} /* recursively */ *************** *** 739,746 **** if (ARG("-verbose",1)) {sys_verbose++; NEXT(1);} if (ARG("-version",1)) {sys_version = 1; NEXT(1);} ! if (ARG("-d",2) && sscanf(argv[1], "%d", &sys_debuglevel) >= 1) NEXT(2); if (ARG("-noloadbang",1)) {sys_noloadbang = 1; NEXT(1);} if (ARG("-nogui",1)) {sys_printtostderr = sys_nogui = 1; NEXT(1);} ! if (ARG("-guiport",2) && sscanf(argv[1], "%d", &sys_guisetportnumber) >= 1) NEXT(2); if (ARG("-stderr",1)) {sys_printtostderr = 1; NEXT(1);} if (ARG("-guicmd",2)) {sys_guicmd = argv[1]; NEXT(2);} --- 663,670 ---- if (ARG("-verbose",1)) {sys_verbose++; NEXT(1);} if (ARG("-version",1)) {sys_version = 1; NEXT(1);} ! if (ARG("-d",2) && sscanf(argv[1], "%d", &sys_debuglevel) >= 1) {NEXT(2);} if (ARG("-noloadbang",1)) {sys_noloadbang = 1; NEXT(1);} if (ARG("-nogui",1)) {sys_printtostderr = sys_nogui = 1; NEXT(1);} ! if (ARG("-guiport",2) && sscanf(argv[1], "%d", &sys_guisetportnumber) >= 1) {NEXT(2);} if (ARG("-stderr",1)) {sys_printtostderr = 1; NEXT(1);} if (ARG("-guicmd",2)) {sys_guicmd = argv[1]; NEXT(2);} *************** *** 787,791 **** return 1; } - if (!sys_defaultfont) sys_defaultfont = DEFAULTFONT; for (; argc > 0; argc--, argv++) sys_openlist = namelist_append_files(sys_openlist, *argv); --- 711,714 ----
[View Less]
1
0
0
0
pd/src desire.c, 1.1.2.217.2.3, 1.1.2.217.2.4 m_binbuf.c, 1.4.4.1.2.8.2.1, 1.4.4.1.2.8.2.2 s_inter.c, 1.5.4.10.2.25.2.1, 1.5.4.10.2.25.2.2
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19884 Modified Files: Tag: desiredata desire.c m_binbuf.c s_inter.c Log Message: removed server-side font stuff Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.1 retrieving revision 1.5.4.10.2.25.2.2 diff -C2 -d -r1.5.4.10.2.25.2.1 -r1.5.4.10.2.25.2.2 *** s_inter.c 30 Nov 2006
…
[View More]
03:34:23 -0000 1.5.4.10.2.25.2.1 --- s_inter.c 30 Nov 2006 18:10:51 -0000 1.5.4.10.2.25.2.2 *************** *** 97,101 **** extern char pd_version[]; extern int sys_guisetportnumber; - extern char sys_font[]; /* tb: typeface */ static int sys_nfdpoll; --- 97,100 ---- *************** *** 889,905 **** #define FIRSTPORTNUM 5400 - #define MAXFONTS 21 - static int defaultfontshit[MAXFONTS] = { - 8, 5, 9, 10, 6, 10, 12, 7, 13, 14, 9, 17, 16, 10, 19, 24, 15, 28, - 24, 15, 28}; - static int sys_start_watchdog_thread(void); static t_int fake_initfromgui(t_int* dummy) { - /* fake the GUI's message giving cwd and font sizes; then - skip starting the GUI up. */ char cmdbuf[4*MAXPDSTRING]; - t_atom zz[MAXFONTS+2]; int i; #ifdef MSW --- 888,896 ---- *************** *** 912,920 **** #endif ! SETSYMBOL(zz, gensym(cmdbuf)); ! for (i = 0; i < MAXFONTS; i++) ! SETFLOAT(zz+i+1, defaultfontshit[i]); ! SETFLOAT(zz+i+1,0); ! glob_initfromgui(0, 0, MAXFONTS+2, zz); return 0; } --- 903,907 ---- #endif ! glob_initfromgui(0,0); return 0; } *************** *** 1131,1136 **** sys_get_audio_apis(buf); sys_get_midi_apis(buf2); ! sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2, ! sys_font); } return (0); --- 1118,1122 ---- sys_get_audio_apis(buf); sys_get_midi_apis(buf2); ! sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2, 666); } return (0); Index: m_binbuf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v retrieving revision 1.4.4.1.2.8.2.1 retrieving revision 1.4.4.1.2.8.2.2 diff -C2 -d -r1.4.4.1.2.8.2.1 -r1.4.4.1.2.8.2.2 *** m_binbuf.c 30 Nov 2006 03:54:58 -0000 1.4.4.1.2.8.2.1 --- m_binbuf.c 30 Nov 2006 18:10:51 -0000 1.4.4.1.2.8.2.2 *************** *** 951,955 **** atom_getfloatarg(5, natom, nextmess) - atom_getfloatarg(3, natom, nextmess), ! (float)sys_defaultfont); } } --- 951,955 ---- atom_getfloatarg(5, natom, nextmess) - atom_getfloatarg(3, natom, nextmess), ! 10.); } } Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.3 retrieving revision 1.1.2.217.2.4 diff -C2 -d -r1.1.2.217.2.3 -r1.1.2.217.2.4 *** desire.c 30 Nov 2006 17:09:59 -0000 1.1.2.217.2.3 --- desire.c 30 Nov 2006 18:10:49 -0000 1.1.2.217.2.4 *************** *** 504,508 **** int width = CANVAS_DEFCANVASWIDTH, xloc = 0; int height = CANVAS_DEFCANVASHEIGHT, yloc = CANVAS_DEFCANVASYLOC; ! int vis=0, font = owner?owner->font:sys_defaultfont; canvas_init(x); x->te_type = T_OBJECT; --- 504,508 ---- int width = CANVAS_DEFCANVASWIDTH, xloc = 0; int height = CANVAS_DEFCANVASHEIGHT, yloc = CANVAS_DEFCANVASYLOC; ! int vis=0, font = owner?owner->font:42 /*sys_defaultfont*/; canvas_init(x); x->te_type = T_OBJECT; *************** *** 546,550 **** } x->willvis = vis; ! x->font = sys_nearestfontsize(font); pd_pushsym(x); x->next_add = -1; --- 546,550 ---- } x->willvis = vis; ! x->font = 10 /*sys_nearestfontsize(font)*/; pd_pushsym(x); x->next_add = -1; *************** *** 600,604 **** x->x1 = x1; x->y1 = y1; x->te_xpix = (short)px1; x->pixwidth = (int)(px2-px1); x->x2 = x2; x->y2 = y2; x->te_ypix = (short)py1; x->pixheight = (int)(py2-py1); ! x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : sys_defaultfont); x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300; if (x->name != s_Pd) pd_bind(x, canvas_makebindsym(x->name)); --- 600,604 ---- x->x1 = x1; x->y1 = y1; x->te_xpix = (short)px1; x->pixwidth = (int)(px2-px1); x->x2 = x2; x->y2 = y2; x->te_ypix = (short)py1; x->pixheight = (int)(py2-py1); ! x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : 42 /*sys_defaultfont*/); x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300; if (x->name != s_Pd) pd_bind(x, canvas_makebindsym(x->name)); *************** *** 2594,2598 **** t_symbol *s = garray_getname((t_garray *)g); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw -font "FONT" -tags %s\n", ! (long)c, x1, ymin, s->s_name, sys_hostfontsize(canvas_getfont(x)), tag); } /* draw ticks on horizontal borders. If lperb field is zero, this is disabled. */ --- 2594,2598 ---- t_symbol *s = garray_getname((t_garray *)g); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw -font "FONT" -tags %s\n", ! (long)c, x1, ymin, s->s_name, 42 /*sys_hostfontsize(canvas_getfont(x))*/, tag); } /* draw ticks on horizontal borders. If lperb field is zero, this is disabled. */ *************** *** 5133,5137 **** sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", (long)canvas_getcanvas(canvas), xloc, yloc, colorstring, buf); ! sys_vgui(" -font "FONT, sys_hostfontsize(canvas_getfont(canvas))); sys_vgui(" -tags drawnumber%lx\n", (long)data); } else sys_vgui(".x%lx.c delete drawnumber%lx\n", (long)canvas_getcanvas(canvas), (long)data); --- 5133,5137 ---- sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", (long)canvas_getcanvas(canvas), xloc, yloc, colorstring, buf); ! sys_vgui(" -font "FONT, 42 /*sys_hostfontsize(canvas_getfont(canvas))*/); sys_vgui(" -tags drawnumber%lx\n", (long)data); } else sys_vgui(".x%lx.c delete drawnumber%lx\n", (long)canvas_getcanvas(canvas), (long)data);
[View Less]
1
0
0
0
pd/src s_main.c,1.7.4.17.2.22.2.1,1.7.4.17.2.22.2.2
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13765 Modified Files: Tag: desiredata s_main.c Log Message: a new style of parsing options, much more concise Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.1 retrieving revision 1.7.4.17.2.22.2.2 diff -C2 -d -r1.7.4.17.2.22.2.1 -r1.7.4.17.2.22.2.2 *** s_main.c 30 Nov 2006 03:
…
[View More]
55:48 -0000 1.7.4.17.2.22.2.1 --- s_main.c 30 Nov 2006 17:54:21 -0000 1.7.4.17.2.22.2.2 *************** *** 5,12 **** /* IOhannes : * hacked the code to add advanced multidevice-support ! * 1311:forum::fr::uml�te:2001 */ ! char pd_version[] = "Pd version 0.39-1test1 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 5,12 ---- /* IOhannes : * hacked the code to add advanced multidevice-support ! * 1311:forum::für::umläute:2001 */ ! char pd_version[] = "DesireData 0.39.A.pre4\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; *************** *** 178,185 **** } - /* in DesireData you *shouldn't* use sys_fontwidth nor sys_fontheight */ - int sys_fontwidth(int fontsize) {return -666;} - int sys_fontheight(int fontsize) {return -666;} - int sys_defaultfont; #ifdef MSW --- 178,181 ---- *************** *** 469,482 **** } - static int sys_getmultidevchannels(int n, int *devlist) - { - int sum = 0; - if (n<0)return(-1); - if (n==0)return 0; - while(n--)sum+=*devlist++; - return sum; - } - - /* this routine tries to figure out where to find the auxilliary files Pd will need to run. This is either done by looking at the command line --- 465,468 ---- *************** *** 584,679 **** #define NOT_HERE fprintf(stderr,"option %s not compiled into this pd\n", *argv) ! int sys_argparse(int argc, char **argv) ! { char sbuf[MAXPDSTRING]; int i; ! while ((argc > 0) && **argv == '-') ! { ! if (!strcmp(*argv, "-r") && argc > 1 && ! sscanf(argv[1], "%d", &sys_main_srate) >= 1) ! { ! argc -= 2; ! argv += 2; } ! else if (!strcmp(*argv, "-inchannels")) ! { /* IOhannes */ ! sys_parsedevlist(&sys_nchin, ! sys_chinlist, MAXAUDIOINDEV, argv[1]); ! ! if (!sys_nchin) ! goto usage; ! ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-outchannels")) ! { /* IOhannes */ ! sys_parsedevlist(&sys_nchout, sys_choutlist, ! MAXAUDIOOUTDEV, argv[1]); ! ! if (!sys_nchout) ! goto usage; ! ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-channels")) ! { ! sys_parsedevlist(&sys_nchin, sys_chinlist,MAXAUDIOINDEV, ! argv[1]); ! sys_parsedevlist(&sys_nchout, sys_choutlist,MAXAUDIOOUTDEV, ! argv[1]); ! ! if (!sys_nchout) ! goto usage; ! ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-soundbuf") || !strcmp(*argv, "-audiobuf")) ! { sys_main_advance = atoi(argv[1]); ! argc -= 2; argv += 2; ! } ! else if (!strcmp(*argv, "-blocksize")) ! { ! sys_setblocksize(atoi(argv[1])); ! argc -= 2; argv += 2; ! } ! else if (!strcmp(*argv, "-dacblocksize") && argc > 1 && ! sscanf(argv[1], "%d", &sys_main_dacblocksize) >= 1) ! { ! argc -= 2; ! argv += 2; ! } ! else if (!strcmp(*argv, "-sleepgrain")) ! { ! sys_sleepgrain = 1000 * atof(argv[1]); ! argc -= 2; argv += 2; ! } ! /* tb: callback-based scheduling { */ ! else if (!strcmp(*argv, "-cb_scheduler")) ! { ! sys_setscheduler(1); ! argc--; argv++; ! } ! /* tb } */ ! else if (!strcmp(*argv, "-nodac")) ! { /* IOhannes */ ! sys_nsoundout=0; ! sys_nchout = 0; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-noadc")) ! { /* IOhannes */ ! sys_nsoundin=0; ! sys_nchin = 0; ! argc--; argv++; } ! else if (!strcmp(*argv, "-nosound") || !strcmp(*argv, "-noaudio")) ! { /* IOhannes */ sys_nsoundin=sys_nsoundout = 0; sys_nchin = sys_nchout = 0; ! argc--; argv++; } ! else if (!strcmp(*argv, "-oss")) ! { #ifdef USEAPI_OSS sys_set_audio_api(API_OSS); --- 570,621 ---- #define NOT_HERE fprintf(stderr,"option %s not compiled into this pd\n", *argv) ! #define ARG(name,count) (!strcmp(*argv,(name)) && argc>=(count)) ! #define NEXT(count) argc -= (count), argv += (count); continue; ! ! int sys_argparse(int argc, char **argv) { char sbuf[MAXPDSTRING]; int i; ! while ((argc > 0) && **argv == '-') { ! if (ARG("-r",2) && sscanf(argv[1], "%d", &sys_main_srate) >= 1) { ! NEXT(2); } ! if (ARG("-inchannels",2)) { /* IOhannes */ ! sys_parsedevlist(&sys_nchin, sys_chinlist, MAXAUDIOINDEV, argv[1]); ! if (!sys_nchin) goto usage; ! NEXT(2); } ! if (ARG("-outchannels",2)) { /* IOhannes */ ! sys_parsedevlist(&sys_nchout, sys_choutlist, MAXAUDIOOUTDEV, argv[1]); ! if (!sys_nchout) goto usage; ! NEXT(2); } ! if (ARG("-channels",2)) { ! sys_parsedevlist(&sys_nchin, sys_chinlist,MAXAUDIOINDEV, argv[1]); ! sys_parsedevlist(&sys_nchout, sys_choutlist,MAXAUDIOOUTDEV, argv[1]); ! if (!sys_nchout) goto usage; ! NEXT(2); } ! if (ARG("-soundbuf",2) || ARG("-audiobuf",2)) { sys_main_advance = atoi(argv[1]); ! NEXT(2); } ! if (ARG("-blocksize",2)) {sys_setblocksize(atoi(argv[1])); NEXT(2);} ! if (ARG("-dacblocksize",2) && sscanf(argv[1], "%d", &sys_main_dacblocksize) >= 1) NEXT(2); ! if (ARG("-sleepgrain",2)) {sys_sleepgrain = 1000 * atof(argv[1]); NEXT(2);} ! ! /* from tim */ ! if (ARG("-cb_scheduler",1)) {sys_setscheduler(1); NEXT(1);} ! ! /* IOhannes */ ! if (ARG("-nodac",1)) {sys_nsoundout= sys_nchout = 0; NEXT(1);} ! if (ARG("-noadc",1)) {sys_nsoundin = sys_nchin = 0; NEXT(1);} ! if (ARG("-nosound",1) || ARG("-noaudio",1)) { sys_nsoundin=sys_nsoundout = 0; sys_nchin = sys_nchout = 0; ! NEXT(1); } ! ! /* many options for selecting audio api */ ! if (ARG("-oss",1)) { #ifdef USEAPI_OSS sys_set_audio_api(API_OSS); *************** *** 681,688 **** NOT_HERE; #endif ! argc--; argv++; } ! else if (!strcmp(*argv, "-32bit")) ! { #ifdef USEAPI_OSS sys_set_audio_api(API_OSS); --- 623,629 ---- NOT_HERE; #endif ! NEXT(1); } ! if (ARG("-32bit",1)) { #ifdef USEAPI_OSS sys_set_audio_api(API_OSS); *************** *** 691,698 **** NOT_HERE; #endif ! argc--; argv++; } ! else if (!strcmp(*argv, "-alsa")) ! { #ifdef USEAPI_ALSA sys_set_audio_api(API_ALSA); --- 632,638 ---- NOT_HERE; #endif ! NEXT(1); } ! if (ARG("-alsa",1)) { #ifdef USEAPI_ALSA sys_set_audio_api(API_ALSA); *************** *** 700,707 **** NOT_HERE; #endif ! argc--; argv++; } ! else if (!strcmp(*argv, "-alsaadd")) ! { #ifdef USEAPI_ALSA if (argc > 1) --- 640,646 ---- NOT_HERE; #endif ! NEXT(1); } ! if (ARG("-alsaadd",2)) { #ifdef USEAPI_ALSA if (argc > 1) *************** *** 711,718 **** NOT_HERE; #endif ! argc -= 2; argv +=2; } ! else if (!strcmp(*argv, "-alsamidi")) ! { #ifdef USEAPI_ALSA sys_set_midi_api(API_ALSA); --- 650,656 ---- NOT_HERE; #endif ! NEXT(2); } ! if (ARG("-alsamidi",1)) { #ifdef USEAPI_ALSA sys_set_midi_api(API_ALSA); *************** *** 720,727 **** NOT_HERE; #endif ! argc--; argv++; } ! else if (!strcmp(*argv, "-jack")) ! { #ifdef USEAPI_JACK sys_set_audio_api(API_JACK); --- 658,664 ---- NOT_HERE; #endif ! NEXT(1); } ! if (ARG("-jack",1)) { #ifdef USEAPI_JACK sys_set_audio_api(API_JACK); *************** *** 729,737 **** NOT_HERE; #endif ! argc--; argv++; } ! else if (!strcmp(*argv, "-pa") || !strcmp(*argv, "-portaudio") || !strcmp(*argv, "-asio") ! ) ! { #ifdef USEAPI_PORTAUDIO sys_set_audio_api(API_PORTAUDIO); --- 666,672 ---- NOT_HERE; #endif ! NEXT(1); } ! if (ARG("-pa",1) || ARG("-portaudio",1) || ARG("-asio",1)) { #ifdef USEAPI_PORTAUDIO sys_set_audio_api(API_PORTAUDIO); *************** *** 742,747 **** argc--; argv++; } ! else if (!strcmp(*argv, "-asio_native")) ! { #ifdef USEAPI_ASIO sys_set_audio_api(API_ASIO); --- 677,681 ---- argc--; argv++; } ! if (ARG("-asio_native",1)) { #ifdef USEAPI_ASIO sys_set_audio_api(API_ASIO); *************** *** 752,757 **** argc--; argv++; } ! else if (!strcmp(*argv, "-mmio")) ! { #ifdef USEAPI_MMIO sys_set_audio_api(API_MMIO); --- 686,690 ---- argc--; argv++; } ! if (ARG("-mmio",1)) { #ifdef USEAPI_MMIO sys_set_audio_api(API_MMIO); *************** *** 760,989 **** #endif sys_mmio = 1; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-nomidiin")) ! { ! sys_nmidiin = 0; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-nomidiout")) ! { ! sys_nmidiout = 0; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-nomidi")) ! { ! sys_nmidiin = sys_nmidiout = 0; ! argc--; argv++; } ! else if (!strcmp(*argv, "-midiindev")) ! { ! sys_parsedevlist(&sys_nmidiin, sys_midiindevlist, MAXMIDIINDEV, ! argv[1]); ! if (!sys_nmidiin) ! goto usage; ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-midioutdev")) ! { ! sys_parsedevlist(&sys_nmidiout, sys_midioutdevlist, MAXMIDIOUTDEV, ! argv[1]); ! if (!sys_nmidiout) ! goto usage; ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-mididev")) ! { ! sys_parsedevlist(&sys_nmidiin, sys_midiindevlist, MAXMIDIINDEV, ! argv[1]); ! sys_parsedevlist(&sys_nmidiout, sys_midioutdevlist, MAXMIDIOUTDEV, ! argv[1]); ! if (!sys_nmidiout) ! goto usage; ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-path")) ! { sys_searchpath = namelist_append_files(sys_searchpath, argv[1]); ! argc -= 2; argv += 2; ! } ! else if (!strcmp(*argv, "-nostdpath")) ! { ! sys_usestdpath = 0; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-stdpath")) ! { ! sys_usestdpath = 1; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-helppath")) ! { ! sys_helppath = namelist_append_files(sys_helppath, argv[1]); ! argc -= 2; argv += 2; ! } ! else if (!strcmp(*argv, "-open") && argc > 1) ! { ! sys_openlist = namelist_append_files(sys_openlist, argv[1]); ! argc -= 2; argv += 2; ! } ! else if (!strcmp(*argv, "-lib") && argc > 1) ! { ! sys_externlist = namelist_append_files(sys_externlist, argv[1]); ! argc -= 2; argv += 2; ! } ! else if (!strcmp(*argv, "-font") && argc > 1) ! { ! sys_defaultfont = sys_nearestfontsize(atoi(argv[1])); ! argc -= 2; ! argv += 2; ! } ! /* tb: font name { */ ! else if (!strcmp(*argv, "-typeface") && argc > 1) ! { ! strncpy(sys_font,*(argv+1),sizeof sys_font-1); ! sys_font[sizeof(sys_font)-1] = 0; /* set trailing 0 in case of space exhaustion */ ! argc -= 2; ! argv += 2; ! } ! /* tb: skip flag, we already parsed it */ ! else if (!strcmp(*argv, "-no-prefs")) ! { ! argc -= 1; ! argv += 1; ! } ! /* } tb */ ! /* jmz: read an alternative rcfile { */ ! else if (!strcmp(*argv, "-rcfile")) ! { ! sys_parsercfile(*(argv+1)); ! argc -= 2; ! argv += 2; ! } ! /* } jmz */ ! else if (!strcmp(*argv, "-verbose")) ! { ! sys_verbose++; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-version")) ! { ! sys_version = 1; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-d") && argc > 1 && ! sscanf(argv[1], "%d", &sys_debuglevel) >= 1) ! { ! argc -= 2; ! argv += 2; ! } ! else if (!strcmp(*argv, "-noloadbang")) ! { ! sys_noloadbang = 1; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-nogui")) ! { ! sys_printtostderr = sys_nogui = 1; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-guiport") && argc > 1 && ! sscanf(argv[1], "%d", &sys_guisetportnumber) >= 1) ! { ! argc -= 2; ! argv += 2; ! } ! else if (!strcmp(*argv, "-stderr")) ! { ! sys_printtostderr = 1; ! argc--; argv++; } ! else if (!strcmp(*argv, "-guicmd") && argc > 1) ! { ! sys_guicmd = argv[1]; ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-send") && argc > 1) ! { sys_messagelist = namelist_append(sys_messagelist, argv[1], 1); ! argc -= 2; argv += 2; ! } ! else if (!strcmp(*argv, "-listdev")) ! { ! sys_listdevs(); ! argc--; argv++; } /* jsarlo { */ ! else if (!strcmp(*argv, "-schedlib")) ! { sys_externalschedlib = 1; strcpy(sys_externalschedlibname, argv[1]); ! argv += 2; ! argc -= 2; } ! else if (!strcmp(*argv, "-extraflags")) ! { sys_extraflags = 1; strcpy(sys_extraflagsstring, argv[1]); ! argv += 2; ! argc -= 2; } /* } jsarlo */ #ifdef UNISTD ! else if (!strcmp(*argv, "-rt") || !strcmp(*argv, "-realtime")) ! { ! sys_hipriority = 1; ! argc--; argv++; ! } ! else if (!strcmp(*argv, "-nrt")) ! { ! sys_hipriority = 0; ! argc--; argv++; ! } #endif ! else if (!strcmp(*argv, "-soundindev") || ! !strcmp(*argv, "-audioindev")) ! { /* IOhannes */ ! sys_parsedevlist(&sys_nsoundin, sys_soundindevlist, ! MAXAUDIOINDEV, argv[1]); ! if (!sys_nsoundin) ! goto usage; ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-soundoutdev") || ! !strcmp(*argv, "-audiooutdev")) ! { /* IOhannes */ ! sys_parsedevlist(&sys_nsoundout, sys_soundoutdevlist, ! MAXAUDIOOUTDEV, argv[1]); ! if (!sys_nsoundout) ! goto usage; ! argc -= 2; argv += 2; } ! else if (!strcmp(*argv, "-sounddev") || !strcmp(*argv, "-audiodev")) ! { ! sys_parsedevlist(&sys_nsoundin, sys_soundindevlist, ! MAXAUDIOINDEV, argv[1]); ! sys_parsedevlist(&sys_nsoundout, sys_soundoutdevlist, ! MAXAUDIOOUTDEV, argv[1]); ! if (!sys_nsoundout) ! goto usage; ! argc -= 2; argv += 2; } - else - { - unsigned int i; usage: for (i = 0; i < sizeof(usagemessage)/sizeof(*usagemessage); i++) fprintf(stderr, "%s", usagemessage[i]); ! return (1); ! } } ! if (!sys_defaultfont) ! sys_defaultfont = DEFAULTFONT; ! for (; argc > 0; argc--, argv++) sys_openlist = namelist_append_files(sys_openlist, *argv); ! ! ! return (0); } --- 693,794 ---- #endif sys_mmio = 1; ! NEXT(1); } ! ! if (ARG("-nomidiin", 1)) {sys_nmidiin = 0; NEXT(1);} ! if (ARG("-nomidiout",1)) {sys_nmidiout = 0; NEXT(1);} ! if (ARG("-nomidi",1)) {sys_nmidiin = sys_nmidiout = 0; NEXT(1);} ! if (ARG("-midiindev",1)) { ! sys_parsedevlist(&sys_nmidiin, sys_midiindevlist, MAXMIDIINDEV, argv[1]); ! if (!sys_nmidiin) goto usage; ! NEXT(2); } ! if (ARG("-midioutdev",1)) { ! sys_parsedevlist(&sys_nmidiout, sys_midioutdevlist, MAXMIDIOUTDEV, argv[1]); ! if (!sys_nmidiout) goto usage; ! NEXT(2); } ! if (ARG("-mididev",1)) { ! sys_parsedevlist(&sys_nmidiin, sys_midiindevlist, MAXMIDIINDEV, argv[1]); ! sys_parsedevlist(&sys_nmidiout, sys_midioutdevlist, MAXMIDIOUTDEV, argv[1]); ! if (!sys_nmidiout) goto usage; ! NEXT(2); } ! if (ARG("-path",2)) { sys_searchpath = namelist_append_files(sys_searchpath, argv[1]); ! NEXT(2); } ! if (ARG("-nostdpath",1)) {sys_usestdpath = 0; NEXT(1);} ! if (ARG("-stdpath",1)) {sys_usestdpath = 1; NEXT(1);} ! if (ARG("-helppath",1)) {sys_helppath = namelist_append_files(sys_helppath, argv[1]); NEXT(2);} ! if (ARG("-open",2)) {sys_openlist = namelist_append_files(sys_openlist, argv[1]); NEXT(2);} ! if (ARG("-lib",2)) {sys_externlist = namelist_append_files(sys_externlist, argv[1]); NEXT(2);} ! if (ARG("-font",2)) { ! fprintf(stderr,"Warning: -font ignored by DesireData; use .ddrc instead\n"); ! //sys_defaultfont = sys_nearestfontsize(atoi(argv[1])); ! NEXT(2); } ! if (ARG("-typeface",2)) { /* tim */ ! fprintf(stderr,"Warning: -typeface ignored by DesireData; use .ddrc instead\n"); ! NEXT(2); ! } ! if (ARG("-no-prefs",1)) NEXT(1); /* tim: skip flag, we already parsed it */ ! /* jmz: read an alternative rcfile { */ ! if (ARG("-rcfile",2)) {sys_parsercfile(argv[1]); NEXT(2);} /* recursively */ ! /* } jmz */ ! if (ARG("-verbose",1)) {sys_verbose++; NEXT(1);} ! if (ARG("-version",1)) {sys_version = 1; NEXT(1);} ! if (ARG("-d",2) && sscanf(argv[1], "%d", &sys_debuglevel) >= 1) NEXT(2); ! if (ARG("-noloadbang",1)) {sys_noloadbang = 1; NEXT(1);} ! if (ARG("-nogui",1)) {sys_printtostderr = sys_nogui = 1; NEXT(1);} ! if (ARG("-guiport",2) && sscanf(argv[1], "%d", &sys_guisetportnumber) >= 1) NEXT(2); ! if (ARG("-stderr",1)) {sys_printtostderr = 1; NEXT(1);} ! if (ARG("-guicmd",2)) {sys_guicmd = argv[1]; NEXT(2);} ! if (ARG("-send",2)) { sys_messagelist = namelist_append(sys_messagelist, argv[1], 1); ! NEXT(2); } + if (ARG("-listdev",1)) {sys_listdevs(); NEXT(1);} /* jsarlo { */ ! if (ARG("-schedlib",2)) { sys_externalschedlib = 1; strcpy(sys_externalschedlibname, argv[1]); ! NEXT(2); } ! if (ARG("-extraflags",2)) { sys_extraflags = 1; strcpy(sys_extraflagsstring, argv[1]); ! NEXT(2); } /* } jsarlo */ #ifdef UNISTD ! if (ARG("-rt",1) || ARG("-realtime",1)) {sys_hipriority = 1; NEXT(1);} ! if (ARG("-nrt",1)) {sys_hipriority = 0; NEXT(1);} #endif ! if (ARG("-soundindev",2) || ARG("-audioindev",2)) { /* IOhannes */ ! sys_parsedevlist(&sys_nsoundin, sys_soundindevlist, MAXAUDIOINDEV, argv[1]); ! if (!sys_nsoundin) goto usage; ! NEXT(2); } ! if (ARG("-soundoutdev",2) || ARG("-audiooutdev",2)) { /* IOhannes */ ! sys_parsedevlist(&sys_nsoundout, sys_soundoutdevlist, MAXAUDIOOUTDEV, argv[1]); ! if (!sys_nsoundout) goto usage; ! NEXT(2); } ! if (ARG("-sounddev",2) || ARG("-audiodev",2)) { ! sys_parsedevlist(&sys_nsoundin, sys_soundindevlist, MAXAUDIOINDEV, argv[1]); ! sys_parsedevlist(&sys_nsoundout, sys_soundoutdevlist, MAXAUDIOOUTDEV, argv[1]); ! if (!sys_nsoundout) goto usage; ! NEXT(2); } usage: for (i = 0; i < sizeof(usagemessage)/sizeof(*usagemessage); i++) fprintf(stderr, "%s", usagemessage[i]); ! return 1; } ! if (!sys_defaultfont) sys_defaultfont = DEFAULTFONT; ! for (; argc > 0; argc--, argv++) sys_openlist = namelist_append_files(sys_openlist, *argv); ! return 0; } *************** *** 1086,1092 **** sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0); } - - static void sys_addreferencepath(void) - { - char sbuf[MAXPDSTRING]; - } --- 891,892 ----
[View Less]
1
0
0
0
pd/src makefile.in,1.4.4.2.2.21.2.2,1.4.4.2.2.21.2.3
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv633 Modified Files: Tag: desiredata makefile.in Log Message: merged $(GFLAGS) and $(INCLUDE) into $(CFLAGS); changed gcc warning policy. Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.2 retrieving revision 1.4.4.2.2.21.2.3 diff -C2 -d -r1.4.4.2.2.21.2.2 -r1.4.4.2.2.21.2.3 *
…
[View More]
** makefile.in 30 Nov 2006 16:22:58 -0000 1.4.4.2.2.21.2.2 --- makefile.in 30 Nov 2006 17:18:23 -0000 1.4.4.2.2.21.2.3 *************** *** 1,12 **** EXT= @EXT@ INSTALL_PREFIX = @prefix@ - GFLAGS = -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" MANDIR = @mandir@ MORECFLAGS = @MORECFLAGS@ - INCLUDE = -I. LDFLAGS = @LDFLAGS@ OPT_CFLAGS = @OPT_CFLAGS@ ARCH_CFLAGS = -DPD CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # from DesireData (matju & chun) --- 1,12 ---- EXT= @EXT@ INSTALL_PREFIX = @prefix@ MANDIR = @mandir@ MORECFLAGS = @MORECFLAGS@ LDFLAGS = @LDFLAGS@ OPT_CFLAGS = @OPT_CFLAGS@ ARCH_CFLAGS = -DPD CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) + CFLAGS += -Wall -Wno-unused-parameter -I. + CFLAGS += -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" # from DesireData (matju & chun) *************** *** 39,46 **** $(SRCXX:.c=.o): %.o: %.c config.log ! $(CXX) -Wall -Wno-unused-parameter -xc++ $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c $(SRC:.c=.o): %.o: %.c config.log ! $(CC) -Wall -Wno-parentheses -Wno-switch -Wno-unused -Wstrict-prototypes $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c pd: $(OBJ) config.log --- 39,46 ---- $(SRCXX:.c=.o): %.o: %.c config.log ! $(CXX) $(CFLAGS) -xc++ -c -o $*.o $*.c $(SRC:.c=.o): %.o: %.c config.log ! $(CC) $(CFLAGS) -Wno-parentheses -Wno-switch -Wno-unused-variable -Wstrict-prototypes -c -o $*.o $*.c pd: $(OBJ) config.log *************** *** 114,118 **** makefile.deps: makefile ! $(CC) $(INCLUDE) $(CFLAGS) -MM $(SRC) > makefile.deps uninstall: --- 114,118 ---- makefile.deps: makefile ! $(CC) $(CFLAGS) -MM $(SRC) > makefile.deps uninstall: *************** *** 121,125 **** rm -f $(INSTDIR)/bin/pdsend rm -f $(INSTDIR)/bin/pdreceive ! rm -f $(INSTDIR)/include/m_pd.h rm -f $(MANINSTDIR)/man1/pd.1.gz rm -f $(MANINSTDIR)/man1/pdsend.1.gz --- 121,125 ---- rm -f $(INSTDIR)/bin/pdsend rm -f $(INSTDIR)/bin/pdreceive ! rm -f $(INSTDIR)/d/m_pd.h rm -f $(MANINSTDIR)/man1/pd.1.gz rm -f $(MANINSTDIR)/man1/pdsend.1.gz
[View Less]
1
0
0
0
pd/src desire.c,1.1.2.217.2.2,1.1.2.217.2.3
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30118 Modified Files: Tag: desiredata desire.c Log Message: not all object creations increment the serial. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.2 retrieving revision 1.1.2.217.2.3 diff -C2 -d -r1.1.2.217.2.2 -r1.1.2.217.2.3 *** desire.c 30 Nov 2006 17:07:00 -0000 1.
…
[View More]
1.2.217.2.2 --- desire.c 30 Nov 2006 17:09:59 -0000 1.1.2.217.2.3 *************** *** 844,847 **** --- 844,848 ---- extern "C" void pd_set_newest (t_pd *x) { newest = x; + if (!origin) return; /* the following only applies to objects created by client */ unsigned short serial = manager->serial++; sys_vgui("serial %x %x\n",serial,x);
[View Less]
1
0
0
0
pd/src desire.c,1.1.2.217.2.1,1.1.2.217.2.2
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29052 Modified Files: Tag: desiredata desire.c Log Message: fix for previous commit Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.1 retrieving revision 1.1.2.217.2.2 diff -C2 -d -r1.1.2.217.2.1 -r1.1.2.217.2.2 *** desire.c 30 Nov 2006 16:22:55 -0000 1.1.2.217.2.1 --- desire.
…
[View More]
c 30 Nov 2006 17:07:00 -0000 1.1.2.217.2.2 *************** *** 7880,7884 **** that externs can link back to functions defined in pd. */ ! int sys_main(int argc, char **argv); #if defined(_WIN32) && !defined(_CONSOLE) #include <windows.h> --- 7880,7884 ---- that externs can link back to functions defined in pd. */ ! extern "C" int sys_main(int argc, char **argv); #if defined(_WIN32) && !defined(_CONSOLE) #include <windows.h>
[View Less]
1
0
0
0
pd/src desire.c, 1.1.2.217, 1.1.2.217.2.1 makefile.in, 1.4.4.2.2.21.2.1, 1.4.4.2.2.21.2.2 s_entry.c, 1.2.4.2.2.2, NONE
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13121 Modified Files: Tag: desiredata desire.c makefile.in Removed Files: Tag: desiredata s_entry.c Log Message: merging s_entry.c into desire.c Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.1 retrieving revision 1.4.4.2.2.21.2.2 diff -C2 -d -r1.4.4.2.2.21.2.1 -r1.
…
[View More]
4.4.2.2.21.2.2 *** makefile.in 30 Nov 2006 05:39:58 -0000 1.4.4.2.2.21.2.1 --- makefile.in 30 Nov 2006 16:22:58 -0000 1.4.4.2.2.21.2.2 *************** *** 18,23 **** # from pd miller SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ ! m_glob.c m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c \ ! s_entry.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \ --- 18,22 ---- # from pd miller SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ ! m_glob.c m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \ --- s_entry.c DELETED --- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217 retrieving revision 1.1.2.217.2.1 diff -C2 -d -r1.1.2.217 -r1.1.2.217.2.1 *** desire.c 28 Nov 2006 21:23:58 -0000 1.1.2.217 --- desire.c 30 Nov 2006 16:22:55 -0000 1.1.2.217.2.1 *************** *** 7863,7867 **** /* ---------------------------------------------------------------- */ ! /* formerly m_conf.c */ #define S(name) void name##_setup(void); name##_setup(); --- 7863,7867 ---- /* ---------------------------------------------------------------- */ ! /* formerly m_conf.c and s_entry.c */ #define S(name) void name##_setup(void); name##_setup(); *************** *** 7876,7877 **** --- 7876,7896 ---- } }; + + /* In MSW, this is all there is to pd; the rest sits in a "pdlib" dll so + that externs can link back to functions defined in pd. */ + + int sys_main(int argc, char **argv); + #if defined(_WIN32) && !defined(_CONSOLE) + #include <windows.h> + #include <stdio.h> + int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { + __try { + sys_main(__argc,__argv); + } __finally { + printf("caught an exception; stopping\n"); + } + } + #else /* not MSVC */ + int main(int argc, char **argv) {return sys_main(argc, argv);} + #endif +
[View Less]
1
0
0
0
pd/extra SConscript,1.1.2.5,NONE
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27272 Removed Files: Tag: desiredata SConscript Log Message: bye. --- SConscript DELETED ---
1
0
0
0
pd INSTALL.desire,1.1.2.2,NONE README.desire,1.1.2.1,NONE
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25789 Removed Files: Tag: desiredata INSTALL.desire README.desire Log Message: moved to *.txt --- INSTALL.desire DELETED --- --- README.desire DELETED ---
1
0
0
0
pd SConstruct,1.1.4.18,NONE
by Mathieu Bouchard
30 Nov '06
30 Nov '06
Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21868 Removed Files: Tag: desiredata SConstruct Log Message: bye. --- SConstruct DELETED ---
1
0
0
0
← Newer
1
2
3
4
...
57
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
Results per page:
10
25
50
100
200