Pd-cvs February 2005

pd-cvs@lists.iem.at

8 participants
107 discussions

externals/PDContainer/include HList.h,1.2,1.3
by Georg Holzmann 22 Feb '05

22 Feb '05

Update of /cvsroot/pure-data/externals/PDContainer/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16984 Modified Files: HList.h Log Message: Index: HList.h =================================================================== RCS file: /cvsroot/pure-data/externals/PDContainer/include/HList.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HList.h 21 Feb 2005 18:14:20 -0000 1.2 --- HList.h 22 Feb 2005 20:53:28 -0000 1.3 *************** *** 170,176 **** { return data_[h_namespace_].size(); } /* get the current iterator position */ ! virtual int getIterPos() //const { makeIterator(); --- 170,181 ---- { return data_[h_namespace_].size(); } + /* set current iterator position + */ + virtual void setIterPos(int position) + { i_pos_ = position; } + /* get the current iterator position */ ! virtual int getIterPos() { makeIterator();

1 0

externals/PDContainer makefile_darwin,1.1,1.2
by Georg Holzmann 22 Feb '05

22 Feb '05

Update of /cvsroot/pure-data/externals/PDContainer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31288 Modified Files: makefile_darwin Log Message: haha ... Index: makefile_darwin =================================================================== RCS file: /cvsroot/pure-data/externals/PDContainer/makefile_darwin,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile_darwin 29 Nov 2004 12:47:41 -0000 1.1 --- makefile_darwin 22 Feb 2005 11:32:37 -0000 1.2 *************** *** 9,14 **** LIB=-lc -lm CC_FLAGS = -DPD -c -Wall ! LD_FLAGS = --export-dynamic -shared -o ! OSX_LD_FLAGS = -bundle -bundle_loader $(PDPATH)/bin/pd --- 9,14 ---- LIB=-lc -lm CC_FLAGS = -DPD -c -Wall ! LD_FLAGS = --export-dynamic -o ! OSX_LD_FLAGS = -bundle -bundle_loader $(PD-PATH)/bin/pd

1 0

externals/PDContainer/help help-h_list.pd,1.1.1.1,1.2
by Georg Holzmann 21 Feb '05

21 Feb '05

