Pd-cvs March 2004

pd-cvs@lists.iem.at

11 participants
225 discussions

pd/src g_all_guis.c,1.1.1.4.2.4.2.8,1.1.1.4.2.4.2.9 g_all_guis.h,1.1.1.4.2.2.2.5,1.1.1.4.2.2.2.6
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10655 Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h Log Message: sys_mgui() take two Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.5 retrieving revision 1.1.1.4.2.2.2.6 diff -C2 -d -r1.1.1.4.2.2.2.5 -r1.1.1.4.2.2.2.6 *** g_all_guis.h 28 Mar 2004 06:25:07 -0000 1.1.1.4.2.2.2.5 --- g_all_guis.h 28 Mar 2004 07:19:06 -0000 1.1.1.4.2.2.2.6 *************** *** 307,309 **** EXTERN int pd_scanargs(int argc, t_atom *argv, char *format, ...); EXTERN void pd_upload(t_gobj *self); ! EXTERN void sys_mgui(t_iemgui *self, const char *sel, const char *fmt, ...); --- 307,309 ---- EXTERN int pd_scanargs(int argc, t_atom *argv, char *format, ...); EXTERN void pd_upload(t_gobj *self); ! EXTERN void sys_mgui(t_iemgui *self, const char *qlass, const char *sel, const char *fmt, ...); Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.8 retrieving revision 1.1.1.4.2.4.2.9 diff -C2 -d -r1.1.1.4.2.4.2.8 -r1.1.1.4.2.4.2.9 *** g_all_guis.c 28 Mar 2004 06:25:07 -0000 1.1.1.4.2.4.2.8 --- g_all_guis.c 28 Mar 2004 07:19:06 -0000 1.1.1.4.2.4.2.9 *************** *** 668,672 **** } ! void sys_mgui(t_iemgui *self, const char *sel, const char *fmt, ...) { char buf[4096]; int i=0, n=4096; --- 668,672 ---- } ! void sys_mgui(t_iemgui *self, const char *qlass, const char *sel, const char *fmt, ...) { char buf[4096]; int i=0, n=4096; *************** *** 676,686 **** va_list val; va_start(val,fmt); ! i+=snprintf(buf,n-i,"%s_%s %x .x%x.c", cname, sel, (unsigned)self, (unsigned)canvas); if (i>=n) goto over; while (*fmt) { switch (*fmt) { ! case 'f': case 'd': i+=snprintf(buf,n-i," %f",va_arg(val,double)); break; ! case 's': i+=snprintf(buf,n-i," \"%s\"",va_arg(val,t_symbol *)->s_name); break; ! case 'S': i+=snprintf(buf,n-i," \"%s\"",va_arg(val,const char *)); break; } if (i>=n) goto over; --- 676,687 ---- va_list val; va_start(val,fmt); ! i+=snprintf(buf+i,n-i,"%s_%s %x .x%x.c", qlass?qlass:cname, sel, (unsigned)self, (unsigned)canvas); if (i>=n) goto over; while (*fmt) { switch (*fmt) { ! case 'f': case 'd': i+=snprintf(buf+i,n-i," %f",va_arg(val,double)); break; ! case 'i': i+=snprintf(buf+i,n-i," %d",va_arg(val,int)); break; ! case 's': i+=snprintf(buf+i,n-i," \"%s\"",va_arg(val,t_symbol *)->s_name); break; ! case 'S': i+=snprintf(buf+i,n-i," \"%s\"",va_arg(val,const char *)); break; } if (i>=n) goto over; *************** *** 688,691 **** --- 689,696 ---- } va_end(val); + i+=snprintf(buf+i,n-i,"\n"); + if (i>=n) goto over; + fprintf(stderr,">>> %s",buf); + sys_gui(buf); return; over:

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.7,1.1.1.4.2.4.2.8 g_all_guis.h,1.1.1.4.2.2.2.4,1.1.1.4.2.2.2.5
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3582 Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h Log Message: new function sys_mgui() Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.4 retrieving revision 1.1.1.4.2.2.2.5 diff -C2 -d -r1.1.1.4.2.2.2.4 -r1.1.1.4.2.2.2.5 *** g_all_guis.h 28 Mar 2004 04:18:18 -0000 1.1.1.4.2.2.2.4 --- g_all_guis.h 28 Mar 2004 06:25:07 -0000 1.1.1.4.2.2.2.5 *************** *** 83,87 **** #define IEM_GUI_DRAW_MODE_IO 6 - #define IS_A_POINTER(atom,index) ((atom+index)->a_type == A_POINTER) #define IS_A_FLOAT(atom,index) ((atom+index)->a_type == A_FLOAT) --- 83,86 ---- *************** *** 95,100 **** #define IEM_GUI_OLD_SND_FLAG 1 #define IEM_GUI_OLD_RCV_FLAG 2 ! ! #define IEM_GUI_COLOR_EDITED 16711680 #define IEMGUI_MAX_NUM_LEN 32 --- 94,98 ---- #define IEM_GUI_OLD_SND_FLAG 1 #define IEM_GUI_OLD_RCV_FLAG 2 ! #define IEM_GUI_COLOR_EDITED 0xFF0000 #define IEMGUI_MAX_NUM_LEN 32 *************** *** 309,310 **** --- 307,309 ---- EXTERN int pd_scanargs(int argc, t_atom *argv, char *format, ...); EXTERN void pd_upload(t_gobj *self); + EXTERN void sys_mgui(t_iemgui *self, const char *sel, const char *fmt, ...); Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.7 retrieving revision 1.1.1.4.2.4.2.8 diff -C2 -d -r1.1.1.4.2.4.2.7 -r1.1.1.4.2.4.2.8 *** g_all_guis.c 28 Mar 2004 04:18:18 -0000 1.1.1.4.2.4.2.7 --- g_all_guis.c 28 Mar 2004 06:25:07 -0000 1.1.1.4.2.4.2.8 *************** *** 652,656 **** return 1; err: ! post("WARNING: pd_scanargs failed; fmt=%s, i=%d",fmt,i); return 0; } --- 652,656 ---- return 1; err: ! //post("WARNING: pd_scanargs failed; fmt=%s, i=%d",fmt,i); return 0; } *************** *** 663,668 **** c->c_savefn(self,buf); binbuf_gettext(buf,&s,&n); ! sys_vgui("update_object %x {%s}\n",self,s); binbuf_free(buf); free(s); } --- 663,693 ---- c->c_savefn(self,buf); binbuf_gettext(buf,&s,&n); ! sys_vgui("update_object %x {%s}\n",(unsigned)self,s); binbuf_free(buf); free(s); } + + void sys_mgui(t_iemgui *self, const char *sel, const char *fmt, ...) { + char buf[4096]; + int i=0, n=4096; + t_class *c = self->x_obj.te_g.g_pd; + const char *cname = c->c_name->s_name; + t_canvas *canvas=glist_getcanvas(self->x_glist); + va_list val; + va_start(val,fmt); + i+=snprintf(buf,n-i,"%s_%s %x .x%x.c", cname, sel, (unsigned)self, (unsigned)canvas); + if (i>=n) goto over; + while (*fmt) { + switch (*fmt) { + case 'f': case 'd': i+=snprintf(buf,n-i," %f",va_arg(val,double)); break; + case 's': i+=snprintf(buf,n-i," \"%s\"",va_arg(val,t_symbol *)->s_name); break; + case 'S': i+=snprintf(buf,n-i," \"%s\"",va_arg(val,const char *)); break; + } + if (i>=n) goto over; + fmt++; + } + va_end(val); + return; + over: + post("sys_mgui: can't send: buffer overflow"); + }

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.6,1.1.1.4.2.4.2.7 g_all_guis.h,1.1.1.4.2.2.2.3,1.1.1.4.2.2.2.4 g_vumeter.c,1.1.1.3.2.2.2.4,1.1.1.3.2.2.2.5
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19761 Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h g_vumeter.c Log Message: giving back to [vu] what belongs to [vu] Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.3 retrieving revision 1.1.1.4.2.2.2.4 diff -C2 -d -r1.1.1.4.2.2.2.3 -r1.1.1.4.2.2.2.4 *** g_all_guis.h 10 Mar 2004 06:00:11 -0000 1.1.1.4.2.2.2.3 --- g_all_guis.h 28 Mar 2004 04:18:18 -0000 1.1.1.4.2.2.2.4 *************** *** 253,259 **** extern int sys_noloadbang; extern int iemgui_color_hex[]; - extern int iemgui_vu_db2i[]; - extern int iemgui_vu_col[]; - extern char *iemgui_vu_scale_str[]; EXTERN int pd_bluify(int colour); --- 253,256 ---- Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.4 retrieving revision 1.1.1.3.2.2.2.5 diff -C2 -d -r1.1.1.3.2.2.2.4 -r1.1.1.3.2.2.2.5 *** g_vumeter.c 14 Mar 2004 22:33:54 -0000 1.1.1.3.2.2.2.4 --- g_vumeter.c 28 Mar 2004 04:18:18 -0000 1.1.1.3.2.2.2.5 *************** *** 23,26 **** --- 23,63 ---- #endif + static int iemgui_vu_db2i[]= + { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 9, 9, 9, 9, 9,10,10,10,10,10,11,11,11,11,11,12,12,12,12,12, + 13,13,13,13,14,14,14,14,15,15,15,15,16,16,16,16,17,17,17,18, + 18,18,19,19,19,20,20,20,21,21,22,22,23,23,24,24,25,26,27,28, + 29,30,31,32,33,33,34,34,35,35,36,36,37,37,37,38,38,38,39,39, + 39,39,39,39,40,40 + }; + + static int iemgui_vu_col[]= + { + 0,17,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, + 15,15,15,15,15,15,15,15,15,15,14,14,13,13,13,13,13,13,13,13,13,13,13,19,19,19 + }; + + static char *iemgui_vu_scale_str[]= + { + "", "<-99", "", "", + "", "-50", "", "", + "", "-30", "", "", + "", "-20", "", "", + "", "-12", "", "", + "", "-6", "", "", + "", "-2", "", "", + "", "-0dB", "", "", + "", "+2", "", "", + "", "+6", "", "", + "", ">+12", "", "", "", "", "", + }; + /* ----- vu gui-peak- & rms- vu-meter-display ---------- */ Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.6 retrieving revision 1.1.1.4.2.4.2.7 diff -C2 -d -r1.1.1.4.2.4.2.6 -r1.1.1.4.2.4.2.7 *** g_all_guis.c 19 Mar 2004 20:19:55 -0000 1.1.1.4.2.4.2.6 --- g_all_guis.c 28 Mar 2004 04:18:18 -0000 1.1.1.4.2.4.2.7 *************** *** 38,90 **** }; - int iemgui_vu_db2i[]= - { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 9, 9, 9, 9, 9,10,10,10,10,10, - 11,11,11,11,11,12,12,12,12,12, - 13,13,13,13,14,14,14,14,15,15, - 15,15,16,16,16,16,17,17,17,18, - 18,18,19,19,19,20,20,20,21,21, - 22,22,23,23,24,24,25,26,27,28, - 29,30,31,32,33,33,34,34,35,35, - 36,36,37,37,37,38,38,38,39,39, - 39,39,39,39,40,40 - }; - - int iemgui_vu_col[]= - { - 0,17,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, - 15,15,15,15,15,15,15,15,15,15,14,14,13,13,13,13,13,13,13,13,13,13,13,19,19,19 - }; - - char *iemgui_vu_scale_str[]= - { - "", "<-99", "", "", - "", "-50", "", "", - "", "-30", "", "", - "", "-20", "", "", - "", "-12", "", "", - "", "-6", "", "", - "", "-2", "", "", - "", "-0dB", "", "", - "", "+2", "", "", - "", "+6", "", "", - "", ">+12", "", "", "", "", "", - }; - - /*------------------ global functions -------------------------*/ --- 38,41 ---- *************** *** 532,539 **** int sndable=1, rcvable=1, oldsndrcvable=0; ! if(iemgui->x_fsf.x_rcv_able) ! oldsndrcvable += IEM_GUI_OLD_RCV_FLAG; ! if(iemgui->x_fsf.x_snd_able) ! oldsndrcvable += IEM_GUI_OLD_SND_FLAG; if(IS_A_SYMBOL(argv,7)) srl[0] = atom_getsymbolarg(7, argc, argv); --- 483,488 ---- int sndable=1, rcvable=1, oldsndrcvable=0; ! if(iemgui->x_fsf.x_rcv_able) oldsndrcvable += IEM_GUI_OLD_RCV_FLAG; ! if(iemgui->x_fsf.x_snd_able) oldsndrcvable += IEM_GUI_OLD_SND_FLAG; if(IS_A_SYMBOL(argv,7)) srl[0] = atom_getsymbolarg(7, argc, argv);

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.25,1.1.1.4.2.7.4.26
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19344 Modified Files: Tag: impd_0_37 u_main.tk Log Message: .pdrc editor, second spike Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.25 retrieving revision 1.1.1.4.2.7.4.26 diff -C2 -d -r1.1.1.4.2.7.4.25 -r1.1.1.4.2.7.4.26 *** u_main.tk 28 Mar 2004 03:15:23 -0000 1.1.1.4.2.7.4.25 --- u_main.tk 28 Mar 2004 04:14:27 -0000 1.1.1.4.2.7.4.26 *************** *** 2195,2242 **** set pdrc_options { ! -r int "sample rate" ! -soundindev|-audioindev parsedevlist "audio in devices; e.g., \"1,3\" for first and third" ! -soundoutdev|-audiooutdev parsedevlist "audio devices; e.g., \"1,3\" for first and third" ! -sounddev|-audiodev parsedevlist {!} ! -inchannels sys_parsedevlist "audio input channels (by device, like \"2\" or \"16,8\")" ! -outchannels sys_parsedevlist "number of audio out channels (same)" ! -channels alias {list -inchannels %1 -outchannels %1} ! -audiobuf|-soundbuf int "specify size of audio buffer in msec" ! -blocksize int "specify audio I/O block size in sample frames" ! -sleepgrain int "specify number of milliseconds to sleep when idle" ! -nodac void "suppress audio output" ! -noadc void "suppress audio input" ! -noaudio|-nosound alias {list -nodac -noadc} ! -alsa void " use ALSA audio API" ! -jack void "use JACK audio API" ! -mmio void "use MMIO audio API (default for Windows)" ! -portaudio|-pa|-asio void "use ASIO audio driver (via Portaudio)" ! -oss void "use OSS audio API" ! -32bit void "allow 32 bit OSS audio (for RME Hammerfall)" ! -nomidiin void "suppress MIDI input" ! -nomidiout void "suppress MIDI output" ! -nomidi alias {list -nomidiin -nomidiout} ! -midiindev sys_parsedevlist "midi in device list; e.g., \"1,3\" for first and third" ! -midioutdev sys_parsedevlist "midi out device list, same format" ! -mididev sys_parsedevlist {list -midindev %1 -midioutdev %1} ! -path folder "add to file search path" ! -helppath folder "add to help file search path" ! -open file "open file(s) on startup" ! -lib file "load object library(s)" ! -font int "specify default font size in points" ! -verbose void "extra printout on startup and when searching for files" ! -version void "don't run Pd; just print out which version it is" ! -d void "specify debug level" ! -noloadbang void "suppress all loadbangs" ! -nogui void "suppress starting the GUI" ! -guicmd string "substitute another GUI program (e.g., rsh)" ! -send string "send a message at startup (after patches are loaded)" ! -listdev void "list audio and MIDI devices" ! -rt|-realtime void "use real-time priority (needs root privilege)" ! -console int "console scrollback lines (0 = disable console)" ! -look folder "folder containing buttonbar icons" ! -statusbar void "enable statusbar" } --- 2195,2247 ---- set pdrc_options { ! section "" "Audio DSP" ! int -r "sample rate" ! devlist -soundindev|-audioindev "audio in devices" ! devlist -soundoutdev|-audiooutdev "audio out devices" ! alias -sounddev|-audiodev {list -soundindev %1 -soundoutdev %1} ! devlist -inchannels "audio input channels (by device, like \"2\" or \"16,8\")" ! devlist -outchannels "number of audio out channels (same)" ! alias -channels {list -inchannels %1 -outchannels %1} ! int -audiobuf|-soundbuf "specify size of audio buffer in msec" ! int -blocksize "specify audio I/O block size in sample frames" ! int -sleepgrain "specify number of milliseconds to sleep when idle" ! void -nodac "suppress audio output" ! void -noadc "suppress audio input" ! alias -noaudio|-nosound {list -nodac -noadc} ! radio {-alsa -jack -mmio -portaudio|-pa|-asio -oss} { ! "use ALSA audio API" ! "use JACK audio API" ! "use MMIO audio API (default for Windows)" ! "use ASIO audio driver (via Portaudio)" ! "use OSS audio API" ! } ! void -32bit "allow 32 bit OSS audio (for RME Hammerfall)" ! section "" "MIDI" ! void -nomidiin "suppress MIDI input" ! void -nomidiout "suppress MIDI output" ! alias -nomidi {list -nomidiin -nomidiout} ! devlist -midiindev "midi in device list; e.g., \"1,3\" for first and third" ! devlist -midioutdev "midi out device list, same format" ! alias -mididev {list -midindev %1 -midioutdev %1} ! section "" "Other" ! folder -path "add to file search path" ! folder -helppath "add to help file search path" ! file -open "open file(s) on startup" ! file -lib "load object library(s)" ! int -font "specify default font size in points" ! void -verbose "extra printout on startup and when searching for files" ! void -version "don't run Pd; just print out which version it is" ! void -d "specify debug level" ! void -noloadbang "suppress all loadbangs" ! void -nogui "suppress starting the GUI" ! string -guicmd "substitute another GUI program (e.g., rsh)" ! string -send "send a message at startup (after patches are loaded)" ! void -listdev "list audio and MIDI devices" ! void -rt|-realtime "use real-time priority (needs root privilege)" ! int -console "console scrollback lines (0 = disable console)" ! folder -look "folder containing buttonbar icons" ! void -statusbar "enable statusbar" } *************** *** 2245,2249 **** proc pdrc_editor_apply {self} {error "BOO"} ! proc foo {args} {puts stderr "$args"} proc pdrc_editor_new {} { --- 2250,2263 ---- proc pdrc_editor_apply {self} {error "BOO"} ! proc notebook_select {self i} { ! global _ ! catch { ! .$self.bar.$_($self:section) configure -relief raised ! place forget .$self.main.$_($self:section) ! } ! set _($self:section) $i ! place .$self.main.$_($self:section) -x 0 -y 0 ! .$self.bar.$_($self:section) configure -relief sunken ! } proc pdrc_editor_new {} { *************** *** 2252,2270 **** toplevel .$self frame .$self.1 ! canvas .$self.1.1 -yscrollcommand ".$self.1.2 set" ! frame .$self.1.1.2 ! .$self.1.1 create window 0 0 -window .$self.1.1.2 -anchor nw ! scrollbar .$self.1.2 -command ".$self.1.1 yview" ! foreach {x y z} $pdrc_options { ! puts "$x $y $z" ! properties_dialog $self.1.1.2 pdrc_editor_ok [list $x "$x: $z" $y {}] } - pack .$self.1.1 -expand yes -fill both -side left - pack .$self.1.2 -fill y -side left - pack .$self.1 -expand yes -fill both cancel_apply_ok $self pdrc_editor ! .$self.1.1 configure -scrollregion \ ! [list 0 0 [.$self.1.1 cget -width] [.$self.1.1 cget -height]] ! .$self.1.2 set 0 [.$self.1.1 cget -height] return $self } --- 2266,2302 ---- toplevel .$self frame .$self.1 ! frame .$self.1.bar ! frame .$self.1.buttonsep -height 2 -borderwidth 1 -relief sunken ! frame .$self.1.main -borderwidth 1 -relief raised -width 600 -height 350 ! set section 0 ! foreach {type name desc} $pdrc_options { ! puts [list $type $name $desc] ! switch $type { void { set type toggle }} ! switch $type { ! section { ! incr section ! frame .$self.1.main.$section ! button .$self.1.bar.$section -text $desc \ ! -command [list notebook_select $self.1 $section] ! pack .$self.1.bar.$section -side left ! } ! alias {} ! radio { ! puts "(skipping radio)" ! properties_dialog $self.1.main.$section pdrc_editor_ok \ ! [list [lindex $name 0] "$desc" choice {}] ! } ! default { ! properties_dialog $self.1.main.$section pdrc_editor_ok \ ! [list $name "$name: $desc" $type {}] ! } ! } } cancel_apply_ok $self pdrc_editor ! notebook_select $self.1 1 ! pack .$self.1.bar -fill x ! pack .$self.1.buttonsep ! pack .$self.1.main -fill both -expand yes ! pack .$self.1 return $self }

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.24,1.1.1.4.2.7.4.25
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11369 Modified Files: Tag: impd_0_37 u_main.tk Log Message: how am i supposed to make scrollbars work on subframes? Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.24 retrieving revision 1.1.1.4.2.7.4.25 diff -C2 -d -r1.1.1.4.2.7.4.24 -r1.1.1.4.2.7.4.25 *** u_main.tk 28 Mar 2004 02:30:42 -0000 1.1.1.4.2.7.4.24 --- u_main.tk 28 Mar 2004 03:15:23 -0000 1.1.1.4.2.7.4.25 *************** *** 2201,2205 **** -inchannels sys_parsedevlist "audio input channels (by device, like \"2\" or \"16,8\")" -outchannels sys_parsedevlist "number of audio out channels (same)" ! -channels sys_parsedevlist {!} -audiobuf|-soundbuf int "specify size of audio buffer in msec" -blocksize int "specify audio I/O block size in sample frames" --- 2201,2205 ---- -inchannels sys_parsedevlist "audio input channels (by device, like \"2\" or \"16,8\")" -outchannels sys_parsedevlist "number of audio out channels (same)" ! -channels alias {list -inchannels %1 -outchannels %1} -audiobuf|-soundbuf int "specify size of audio buffer in msec" -blocksize int "specify audio I/O block size in sample frames" *************** *** 2207,2225 **** -nodac void "suppress audio output" -noadc void "suppress audio input" ! -noaudio|-nosound void "suppress audio input and output" - -oss void "use OSS audio API" - -32bit void "allow 32 bit OSS audio (for RME Hammerfall)" -alsa void " use ALSA audio API" -jack void "use JACK audio API" - -portaudio|-pa|-asio void "use ASIO audio driver (via Portaudio)" -mmio void "use MMIO audio API (default for Windows)" -nomidiin void "suppress MIDI input" -nomidiout void "suppress MIDI output" ! -nomidi void {!} -midiindev sys_parsedevlist "midi in device list; e.g., \"1,3\" for first and third" -midioutdev sys_parsedevlist "midi out device list, same format" ! -mididev sys_parsedevlist {!} -path folder "add to file search path" -helppath folder "add to help file search path" --- 2207,2225 ---- -nodac void "suppress audio output" -noadc void "suppress audio input" ! -noaudio|-nosound alias {list -nodac -noadc} -alsa void " use ALSA audio API" -jack void "use JACK audio API" -mmio void "use MMIO audio API (default for Windows)" + -portaudio|-pa|-asio void "use ASIO audio driver (via Portaudio)" + -oss void "use OSS audio API" + -32bit void "allow 32 bit OSS audio (for RME Hammerfall)" -nomidiin void "suppress MIDI input" -nomidiout void "suppress MIDI output" ! -nomidi alias {list -nomidiin -nomidiout} -midiindev sys_parsedevlist "midi in device list; e.g., \"1,3\" for first and third" -midioutdev sys_parsedevlist "midi out device list, same format" ! -mididev sys_parsedevlist {list -midindev %1 -midioutdev %1} -path folder "add to file search path" -helppath folder "add to help file search path" *************** *** 2245,2248 **** --- 2245,2250 ---- proc pdrc_editor_apply {self} {error "BOO"} + proc foo {args} {puts stderr "$args"} + proc pdrc_editor_new {} { global _ pdrc_options *************** *** 2250,2265 **** toplevel .$self frame .$self.1 ! canvas .$self.1.1 ! frame .$self.1.1.2 -width 420 -height 420 ! .$self.1.1 create window 0 0 -window .$self.1.1.2 scrollbar .$self.1.2 -command ".$self.1.1 yview" foreach {x y z} $pdrc_options { puts "$x $y $z" ! properties_dialog $self pdrc_editor_ok [list $x "$x: $z" $y {}] } pack .$self.1.1 -expand yes -fill both -side left ! pack .$self.1.2 -expand yes -fill y -side left ! pack .$self.1 cancel_apply_ok $self pdrc_editor return $self } --- 2252,2270 ---- toplevel .$self frame .$self.1 ! canvas .$self.1.1 -yscrollcommand ".$self.1.2 set" ! frame .$self.1.1.2 ! .$self.1.1 create window 0 0 -window .$self.1.1.2 -anchor nw scrollbar .$self.1.2 -command ".$self.1.1 yview" foreach {x y z} $pdrc_options { puts "$x $y $z" ! properties_dialog $self.1.1.2 pdrc_editor_ok [list $x "$x: $z" $y {}] } pack .$self.1.1 -expand yes -fill both -side left ! pack .$self.1.2 -fill y -side left ! pack .$self.1 -expand yes -fill both cancel_apply_ok $self pdrc_editor + .$self.1.1 configure -scrollregion \ + [list 0 0 [.$self.1.1 cget -width] [.$self.1.1 cget -height]] + .$self.1.2 set 0 [.$self.1.1 cget -height] return $self }

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.23,1.1.1.4.2.7.4.24
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5427 Modified Files: Tag: impd_0_37 u_main.tk Log Message: .pdrc editor : first spike Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.23 retrieving revision 1.1.1.4.2.7.4.24 diff -C2 -d -r1.1.1.4.2.7.4.23 -r1.1.1.4.2.7.4.24 *** u_main.tk 26 Mar 2004 07:12:12 -0000 1.1.1.4.2.7.4.23 --- u_main.tk 28 Mar 2004 02:30:42 -0000 1.1.1.4.2.7.4.24 *************** *** 109,114 **** set f .controls.$z frame $f ! frame $f.1 -borderwidth 2 -relief ridge ! frame $f.1.pad -height 5 entry $f.1.level -textvariable ctrls_${z}level -width 3 button $f.1.clip -text "Clip" -state disabled --- 109,114 ---- set f .controls.$z frame $f ! frame $f.1 -borderwidth 2 -relief groove ! frame $f.1.pad -height 1 entry $f.1.level -textvariable ctrls_${z}level -width 3 button $f.1.clip -text "Clip" -state disabled *************** *** 393,396 **** --- 393,397 ---- {} {"Class List" {show_class_list} ""} + {".pdrc Editor" {pdrc_editor_new} ""} {"Message" {menu_send} "Ctrl+m"} {"Path..." {pd "pd start-path-dialog ;"} ""} *************** *** 725,730 **** bind $name.c <Button-5> "$name.c yview scroll +1 units" }} ! #image create photo lena -file "/home/matju/lena.ppm" ! #$name.c create image 0 0 -image lena -anchor nw } --- 726,731 ---- bind $name.c <Button-5> "$name.c yview scroll +1 units" }} ! #image create photo mybackground -file "/home/matju/lena.ppm" ! #$name.c create image 0 0 -anchor nw -image mybackground } *************** *** 754,766 **** proc pdtk_canvas_click {name x y b f} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b $f \;} ! proc pdtk_canvas_shiftclick {name x y b} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 1 \;} ! proc pdtk_canvas_ctrlclick {name x y b} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 2 \;} ! proc pdtk_canvas_altclick {name x y b} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 3 \;} ! proc pdtk_canvas_dblclick {name x y b} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 4 \;} set pdtk_canvas_mouseup(name) 0 --- 755,766 ---- proc pdtk_canvas_click {name x y b f} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b $f \; ! set tags [$name gettags [lindex [$name find overlapping $x $y $x $y] end]] ! puts stderr "click $name $x $y $b $f : $tags " ! if {![regexp {^([a-f0-9]{7})} $tags tag]} {return} ! global _ ! if {[info exists _($tag:class)]} {set class $_($tag:class)} {set class unknown} ! puts stderr " -> $tag ($class)" ! } set pdtk_canvas_mouseup(name) 0 *************** *** 978,990 **** foreach {name label type options} $struct { switch -- $type { - entry { - frame .$self.$name - label .$self.$name.label -text $label - pack .$self.$name.label -side left - eval "entry .$self.$name.entry -textvariable _($self:$name) $options" - pack .$self.$name.entry -side left - bind .$self.$name.entry <Return> "$ok .$self" - pack .$self.$name -side top - } side { frame .$self.$name --- 978,981 ---- *************** *** 1029,1032 **** --- 1020,1036 ---- pack .$self.$name -side top } + default { + frame .$self.$name + label .$self.$name.label -text $label + pack .$self.$name.label -side left + eval "entry .$self.$name.entry -textvariable _($self:$name) $options" + pack .$self.$name.entry -side left + bind .$self.$name.entry <Return> "$ok .$self" + if {[string compare $type "entry"]} { + label .$self.$name.type -text "($type)" + pack .$self.$name.type + } + pack .$self.$name -side top + } } } *************** *** 1082,1086 **** $_($self:wherelabel) \ $_($self:symfrom) \ ! [gatom_escape $_($self:symto)] \;" } --- 1086,1090 ---- $_($self:wherelabel) \ $_($self:symfrom) \ ! [gatom_escape $_($self:symto)] ;" } *************** *** 1523,1535 **** # create a new text object ! proc pdtk_text_new {canvasname myname x y text font color} { ! $canvasname create text $x $y \ -font [format -*-courier-medium--normal--%d-* $font] \ -tags $myname -text $text -fill $color -anchor nw } # change the text ! proc pdtk_text_set {canvasname myname text} { ! $canvasname itemconfig $myname -text $text } --- 1527,1549 ---- # create a new text object ! proc pdtk_text_new {canvas myname x y text font color} { ! $canvas create rectangle $x $y $x $y -tags ${myname}_R -fill yellow -width 0 ! $canvas create text $x $y \ -font [format -*-courier-medium--normal--%d-* $font] \ -tags $myname -text $text -fill $color -anchor nw + foreach {x1 y1 x2 y2} [$canvas bbox ${myname}] {} + $canvas coords ${myname}_R $x1 $y1 $x2 $y2 } # change the text ! proc pdtk_text_set {canvas myname text} { ! $canvas itemconfigure $myname -text $text ! foreach {x1 y1 x2 y2} [$canvas bbox ${myname}] { ! $canvas coords ${myname}_R $x1 $y1 $x2 $y2 ! } ! } ! ! proc pdtk_text_delete {canvas myname} { ! $canvas delete ${myname}_R $myname } *************** *** 2227,2230 **** --- 2241,2268 ---- } + proc pdrc_editor_ok {self} {pdrc_editor_apply $self; pdrc_editor_cancel $self} + proc pdrc_editor_cancel {self} {destroy $self} + proc pdrc_editor_apply {self} {error "BOO"} + + proc pdrc_editor_new {} { + global _ pdrc_options + set self pdrc + toplevel .$self + frame .$self.1 + canvas .$self.1.1 + frame .$self.1.1.2 -width 420 -height 420 + .$self.1.1 create window 0 0 -window .$self.1.1.2 + scrollbar .$self.1.2 -command ".$self.1.1 yview" + foreach {x y z} $pdrc_options { + puts "$x $y $z" + properties_dialog $self pdrc_editor_ok [list $x "$x: $z" $y {}] + } + pack .$self.1.1 -expand yes -fill both -side left + pack .$self.1.2 -expand yes -fill y -side left + pack .$self.1 + cancel_apply_ok $self pdrc_editor + return $self + } + ############ tooltips