Update of /cvsroot/pure-data/externals/PDContainer/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20815 Modified Files: help-h_list.pd Log Message: Index: help-h_list.pd =================================================================== RCS file: /cvsroot/pure-data/externals/PDContainer/help/help-h_list.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** help-h_list.pd 25 Oct 2004 19:02:32 -0000 1.1.1.1 --- help-h_list.pd 21 Feb 2005 18:18:02 -0000 1.2 *************** *** 1,3 **** ! #N canvas 229 21 834 839 10; #X obj 525 58 cnv 15 204 104 empty empty empty 20 12 0 14 -66577 -66577 0; --- 1,3 ---- ! #N canvas 229 21 834 894 10; #X obj 525 58 cnv 15 204 104 empty empty empty 20 12 0 14 -66577 -66577 0; *************** *** 146,160 **** -66577 0; #X text 311 50 help file of; ! #X text 209 780 =%)!(%= PDContainer \, by Georg Holzmann <grh(a)gmx.at> \, 2004; #X text 52 112 init arg: namespace; #X msg 496 307 print; #X msg 496 351 clear; ! #X msg 496 599 help; ! #X obj 617 647 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 496 248 getnamespace; #X msg 496 389 clearall; ! #X obj 496 686 print BBB; #X text 607 273 <- change namespace; #X msg 496 272 namespace grix; --- 146,160 ---- -66577 0; #X text 311 50 help file of; ! #X text 209 847 =%)!(%= PDContainer \, by Georg Holzmann <grh(a)gmx.at> \, 2004; #X text 52 112 init arg: namespace; #X msg 496 307 print; #X msg 496 351 clear; ! #X msg 496 647 help; ! #X obj 617 721 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 496 248 getnamespace; #X msg 496 389 clearall; ! #X obj 496 778 print BBB; #X text 607 273 <- change namespace; #X msg 496 272 namespace grix; *************** *** 243,248 **** #X msg 496 454 save data.dat; #X msg 496 495 read data.dat; ! #X floatatom 556 666 5 0 0 0 - - -; ! #X text 561 569 <- get the size (at 2nd; #X text 583 583 outlet); #X text 303 67 ::: h_list :::; --- 243,247 ---- #X msg 496 454 save data.dat; #X msg 496 495 read data.dat; ! #X floatatom 536 758 5 0 0 0 - - -; #X text 583 583 outlet); #X text 303 67 ::: h_list :::; *************** *** 252,262 **** #X text 609 523 add it at the current; #X text 610 537 iterator position; ! #X obj 496 626 h_list simonatbase; ! #X text 597 667 <- size of the list; #X obj 187 704 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 66 683 h_list simonatbase; #X obj 66 657 r \$0-list; ! #X obj 66 708 print AAA; #N canvas 523 246 495 416 pusch_pop_back_front 0; #X msg 66 229 popback; --- 251,261 ---- #X text 609 523 add it at the current; #X text 610 537 iterator position; ! #X obj 496 700 h_list simonatbase; ! #X text 617 739 <- size of the list; #X obj 187 704 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 66 683 h_list simonatbase; #X obj 66 657 r \$0-list; ! #X obj 66 722 print AAA; #N canvas 523 246 495 416 pusch_pop_back_front 0; #X msg 66 229 popback; *************** *** 297,301 **** ; #X text 51 465 _without_ changing the current iterator position:; ! #N canvas 592 195 493 471 iterator_navigation 0; #X text 39 73 Iterators are a generalization of pointers: they are objects that point to other objects. Via an iterator you can navigate --- 296,300 ---- ; #X text 51 465 _without_ changing the current iterator position:; ! #N canvas 423 58 493 492 iterator_navigation 0; #X text 39 73 Iterators are a generalization of pointers: they are objects that point to other objects. Via an iterator you can navigate *************** *** 307,311 **** #X msg 43 321 next; #X text 40 179 iterator navigation:; ! #X obj 43 417 s \$0-list; #X text 91 217 <- points to the first element fo the h_list; #X text 87 244 <- points _after_ the last element of the h_list; --- 306,310 ---- #X msg 43 321 next; #X text 40 179 iterator navigation:; ! #X obj 43 447 s \$0-list; #X text 91 217 <- points to the first element fo the h_list; #X text 87 244 <- points _after_ the last element of the h_list; *************** *** 319,326 **** --- 318,329 ---- #X text 84 358 <- decrement the iterator - so it will point to; #X text 106 372 the previous element of h_list; + #X msg 43 400 getiter; + #X text 113 401 <- puts out the current iterator position; + #X text 134 416 at second outlet; #X connect 2 0 5 0; #X connect 3 0 5 0; #X connect 13 0 5 0; #X connect 14 0 5 0; + #X connect 17 0 5 0; #X restore 152 300 pd iterator_navigation; #X text 54 258 the h_list. Here is a short explanation of iterators *************** *** 377,393 **** #X restore 145 575 pd special_operations; #X text 212 703 <- bang if not found; ! #X connect 8 0 41 0; ! #X connect 9 0 41 0; ! #X connect 10 0 41 0; ! #X connect 12 0 41 0; ! #X connect 13 0 41 0; ! #X connect 16 0 41 0; ! #X connect 30 0 41 0; ! #X connect 32 0 41 0; ! #X connect 33 0 41 0; ! #X connect 41 0 14 0; ! #X connect 41 1 34 0; ! #X connect 41 2 11 0; ! #X connect 44 0 46 0; ! #X connect 44 2 43 0; ! #X connect 45 0 44 0; --- 380,408 ---- #X restore 145 575 pd special_operations; #X text 212 703 <- bang if not found; ! #X floatatom 576 739 5 0 0 0 - - -; ! #X text 578 759 <- current iterator position; ! #X floatatom 146 704 5 0 0 0 - - -; ! #X floatatom 106 704 5 0 0 0 - - -; ! #X msg 496 620 getiter; ! #X text 561 569 <- get the size (at 3nd; ! #X text 587 636 (2nd outlet); ! #X text 566 621 <- get current iterator pos; ! #X connect 8 0 40 0; ! #X connect 9 0 40 0; ! #X connect 10 0 40 0; ! #X connect 12 0 40 0; ! #X connect 13 0 40 0; ! #X connect 16 0 40 0; ! #X connect 30 0 40 0; ! #X connect 32 0 40 0; ! #X connect 33 0 40 0; ! #X connect 40 0 14 0; ! #X connect 40 1 34 0; ! #X connect 40 2 58 0; ! #X connect 40 3 11 0; ! #X connect 43 0 45 0; ! #X connect 43 1 61 0; ! #X connect 43 2 60 0; ! #X connect 43 3 42 0; ! #X connect 44 0 43 0; ! #X connect 62 0 40 0;

1 0

externals/PDContainer/src h_list.cpp,1.1.1.1,1.2
by Georg Holzmann 21 Feb '05

21 Feb '05

Update of /cvsroot/pure-data/externals/PDContainer/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20076 Modified Files: h_list.cpp Log Message: Index: h_list.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/PDContainer/src/h_list.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** h_list.cpp 25 Oct 2004 19:02:30 -0000 1.1.1.1 --- h_list.cpp 21 Feb 2005 18:15:51 -0000 1.2 *************** *** 21,25 **** t_object x_obj; t_canvas *x_canvas; ! t_outlet *out0, *out1, *out2; HList *hlist; } t_h_list; --- 21,25 ---- t_object x_obj; t_canvas *x_canvas; ! t_outlet *out0, *out1, *out2, *out3; HList *hlist; } t_h_list; *************** *** 79,83 **** if(x->hlist->getSize() == 0) { ! outlet_bang(x->out2); return; } --- 79,83 ---- if(x->hlist->getSize() == 0) { ! outlet_bang(x->out3); return; } *************** *** 104,108 **** if(x->hlist->getSize() == 0) { ! outlet_bang(x->out2); return; } --- 104,108 ---- if(x->hlist->getSize() == 0) { ! outlet_bang(x->out3); return; } *************** *** 129,133 **** if(x->hlist->getSize() == 0) { ! outlet_bang(x->out2); return; } --- 129,133 ---- if(x->hlist->getSize() == 0) { ! outlet_bang(x->out3); return; } *************** *** 149,153 **** } ! outlet_bang(x->out2); } --- 149,153 ---- } ! outlet_bang(x->out3); } *************** *** 222,226 **** static void h_list_getsize(t_h_list *x) { ! outlet_float(x->out1,x->hlist->getSize()); } --- 222,231 ---- static void h_list_getsize(t_h_list *x) { ! outlet_float(x->out2,x->hlist->getSize()); ! } ! ! static void h_list_get_iter_pos(t_h_list *x) ! { ! outlet_float(x->out1,x->hlist->getIterPos()); } *************** *** 300,304 **** x->out0 = outlet_new(&x->x_obj, 0); x->out1 = outlet_new(&x->x_obj, &s_float); ! x->out2 = outlet_new(&x->x_obj, &s_bang); x->x_canvas = canvas_getcurrent(); --- 305,310 ---- x->out0 = outlet_new(&x->x_obj, 0); x->out1 = outlet_new(&x->x_obj, &s_float); ! x->out2 = outlet_new(&x->x_obj, &s_float); ! x->out3 = outlet_new(&x->x_obj, &s_bang); x->x_canvas = canvas_getcurrent(); *************** *** 341,344 **** --- 347,352 ---- class_addmethod(h_list_class, (t_method)h_list_getsize, gensym("getsize"), A_DEFFLOAT , 0); + class_addmethod(h_list_class, (t_method)h_list_get_iter_pos, + gensym("getiter"), A_DEFFLOAT , 0); class_addmethod(h_list_class, (t_method)h_list_begin, gensym("begin"), A_DEFFLOAT, 0);