1 0

pd/src s_path.c,1.1.1.2.2.2.2.1,1.1.1.2.2.2.2.2
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13077 Modified Files: Tag: impd_0_37 s_path.c Log Message: now reads ~/.impdrc (if present) instead of ~/.pdrc Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.1.1.2.2.2.2.1 retrieving revision 1.1.1.2.2.2.2.2 diff -C2 -d -r1.1.1.2.2.2.2.1 -r1.1.1.2.2.2.2.2 *** s_path.c 22 Feb 2004 05:23:52 -0000 1.1.1.2.2.2.2.1 --- s_path.c 28 Mar 2004 00:02:30 -0000 1.1.1.2.2.2.2.2 *************** *** 84,88 **** const char *npos; char temp[MAXPDSTRING]; ! t_namelist *nl = listwas, *rtn = listwas; npos = s; --- 84,88 ---- const char *npos; char temp[MAXPDSTRING]; ! t_namelist *nl = listwas; npos = s; *************** *** 94,98 **** } while (npos); ! return (nl); } --- 94,98 ---- } while (npos); ! return nl; } *************** *** 253,257 **** #endif { - char *slash; if (sys_verbose) post("tried %s and succeeded", dirresult); sys_unbashfilename(dirresult, dirresult); --- 253,256 ---- *************** *** 274,279 **** void open_via_helppath(const char *name, const char *dir) { ! t_namelist *nl, thislist, *listp; ! int fd = -1; char dirbuf2[MAXPDSTRING], realname[MAXPDSTRING]; --- 273,277 ---- void open_via_helppath(const char *name, const char *dir) { ! t_namelist thislist, *listp; char dirbuf2[MAXPDSTRING], realname[MAXPDSTRING]; *************** *** 316,320 **** #ifdef UNIX - #define STARTUPNAME ".pdrc" #define NUMARGS 1000 --- 314,317 ---- *************** *** 324,348 **** { FILE* file; ! int i; ! int k; ! int rcargc; ! char* rcargv[NUMARGS]; ! char* buffer; char fname[MAXPDSTRING], buf[1000], *home = getenv("HOME"); /* parse a startup file */ ! *fname = '\0'; ! ! strncat(fname, home? home : ".", MAXPDSTRING-10); ! strcat(fname, "/"); ! ! strcat(fname, STARTUPNAME); ! ! if (!(file = fopen(fname, "r"))) ! return 1; ! ! post("reading startup file: %s", fname); ! rcargv[0] = "."; /* this no longer matters to sys_argparse() */ --- 321,342 ---- { FILE* file; ! int i,j,k,rcargc; ! char *rcargv[NUMARGS], *buffer; char fname[MAXPDSTRING], buf[1000], *home = getenv("HOME"); + static char *names[] = {".impdrc",".pdrc"}; /* parse a startup file */ + for (j=0; j<2; j++) { + *fname = '\0'; + snprintf(fname,MAXPDSTRING,"%s/%s", + home? home : ".", names[j]); + file = fopen(fname, "r"); + if (file) { + post("reading startup file: %s", fname); + goto got_one; + } + } ! got_one: rcargv[0] = "."; /* this no longer matters to sys_argparse() */

1 0

pd/src s_main.c,1.1.1.4.2.8.4.5,1.1.1.4.2.8.4.6
by Mathieu Bouchard 28 Mar '04

28 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10388 Modified Files: Tag: impd_0_37 s_main.c Log Message: changing version number from 0.37.1 to just 0.37 ... Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.1.1.4.2.8.4.5 retrieving revision 1.1.1.4.2.8.4.6 diff -C2 -d -r1.1.1.4.2.8.4.5 -r1.1.1.4.2.8.4.6 *** s_main.c 7 Mar 2004 19:18:36 -0000 1.1.1.4.2.8.4.5 --- s_main.c 27 Mar 2004 23:41:10 -0000 1.1.1.4.2.8.4.6 *************** *** 8,12 **** */ ! char pd_version[] = "Pd version 0.37.1 impd\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 8,12 ---- */ ! char pd_version[] = "Pd version 0.37 impd\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; *************** *** 130,152 **** } ! int sys_nearestfontsize(int fontsize) ! { ! return (sys_findfont(fontsize)->fi_fontsize); ! } ! ! int sys_hostfontsize(int fontsize) ! { ! return (sys_findfont(fontsize)->fi_hostfontsize); ! } ! ! int sys_fontwidth(int fontsize) ! { ! return (sys_findfont(fontsize)->fi_width); ! } ! ! int sys_fontheight(int fontsize) ! { ! return (sys_findfont(fontsize)->fi_height); ! } int sys_defaultfont; --- 130,137 ---- } ! int sys_nearestfontsize(int fontsize) {return sys_findfont(fontsize)->fi_fontsize;} ! int sys_hostfontsize(int fontsize) {return sys_findfont(fontsize)->fi_hostfontsize;} ! int sys_fontwidth(int fontsize) {return sys_findfont(fontsize)->fi_width;} ! int sys_fontheight(int fontsize) {return sys_findfont(fontsize)->fi_height;} int sys_defaultfont;