1 0

pd/src d_filter.c,1.3.4.1,1.3.4.2
by Tim Blechmann 21 Feb '05

21 Feb '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17212 Modified Files: Tag: devel_0_38 d_filter.c Log Message: denormal fix Index: d_filter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_filter.c,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** d_filter.c 3 Jan 2005 17:46:41 -0000 1.3.4.1 --- d_filter.c 21 Feb 2005 09:35:51 -0000 1.3.4.2 *************** *** 573,576 **** --- 573,578 ---- *out++ = last = coef * last + next; } + if (PD_BIGORSMALL(last)) + last = 0; x->x_last = last; return (w+6); *************** *** 804,807 **** --- 806,813 ---- lastre = tempre; } + if (PD_BIGORSMALL(lastre)) + lastre = 0; + if (PD_BIGORSMALL(lastim)) + lastim = 0; x->x_lastre = lastre; x->x_lastim = lastim;

1 0

pd/src u_main.tk,1.4.4.6,1.4.4.7 s_main.c,1.7.4.10,1.7.4.11 s_audio_alsa.c,1.5.4.3,1.5.4.4 s_audio_alsamm.c,1.1.4.3,1.1.4.4
by Tim Blechmann 21 Feb '05

21 Feb '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13762 Modified Files: Tag: devel_0_38 u_main.tk s_main.c s_audio_alsa.c s_audio_alsamm.c Log Message: Index: s_audio_alsa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_alsa.c,v retrieving revision 1.5.4.3 retrieving revision 1.5.4.4 diff -C2 -d -r1.5.4.3 -r1.5.4.4 *** s_audio_alsa.c 11 Nov 2004 22:30:42 -0000 1.5.4.3 --- s_audio_alsa.c 21 Feb 2005 09:19:59 -0000 1.5.4.4 *************** *** 64,80 **** { snd_pcm_hw_params_t *hw_params; ! int err; snd_pcm_hw_params_alloca(&hw_params); ! err = snd_pcm_hw_params_any(dev->a_handle, hw_params); ! if (err < 0) { ! check_error(err,"Broken configuration: no configurations available"); return (0); } ! err = snd_pcm_hw_params_set_access(dev->a_handle, hw_params, SND_PCM_ACCESS_MMAP_NONINTERLEAVED); ! return (err >= 0); } --- 64,84 ---- { snd_pcm_hw_params_t *hw_params; ! int err1, err2; snd_pcm_hw_params_alloca(&hw_params); ! err1 = snd_pcm_hw_params_any(dev->a_handle, hw_params); ! if (err1 < 0) { ! check_error(err1,"Broken configuration: no configurations available"); return (0); } ! err1 = snd_pcm_hw_params_set_access(dev->a_handle, hw_params, SND_PCM_ACCESS_MMAP_NONINTERLEAVED); ! err2 = snd_pcm_hw_params_set_access(dev->a_handle, ! hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); ! post("err 1 %d (%s), err2 %d (%s)", err1, snd_strerror(err1), ! err2, snd_strerror(err2)); ! return ((err1 < 0) && (err2 >= 0)); } Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.10 retrieving revision 1.7.4.11 diff -C2 -d -r1.7.4.10 -r1.7.4.11 *** s_main.c 22 Jan 2005 09:24:25 -0000 1.7.4.10 --- s_main.c 21 Feb 2005 09:19:59 -0000 1.7.4.11 *************** *** 8,12 **** */ ! char pd_version[] = "Pd version 0.38.2 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 8,12 ---- */ ! char pd_version[] = "Pd version 0.38.3 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.4.4.6 retrieving revision 1.4.4.7 diff -C2 -d -r1.4.4.6 -r1.4.4.7 *** u_main.tk 14 Dec 2004 10:06:23 -0000 1.4.4.6 --- u_main.tk 21 Feb 2005 09:19:52 -0000 1.4.4.7 *************** *** 51,54 **** --- 51,66 ---- load $pd_guidir/bin/pdtcl set pd_tearoff 0 + + # tk::mac::OpenDocument is called with the filenames put into the + # var args whenever docs are either dropped on the Pd.app icon or + # opened from the Finder. + # It uses menu_doc_open so it can handles numerous file types. + proc tk::mac::OpenDocument {args} { + foreach file $args { + pd [concat pd open [pdtk_enquote [file tail $file]] \ + [pdtk_enquote [file dirname $file]] \;] + menu_doc_open [file dirname $file] [file tail $file] + } + } } *************** *** 75,78 **** --- 87,92 ---- ################## set up main window ######################### + # the menus are instantiated here for the main window + # for the patch windows, they are created by pdtk_canvas_new menu .mbar canvas .dummy -height 2p -width 6c *************** *** 89,99 **** .mbar add cascade -label "Windows" -menu .mbar.windows .mbar add cascade -label "Media" -menu .mbar.audio } else { ! # Perhaps this is silly, but Mac HIG want "Window Help" as the last menus .mbar add cascade -label "Media" -menu .mbar.audio ! .mbar add cascade -label "Windows" -menu .mbar.windows } - menu .mbar.help -tearoff $pd_tearoff - .mbar add cascade -label "Help" -menu .mbar.help set ctrls_audio_on 0 --- 103,125 ---- .mbar add cascade -label "Windows" -menu .mbar.windows .mbar add cascade -label "Media" -menu .mbar.audio + # a menu on the main menubar named $whatever.help while be treated + # as a special menu with specific behaviors on different platforms. + # See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm + menu .mbar.help -tearoff $pd_tearoff + .mbar add cascade -label "Help" -menu .mbar.help } else { ! menu .mbar.apple -tearoff 0 ! .mbar add cascade -label "Apple" -menu .mbar.apple ! # arrange menus according to Apple HIG .mbar add cascade -label "Media" -menu .mbar.audio ! .mbar add cascade -label "Window" -menu .mbar.windows ! # a menu on the main menubar named "$whatever.help" while be treated ! # as a special menu with specific behaviors on different platforms. ! # See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm ! # Apple doesn't allow cascading menus in their Help so I had to call this ! # one $mbar.docs # <hans(a)at.or.at> ! menu .mbar.docs -tearoff $pd_tearoff ! .mbar add cascade -label "Help" -menu .mbar.docs } set ctrls_audio_on 0 *************** *** 312,315 **** --- 338,342 ---- set doc_number 1 + # open text docs in a Pd window proc menu_opentext {filename} { global doc_number *************** *** 336,340 **** --- 363,385 ---- } + # open HTML docs from the menu using the OS-default HTML viewer + proc menu_openhtml {filename} { + global pd_nt + + if {$pd_nt == 0} { + exec sh -c \ + [format "mozilla file:%s || netscape file:%s &\n" \ + $filename $filename] + } elseif {$pd_nt == 2} { + puts stderr [format "open %s" $filename] + exec sh -c [format "open %s" $filename] + } else { + exec rundll32 url.dll,FileProtocolHandler \ + [format "file:%s" $filename] & + } + } + set help_directory $pd_guidir/doc + set help_top_directory $pd_guidir/doc proc menu_documentation {} { *************** *** 358,373 **** menu_opentext $filename } elseif {[string first .htm $filename] >= 0} { ! if {$pd_nt == 0} { ! exec sh -c \ ! [format "mozilla file:%s || netscape file:%s &\n" \ ! $filename $filename] ! } elseif {$pd_nt == 2} { ! puts stderr [format "open %s" $filename] ! exec sh -c \ ! [format "open %s" $filename] ! } else { ! exec rundll32 url.dll,FileProtocolHandler \ ! [format "file:%s" $filename] & ! } } else { set help_directory [string range $filename 0 \ --- 403,407 ---- menu_opentext $filename } elseif {[string first .htm $filename] >= 0} { ! menu_openhtml $filename } else { set help_directory [string range $filename 0 \ *************** *** 386,391 **** set dirname $pd_guidir/$subdir ! if {[string first .txt $basename] >= 0} { menu_opentext $dirname/$basename } else { pd [concat pd open [pdtk_enquote $basename] \ --- 420,427 ---- set dirname $pd_guidir/$subdir ! if {[regexp ".*\.(txt|c)$" $basename]} { menu_opentext $dirname/$basename + } elseif {[regexp ".*\.html?$" $basename]} { + menu_openhtml $dirname/$basename } else { pd [concat pd open [pdtk_enquote $basename] \ *************** *** 394,401 **** } ! ############# routine to add audio and help menus ############### proc menu_addstd {mbar} { ! global pd_apilist # the "Audio" menu $mbar.audio add command -label {audio ON} -accelerator [accel_munge "Ctrl+/"] \ --- 430,459 ---- } ! proc doc_submenu {helpmenu subdir} { ! global help_top_directory pd_tearoff ! ! set menudir $help_top_directory/$subdir ! ! regsub -all "\\\." $subdir "" submenu ! ! menu $helpmenu.$submenu -tearoff $pd_tearoff ! regsub -all "\\\." $subdir " " submenuname ! $helpmenu add cascade -label $submenuname \ ! -menu $helpmenu.$submenu ! ! # use this glob pattern to exclude the supporting files ! # foreach file [ lsort [ glob -dir $menudir {*[0-9][0-9]*} ] ] ! foreach file [ lsort [ glob -dir $menudir * ] ] { ! set filename "" ! regsub {.*/(.*\..+$)} $file {\1} filename ! $helpmenu.$submenu add command -label $filename \ ! -command "menu_doc_open doc/$subdir $filename" ! } ! } ! ! ############# routine to add media, help, and apple menu items ############### proc menu_addstd {mbar} { ! global pd_apilist pd_nt pd_tearoff # the "Audio" menu $mbar.audio add command -label {audio ON} -accelerator [accel_munge "Ctrl+/"] \ *************** *** 409,417 **** -command {pd [concat pd audio-setapi $pd_whichapi \;]} } $mbar.audio add command -label {Audio settings...} \ -command {pd pd audio-properties \;} - $mbar.audio add command -label {MIDI settings...} \ -command {pd pd midi-properties \;} $mbar.audio add command -label {Test Audio and MIDI} \ -command {menu_doc_open doc/7.stuff/tools testtone.pd} --- 467,477 ---- -command {pd [concat pd audio-setapi $pd_whichapi \;]} } + if {$pd_nt != 2} { $mbar.audio add command -label {Audio settings...} \ -command {pd pd audio-properties \;} $mbar.audio add command -label {MIDI settings...} \ -command {pd pd midi-properties \;} + } + $mbar.audio add command -label {Test Audio and MIDI} \ -command {menu_doc_open doc/7.stuff/tools testtone.pd} *************** *** 419,427 **** --- 479,530 ---- -command {menu_doc_open doc/7.stuff/tools load-meter.pd} + # the MacOS X app menu + + # The menu on the main menubar named $whatever.apple while be treated + # as a special menu on MacOS X. Tcl/Tk assigns the $whatever.apple menu + # to the app-specific menu in MacOS X that is named after the app, + # so in our case, the Pd menu. <hans(a)at.or.at> + # See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm + if {$pd_nt == 2} { + $mbar.apple add command -label "About Pd..." -command \ + {menu_doc_open doc/1.manual 1.introduction.txt} + menu $mbar.apple.preferences -tearoff 0 + $mbar.apple add cascade -label "Preferences" -menu $mbar.apple.preferences + $mbar.apple.preferences add command -label "Path..." \ + -command {pd pd start-path-dialog \;} + $mbar.apple.preferences add command -label "Startup..." \ + -command {pd pd start-startup-dialog \;} + $mbar.apple.preferences add command -label "Audio Settings..." \ + -command {pd pd audio-properties \;} + $mbar.apple.preferences add command -label "MIDI settings..." \ + -command {pd pd midi-properties \;} + } + + # the "Help" menu + if {$pd_nt != 2} { + # a menu on the main menubar named "$whatever.help" while be treated + # as a special menu with specific behaviors on different platforms. + # See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm $mbar.help add command -label {About Pd} \ -command {menu_doc_open doc/1.manual 1.introduction.txt} $mbar.help add command -label {Pure Documentation...} \ -command {menu_documentation} + # add menu items for each section instead of using Pd patches + $mbar.help add separator + set helpmenuname help + } else { + # Apple doesn't allow cascading menus in their Help so I had to call this + # one "docs" <hans(a)at.or.at> + set helpmenuname docs + } + + $mbar.$helpmenuname add command -label {1 manual...} \ + -command {menu_doc_open doc/1.manual index.htm} + doc_submenu $mbar.$helpmenuname 2.control.examples + doc_submenu $mbar.$helpmenuname 3.audio.examples + doc_submenu $mbar.$helpmenuname 4.fft.examples + doc_submenu $mbar.$helpmenuname 5.reference + doc_submenu $mbar.$helpmenuname 6.externs } *************** *** 435,442 **** --- 538,549 ---- .mbar.file add command -label Message -command {menu_send} \ -accelerator [accel_munge "Ctrl+m"] + # On MacOS X, these are in the standard HIG locations + # i.e. the Preferences menu under "Pd" + if {$pd_nt != 2} { .mbar.file add command -label Path... \ -command {pd pd start-path-dialog \;} .mbar.file add command -label Startup... \ -command {pd pd start-startup-dialog \;} + } .mbar.file add separator .mbar.file add command -label Quit -command {menu_quit} \ *************** *** 444,448 **** #################### the "Find" menu for the Pd window ############## ! .mbar.find add command -label {last error?} -command {menu_finderror} ########### functions for menu functions on document windows ######## --- 551,555 ---- #################### the "Find" menu for the Pd window ############## ! .mbar.find add command -label {Find last error} -command {menu_finderror} ########### functions for menu functions on document windows ######## *************** *** 742,745 **** --- 849,855 ---- # the file menu + # The menus are instantiated here for the patch windows. + # For the main window, they are created on load, at the + # top of this file. menu $name.m menu $name.m.file -tearoff $pd_tearoff *************** *** 756,759 **** --- 866,872 ---- -accelerator [accel_munge "Ctrl+m"] + # arrange menus according to Apple HIG + # these are now part of Preferences... + if {$pd_nt != 2 } { $name.m.file add command -label Path... \ -command {pd pd start-path-dialog \;} *************** *** 761,764 **** --- 874,878 ---- $name.m.file add command -label Startup... \ -command {pd pd start-startup-dialog \;} + } $name.m.file add separator *************** *** 826,829 **** --- 940,955 ---- $name.m.edit add separator + # Apple, Microsoft, and others put find functions in the Edit menu. + $name.m.edit add command -label {Find...} \ + -accelerator [accel_munge "Ctrl+f"] \ + -command [concat menu_findobject $name] + $name.m.edit add command -label {Find Again} \ + -accelerator [accel_munge "Ctrl+g"] \ + -command [concat menu_findagain $name] + $name.m.edit add command -label {Find last error} \ + -command [concat menu_finderror] + + $name.m.edit add separator + ############iemlib################## # instead of "red = #BC3C60" we take "grey85", so there is no difference, *************** *** 915,918 **** --- 1041,1049 ---- # the find menu + # Apple, Microsoft, and others put find functions in the Edit menu. + # But in order to move these items to the Edit menu, the Find menu + # handling needs to be dealt with, including this line in g_canvas.c: + # sys_vgui(".mbar.find delete %d\n", i); + # <hans(a)at.or.at> menu $name.m.find -tearoff $pd_tearoff $name.m add cascade -label Find -menu $name.m.find *************** *** 945,953 **** --- 1076,1098 ---- $name.m add cascade -label Media -menu $name.m.audio $name.m add cascade -label Window -menu $name.m.windows + # the MacOS X app menu + menu $name.m.apple -tearoff $pd_tearoff + $name.m add cascade -label "Apple" -menu $name.m.apple } # the help menu + + # a menu on the main menubar named "$whatever.help" while be treated + # as a special menu with specific behaviors on different platforms. + # See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm + if {$pd_nt != 2} { menu $name.m.help -tearoff $pd_tearoff $name.m add cascade -label Help -menu $name.m.help + } else { + # Apple doesn't allow cascading menus in their Help + # so I had to call this one "docs". <hans(a)at.or.at> + menu $name.m.docs -tearoff $pd_tearoff + $name.m add cascade -label Help -menu $name.m.docs + } menu_addstd $name.m Index: s_audio_alsamm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_alsamm.c,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** s_audio_alsamm.c 11 Nov 2004 22:30:42 -0000 1.1.4.3 --- s_audio_alsamm.c 21 Feb 2005 09:20:10 -0000 1.1.4.4 *************** *** 773,779 **** if(sys_verbose) post("set sw finished"); #else post("alsa: need version 1.0 or above for mmap operation"); - #endif #endif /* ALSAAPI9 */ return 0; --- 773,779 ---- if(sys_verbose) post("set sw finished"); + #endif #else post("alsa: need version 1.0 or above for mmap operation"); #endif /* ALSAAPI9 */ return 0;