1 0

pd/src makefile.nt,1.1.1.3.2.2,1.1.1.3.2.2.2.1
by carmen rocco 27 Mar '04

27 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21313 Modified Files: Tag: impd_0_37 makefile.nt Log Message: updated for vc7 & impd, change ldir2 to ldir if vc6 Index: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** makefile.nt 27 Dec 2003 11:32:43 -0000 1.1.1.3.2.2 --- makefile.nt 27 Mar 2004 16:32:48 -0000 1.1.1.3.2.2.2.1 *************** *** 1,132 **** ! # Makefile for PD on MSW ! ! all: pd gui ..\bin\pd.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe ! ! VC = "C:\Program Files\Microsoft Visual Studio\VC98" ! #VC="\Program Files\DevStudio\Vc" ! INCLUDE = -I.\ -I..\Tcl\include -I$(VC)\include ! ! LDIR = $(VC)\lib ! ! LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel \ ! /NODEFAULTLIB:uuid \ ! $(LDIR)\libc.lib $(LDIR)\oldnames.lib $(LDIR)\kernel32.lib \ ! $(LDIR)\wsock32.lib $(LDIR)\winmm.lib ..\bin\pthreadVC.lib ! ! GLIB = $(LIB) ..\bin\tcl83.lib ..\bin\tk83.lib ! CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO ! LFLAGS = /nologo ! ! SYSSRC = s_audio_pa.c s_audio_mmio.c s_midi_pm.c ! ! SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ ! g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ ! g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vdial.c g_vslider.c g_vumeter.c \ ! m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ ! m_conf.c m_glob.c m_sched.c \ ! s_main.c s_inter.c s_file.c s_print.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 \ ! d_delay.c d_resample.c \ ! x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \ ! x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c d_soundfile.c \ ! m_simd_sse_vc.c m_simd_sse_gcc.c m_simd_ve_gcc.c \ ! $(SYSSRC) ! ! PADIR = ..\portaudio ! INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio ! SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c \ ! $(PADIR)/pablio/pablio_pd.c $(PADIR)/pablio/ringbuffer_pd.c ! SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp ! ! ASIOLIB = $(LDIR)\user32.lib $(LDIR)\gdi32.lib $(LDIR)\winspool.lib $(LDIR)\comdlg32.lib \ ! $(LDIR)\advapi32.lib $(LDIR)\shell32.lib $(LDIR)\ole32.lib $(LDIR)\oleaut32.lib $(LDIR)\uuid.lib \ ! $(LDIR)\odbc32.lib $(LDIR)\odbccp32.lib ..\lib\asio\asiolib.lib ! ! ! PAOBJ = pa_lib.obj pa_trace.obj pablio_pd.obj ringbuffer_pd.obj pa_asio.obj ! ! PMDIR = ..\portmidi ! INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime ! SRCPM = \ ! $(PMDIR)/pm_common/portmidi.c \ ! $(PMDIR)/pm_common/pmutil.c \ ! $(PMDIR)/pm_win/pmwin.c \ ! $(PMDIR)/pm_win/pmwinmm.c \ ! $(PMDIR)/porttime/porttime.c \ ! $(PMDIR)/porttime/ptwinmm.c \ ! ! PMOBJ = portmidi.obj pmutil.obj pmwin.obj pmwinmm.obj porttime.obj ptwinmm.obj ! ! OBJC = $(SRC:.c=.obj) $(PAOBJ) $(PMOBJ) ! ! GSRC = t_main.c t_tkcmd.c ! ! GOBJ = $(GSRC:.c=.obj) ! .PHONY: pd gui ! ! ALLCF = $(CFLAGS) $(INCLUDE) $(INCASIO) $(INCPA) $(INCPM) /D_WINDOWS /DPA_NO_DS ! ! .c.obj: ! cl /c $(ALLCF) /Tc$*.c ! ! pd: ..\bin\pd.exe ! ! gui: ..\bin\pdtcl.dll ! ! ..\bin\pd.exe: s_entry.obj ..\bin\pd.lib ! link $(LFLAGS) /out:..\bin\pd.exe /INCREMENTAL:NO s_entry.obj \ ! ..\bin\pd.lib $(LIB) $(ASIOLIB) ! ! ..\bin\pd.dll ..\bin\pd.lib: $(OBJC) $(OBJASIO) ! link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $(OBJC) \ ! $(OBJASIO) $(LIB) $(ASIOLIB) ! ! ..\bin\pdtcl.dll: t_tkcmd.obj ! link $(LFLAGS) /dll /export:Pdtcl_Init /out:..\bin\pdtcl.dll \ ! t_tkcmd.obj $(GLIB) ! ! ..\bin\pd.tk: u_main.tk; copy u_main.tk ..\bin\pd.tk ! ! ..\bin\pdsend.exe: u_pdsend.obj ! link $(LFLAGS) /out:..\bin\pdsend.exe /INCREMENTAL:NO u_pdsend.obj \ ! $(LIB) ! ! ..\bin\pdreceive.exe: u_pdreceive.obj ! link $(LFLAGS) /out:..\bin\pdreceive.exe /INCREMENTAL:NO u_pdreceive.obj \ ! $(LIB) ! ! # explicit rules to compile portaudio and portmidi sources: ! pa_lib.obj: $(PADIR)\pa_common\pa_lib.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_lib.c ! pa_trace.obj: $(PADIR)\pa_common\pa_trace.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_trace.c ! pablio_pd.obj: $(PADIR)\pablio\pablio_pd.c ! cl /c $(ALLCF) $(PADIR)\pablio\pablio_pd.c ! ringbuffer_pd.obj: $(PADIR)\pablio\ringbuffer_pd.c ! cl /c $(ALLCF) $(PADIR)\pablio\ringbuffer_pd.c ! ! pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp ! cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp ! ! portmidi.obj: $(PMDIR)\pm_common\portmidi.c ! cl /c $(ALLCF) $(PMDIR)\pm_common\portmidi.c ! pmutil.obj: $(PMDIR)\pm_common\pmutil.c ! cl /c $(ALLCF) $(PMDIR)\pm_common\pmutil.c ! pmwin.obj: $(PMDIR)\pm_win\pmwin.c ! cl /c $(ALLCF) $(PMDIR)\pm_win\pmwin.c ! pmwinmm.obj: $(PMDIR)\pm_win\pmwinmm.c ! cl /c $(ALLCF) $(PMDIR)\pm_win\pmwinmm.c ! porttime.obj: $(PMDIR)\porttime\porttime.c ! cl /c $(ALLCF) $(PMDIR)\porttime\porttime.c ! ptwinmm.obj: $(PMDIR)\porttime\ptwinmm.c ! cl /c $(ALLCF) $(PMDIR)\porttime\ptwinmm.c ! ! # the following should also clean up "bin" but it doesn't because "bin" holds ! # precious stuff from elsewhere. ! clean: ! del *.obj ! --- 1,108 ---- ! # Makefile for PD on MSW ! ! all: pd gui ..\bin\pd.tk ..\bin\u_object.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe ! ! VC = "$(VCINSTALLDIR)\Vc7" ! INCLUDE = -I.\ -I..\Tcl\include -I$(VC)\include -I$(VC)\PlatformSDK\include ! ! LDIR = $(VC)\lib ! LDIR2 = $(VC)\PlatformSDK\lib ! ! LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel \ ! /NODEFAULTLIB:uuid \ ! $(LDIR)\libc.lib $(LDIR)\oldnames.lib $(LDIR2)\kernel32.lib \ ! $(LDIR2)\wsock32.lib $(LDIR2)\winmm.lib ..\bin\pthreadVC.lib ! ! GLIB = $(LIB) ..\bin\tcl85.lib ..\bin\tk85.lib ! CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -DDONTUSESIMD ! LFLAGS = /nologo ! ! SYSSRC = s_audio_pa.c s_audio_mmio.c s_midi_mmio.c ! ! SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ ! g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ ! g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vumeter.c \ ! m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ ! m_conf.c m_glob.c m_sched.c \ ! s_main.c s_inter.c s_file.c s_print.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 \ ! d_delay.c d_resample.c \ ! x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \ ! x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c d_soundfile.c \ ! $(SYSSRC) ! ! PADIR = ..\portaudio ! INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio ! SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c \ ! $(PADIR)/pablio/pablio_pd.c $(PADIR)/pablio/ringbuffer_pd.c ! SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp ! ! ASIOLIB = $(LDIR2)\user32.lib $(LDIR2)\gdi32.lib $(LDIR2)\winspool.lib $(LDIR2)\comdlg32.lib \ ! $(LDIR2)\advapi32.lib $(LDIR2)\shell32.lib $(LDIR2)\ole32.lib $(LDIR2)\oleaut32.lib $(LDIR2)\uuid.lib \ ! $(LDIR2)\odbc32.lib $(LDIR2)\odbccp32.lib ..\lib\asio\asiolib.lib ! ! ! PAOBJ = pa_lib.obj pa_trace.obj pablio_pd.obj ringbuffer_pd.obj pa_asio.obj ! ! ! OBJC = $(SRC:.c=.obj) $(PAOBJ) ! ! GSRC = t_main.c t_tkcmd.c ! ! GOBJ = $(GSRC:.c=.obj) ! .PHONY: pd gui ! ! ALLCF = $(CFLAGS) $(INCLUDE) $(INCASIO) $(INCPA) $(INCPM) /D_WINDOWS /DPA_NO_DS ! ! .c.obj: ! cl /c $(ALLCF) /Tc$*.c ! ! pd: ..\bin\pd.exe ! ! gui: ..\bin\pdtcl.dll ! ! ..\bin\pd.exe: s_entry.obj ..\bin\pd.lib ! link $(LFLAGS) /out:..\bin\pd.exe /INCREMENTAL:NO s_entry.obj \ ! ..\bin\pd.lib $(LIB) $(ASIOLIB) ! ! ..\bin\pd.dll ..\bin\pd.lib: $(OBJC) $(OBJASIO) ! link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $(OBJC) \ ! $(OBJASIO) $(LIB) $(ASIOLIB) ! ! ..\bin\pdtcl.dll: t_tkcmd.obj ! link $(LFLAGS) /dll /export:Pdtcl_Init /out:..\bin\pdtcl.dll \ ! t_tkcmd.obj $(GLIB) ! ! ..\bin\pd.tk: u_main.tk; copy u_main.tk ..\bin\pd.tk ! ..\bin\u_object.tk: u_object.tk; copy u_object.tk ..\bin\u_object.tk ! ! ..\bin\pdsend.exe: u_pdsend.obj ! link $(LFLAGS) /out:..\bin\pdsend.exe /INCREMENTAL:NO u_pdsend.obj \ ! $(LIB) ! ! ..\bin\pdreceive.exe: u_pdreceive.obj ! link $(LFLAGS) /out:..\bin\pdreceive.exe /INCREMENTAL:NO u_pdreceive.obj \ ! $(LIB) ! ! # explicit rules to compile portaudio sources: ! pa_lib.obj: $(PADIR)\pa_common\pa_lib.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_lib.c ! pa_trace.obj: $(PADIR)\pa_common\pa_trace.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_trace.c ! pablio_pd.obj: $(PADIR)\pablio\pablio_pd.c ! cl /c $(ALLCF) $(PADIR)\pablio\pablio_pd.c ! ringbuffer_pd.obj: $(PADIR)\pablio\ringbuffer_pd.c ! cl /c $(ALLCF) $(PADIR)\pablio\ringbuffer_pd.c ! ! pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp ! cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp ! ! # the following should also clean up "bin" but it doesn't because "bin" holds ! # precious stuff from elsewhere. ! clean: ! del *.obj !