1 0

21 Feb '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11325/pd/portaudio_v18/pa_tests Modified Files: Tag: stable_0_38 debug_convert.c debug_dither_calc.c debug_dual.c debug_multi_in.c debug_multi_out.c debug_record.c debug_record_reuse.c debug_sine.c debug_sine_amp.c debug_sine_formats.c debug_sine_getchar.c debug_srate.c debug_test1.c pa_devs.c pa_fuzz.c pa_minlat.c paqa_devs.c paqa_errs.c patest1.c patest_buffer.c patest_clip.c patest_dither.c patest_hang.c patest_latency.c patest_leftright.c patest_longsine.c patest_many.c patest_maxsines.c patest_mono.c patest_multi_sine.c patest_pink.c patest_record.c patest_ringmix.c patest_saw.c patest_sine.c patest_sine8.c patest_sine_formats.c patest_sine_time.c patest_stop.c patest_sync.c patest_toomanysines.c patest_two_rates.c patest_underflow.c patest_wire.c Log Message: Guenter's bug fix for "help" menu, plus slight improvement to alsa code.

1 0

pd/portaudio_v18/pa_mac pa_mac.c,1.6.2.5,1.6.2.6
by Miller Puckette 21 Feb '05

21 Feb '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11325/pd/portaudio_v18/pa_mac Modified Files: Tag: stable_0_38 pa_mac.c Log Message: Guenter's bug fix for "help" menu, plus slight improvement to alsa code.

1 0

pd/portaudio_v18/pa_sgi pa_sgi.c,1.6.2.5,1.6.2.6
by Miller Puckette 21 Feb '05

21 Feb '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_sgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11325/pd/portaudio_v18/pa_sgi Modified Files: Tag: stable_0_38 pa_sgi.c Log Message: Guenter's bug fix for "help" menu, plus slight improvement to alsa code.

1 0

pd/portaudio_v18/pa_mac_core pa_mac_core.c,1.6.2.5,1.6.2.6
by Miller Puckette 21 Feb '05

21 Feb '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_mac_core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11325/pd/portaudio_v18/pa_mac_core Modified Files: Tag: stable_0_38 pa_mac_core.c Log Message: Guenter's bug fix for "help" menu, plus slight improvement to alsa code.

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs February 2005