1 0

pd/src makefile.mingw,NONE,1.1.2.1
by carmen rocco 27 Mar '04

27 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21195 Added Files: Tag: impd_0_37 makefile.mingw Log Message: build pd with mingw... --- NEW FILE: makefile.mingw --- VPATH = ../obj:./ OBJ_DIR = ../obj BIN_DIR = ../bin INSTDIR = ../ PDEXEC = pd.exe GUINAME= pdtcl.dll DLLWRAP= dllwrap prefix = ../ GFLAGS = -DINSTALL_PREFIX=\"$(prefix)\" MORECFLAGS = -g PADIR = ../portaudio INCPA = -I$(PADIR) -I$(PADIR)/pa_common -I$(PADIR)/pablio -I../lib/asio INCLUDE = $(INCPA) GINCLUDE = $(INCLUDE) -I../tcl/include LDFLAGS = -lpthreadGC -lwsock32 -lportaudio -lwinmm ../bin/tcl85.lib ../bin/tk85.lib LIB = -lm OPT_CFLAGS = WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused-parameter -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD -DPD_INTERNAL -DMSW -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -DDONTUSESIMD \ CFLAGS += $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # the sources SYSSRC += s_audio_pa.c s_audio_mmio.c s_midi_mmio.c PASRC = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c \ $(PADIR)/pablio/pablio_pd.c $(PADIR)/pablio/ringbuffer_pd.c GSRC = t_main.c t_tkcmd.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ g_toggle.c g_vumeter.c \ m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ m_conf.c m_glob.c m_sched.c \ s_main.c s_inter.c s_file.c s_print.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 \ d_delay.c d_resample.c \ x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \ x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c d_soundfile.c \ m_simd_sse_vc.c m_simd_sse_gcc.c m_simd_ve_gcc.c \ $(SYSSRC) SRSRC = u_pdsend.c u_pdreceive.c OBJ = $(SRC:.c=.o) GOBJ = $(GSRC:.c=.o) PAOBJ = $(PASRC:.c=.o) SROBJ = $(SRSRC:.c=.o) OBJC = $(OBJ) $(PAOBJ) # # ------------------ targets ------------------------------------ # .PHONY: pd gui all all: $(BIN_DIR)/$(PDEXEC) $(BIN_DIR)/$(PDDLL) $(BIN_DIR)/$(GUINAME) \ $(BIN_DIR)/pdsend.exe $(BIN_DIR)/pdreceive.exe $(BIN_DIR)/pd.tk bin: $(BIN_DIR)/$(PDEXEC) $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk $(OBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c $(GOBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c pd: $(PDDLL) $(PDEXEC) gui: $(GUINAME) $(BIN_DIR)/pdsend.exe: u_pdsend.o $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend.exe u_pdsend.o $(LDFLAGS) $(BIN_DIR)/pdreceive.exe: u_pdreceive.o $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive.exe u_pdreceive.o $(LDFLAGS) $(BIN_DIR)/$(PDDLL): $(OBJC) cd ../obj; $(CC) $(DBG_CFLAGS) -o $(BIN_DIR)/pd.dll $(OBJC) $(LIB) $(LDFLAGS) cd ../obj; $(DLLWRAP) --export-all-symbols --output-def $(BIN_DIR)/pd.def \ --output-lib=$(BIN_DIR)/pd.a --dllname=$(BIN_DIR)/pd.dll $(OBJC) $(LDFLAGS) $(BIN_DIR)/$(PDEXEC): s_entry.o cd ../obj; $(CC) $(DBG_CFLAGS) -o $(BIN_DIR)/$(PDEXEC) $(OBJ_DIR)/s_entry.o $(LIB) $(BIN_DIR)/pd.a $(LDFLAGS) $(BIN_DIR)/$(GUINAME): t_tkcmd.o cd ../obj; $(CC) $(INCLUDE) -o $(BIN_DIR)/$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LIB) $(BIN_DIR)/pdtcl.a $(LDFLAGS) cd ../obj; $(DLLWRAP) --export-all-symbols --output-def $(BIN_DIR)/pdtcl.def \ --output-lib=$(BIN_DIR)/pdtcl.a --dllname=$(BIN_DIR)/$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LDFLAGS) $(BIN_DIR)/pd.tk: u_main.tk echo set pd_nt > $(BIN_DIR)/pd.tk grep -v "set pd_nt" < u_main.tk >> $(BIN_DIR)/pd.tk $(BIN_DIR)/pdsend.exe: u_pdsend.o $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend.exe u_pdsend.o $(LDFLAGS) INSTDIR = $(DESTDIR)/$(prefix) MANINSTDIR = $(DESTDIR)/$(MANDIR) install: all install -d $(INSTDIR)/lib/pd/bin install $(BIN_DIR)/$(GUINAME) $(INSTDIR)/lib/pd/bin/$(GUINAME) install -m644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk install -m644 u_object.tk $(INSTDIR)/lib/pd/bin/u_object.tk install -d $(INSTDIR)/bin install -m755 $(PDEXEC) $(INSTDIR)/bin/pd install -m 755 $(BIN_DIR)/pdsend.exe $(INSTDIR)/bin/pdsend.exe install -m 755 $(BIN_DIR)/pdreceive.exe $(INSTDIR)/bin/pdreceive.exe cp -r ../doc $(INSTDIR)/lib/pd/ install -d $(INSTDIR)/include install -m644 m_pd.h $(INSTDIR)/include/m_pd.h install -d $(MANINSTDIR)/man1 gzip < ../man/pd.1 > $(MANINSTDIR)/man1/pd.1.gz chmod 644 $(MANINSTDIR)/man1/pd.1.gz gzip < ../man/pdsend.1 > $(MANINSTDIR)/man1/pdsend.1.gz chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz # extra docs install -m644 ../extra/*/*.pd $(INSTDIR)/lib/pd/doc/5.reference/ install -m644 ../extra/*help*.pd $(INSTDIR)/lib/pd/doc/5.reference/ # abstractions cd ../extra && \ install -m644 complex-mod~.pd hilbert~.pd rev*.pd $(INSTDIR)/lib/pd/extra local-clean: -rm -f ../obj/* $(BIN_DIR)/pd.exe $(BIN_DIR)/pd.dll $(BIN_DIR)/$(GUINAME) \ $(BIN_DIR)/pdsend.exe $(BIN_DIR)/pdreceive.exe m_stamp.c -rm -f *~ -rm -f makefile.dependencies touch makefile.dependencies chmod 666 makefile.dependencies extra-clean: -rm -f `find ../extra/ -name "*.pd_*"` -rm -f tags clean: extra-clean local-clean distclean: clean rm -rf config.cache config.log config.status makefile tags \ autom4te-*.cache echo all: > makefile echo -e "\t./configure" >> makefile echo -e "\tmake" >> makefile tags: $(SRC) $(GSRC); ctags *.[ch] depend: $(CC) $(INCLUDE) $(CFLAGS) -M $(SRC) > makefile.dependencies uninstall: -rm -r $(INSTDIR)/lib/pd -rm $(INSTDIR)/bin/pd.exe -rm $(INSTDIR)/bin/pd.dll -rm $(INSTDIR)/bin/pdsend.exe -rm $(INSTDIR)/bin/pdreceive.exe -rm $(INSTDIR)/include/m_pd.h include makefile.dependencies

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
23
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 March 2004