Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

pd/src s_audio.c, 1.5.4.16.2.18, 1.5.4.16.2.19 s_audio_portaudio.c, 1.1.2.16, 1.1.2.17 s_midi.c, 1.4.4.1.2.8, 1.4.4.1.2.9 s_midi_pm.c, 1.4.4.1.2.3, 1.4.4.1.2.4
by Thomas Grill 05 Aug '06

05 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26504 Modified Files: Tag: devel_0_39 s_audio.c s_audio_portaudio.c s_midi.c s_midi_pm.c Log Message: more fixes to audio and midi consistence Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.18 retrieving revision 1.5.4.16.2.19 diff -C2 -d -r1.5.4.16.2.18 -r1.5.4.16.2.19 *** s_audio.c 25 Jun 2006 17:37:42 -0000 1.5.4.16.2.18 --- s_audio.c 5 Aug 2006 19:03:59 -0000 1.5.4.16.2.19 *************** *** 1263,1267 **** t_atom argv[MAXNDEV]; ! t_float f = ac ? atom_getfloatarg(0,ac,av) : -1; t_symbol * selector = gensym("audioindev"); --- 1263,1267 ---- t_atom argv[MAXNDEV]; ! int f = ac ? (int)atom_getfloatarg(0,ac,av) : -1; t_symbol * selector = gensym("audioindev"); *************** *** 1288,1295 **** typedmess(pd->s_thing, selector, nindevs, argv); } ! else if (f < (float) nindevs) { t_symbol * sym; ! strcpy(str, indevlist + (int)f * DEVDESCSIZE); sym = gensym(str); SETSYMBOL(argv, sym); --- 1288,1295 ---- typedmess(pd->s_thing, selector, nindevs, argv); } ! else if (f < nindevs) { t_symbol * sym; ! strcpy(str, indevlist + f * DEVDESCSIZE); sym = gensym(str); SETSYMBOL(argv, sym); *************** *** 1320,1324 **** t_atom argv[MAXNDEV]; ! t_float f = ac ? atom_getfloatarg(0,ac,av) : -1; t_symbol * selector = gensym("audiooutdev"); --- 1320,1324 ---- t_atom argv[MAXNDEV]; ! int f = ac ? (int)atom_getfloatarg(0,ac,av) : -1; t_symbol * selector = gensym("audiooutdev"); *************** *** 1345,1352 **** typedmess(pd->s_thing, selector, noutdevs, argv); } ! else if (f < (float) noutdevs) { t_symbol * sym; ! strcpy(str, outdevlist + (int)f * DEVDESCSIZE); sym = gensym(str); SETSYMBOL(argv, sym); --- 1345,1352 ---- typedmess(pd->s_thing, selector, noutdevs, argv); } ! else if (f < noutdevs) { t_symbol * sym; ! strcpy(str, outdevlist + f * DEVDESCSIZE); sym = gensym(str); SETSYMBOL(argv, sym); *************** *** 1357,1381 **** /* some prototypes from s_audio_portaudio.c */ extern void pa_getcurrent_devices(void); ! extern void pa_getaudioindevinfo(t_float f); ! extern void pa_getaudiooutdevinfo(t_float f); extern void pa_test_setting (int ac, t_atom *av); extern void pa_get_asio_latencies(t_float f); ! void glob_audio_getaudioindevinfo(t_pd * dummy, t_float f) { #ifdef USEAPI_PORTAUDIO #ifndef PABLIO if (sys_audioapi == API_PORTAUDIO) ! pa_getaudioindevinfo(f); #endif #endif } ! void glob_audio_getaudiooutdevinfo(t_pd * dummy, t_float f) { #ifdef USEAPI_PORTAUDIO #ifndef PABLIO if (sys_audioapi == API_PORTAUDIO) ! pa_getaudiooutdevinfo(f); #endif #endif --- 1357,1381 ---- /* some prototypes from s_audio_portaudio.c */ extern void pa_getcurrent_devices(void); ! extern void pa_getaudioininfo(t_float f); ! extern void pa_getaudiooutinfo(t_float f); extern void pa_test_setting (int ac, t_atom *av); extern void pa_get_asio_latencies(t_float f); ! void glob_audio_getaudioininfo(t_pd * dummy, t_float f) { #ifdef USEAPI_PORTAUDIO #ifndef PABLIO if (sys_audioapi == API_PORTAUDIO) ! pa_getaudioininfo(f); #endif #endif } ! void glob_audio_getaudiooutinfo(t_pd * dummy, t_float f) { #ifdef USEAPI_PORTAUDIO #ifndef PABLIO if (sys_audioapi == API_PORTAUDIO) ! pa_getaudiooutinfo(f); #endif #endif Index: s_midi.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi.c,v retrieving revision 1.4.4.1.2.8 retrieving revision 1.4.4.1.2.9 diff -C2 -d -r1.4.4.1.2.8 -r1.4.4.1.2.9 *** s_midi.c 25 Jul 2006 10:54:41 -0000 1.4.4.1.2.8 --- s_midi.c 5 Aug 2006 19:03:59 -0000 1.4.4.1.2.9 *************** *** 810,814 **** /* tb { */ ! void glob_midi_getindevs(t_pd *dummy) { char buf[1024 + 2 * MAXNDEV*(DEVDESCSIZE+4)]; --- 810,814 ---- /* tb { */ ! void glob_midi_getindevs(t_pd *dummy, t_symbol *s, int ac, t_atom *av) { char buf[1024 + 2 * MAXNDEV*(DEVDESCSIZE+4)]; *************** *** 830,833 **** --- 830,835 ---- char str[DEVDESCSIZE]; + int f = ac ? (int)atom_getfloatarg(0,ac,av) : -1; + t_symbol * selector = gensym("midiindev"); t_symbol * pd = gensym("pd"); *************** *** 836,850 **** MAXNDEV, DEVDESCSIZE); ! for (i = 0; i < nindevs; i++) { t_symbol * sym; ! strcpy(str, indevlist + i * DEVDESCSIZE); sym = gensym(str); ! SETSYMBOL(argv+i, sym); } - typedmess(pd->s_thing, selector, nindevs, argv); } ! void glob_midi_getoutdevs(t_pd *dummy) { char buf[1024 + 2 * MAXNDEV*(DEVDESCSIZE+4)]; --- 838,865 ---- MAXNDEV, DEVDESCSIZE); ! if (f < 0) ! { ! int i; ! ! for (i = 0; i != nindevs ;++i) ! { ! t_symbol * sym; ! strcpy(str, indevlist + i * DEVDESCSIZE); ! sym = gensym(str); ! SETSYMBOL(argv+i, sym); ! } ! typedmess(pd->s_thing, selector, nindevs, argv); ! } ! else if (f < nindevs) { t_symbol * sym; ! strcpy(str, indevlist + f * DEVDESCSIZE); sym = gensym(str); ! SETSYMBOL(argv, sym); ! typedmess(pd->s_thing, selector, 1, argv); } } ! void glob_midi_getoutdevs(t_pd *dummy, t_symbol *s, int ac, t_atom *av) { char buf[1024 + 2 * MAXNDEV*(DEVDESCSIZE+4)]; *************** *** 865,868 **** --- 880,885 ---- t_atom argv[MAXNDEV]; char str[DEVDESCSIZE]; + + int f = ac ? (int)atom_getfloatarg(0,ac,av) : -1; t_symbol * selector = gensym("midioutdev"); *************** *** 872,883 **** MAXNDEV, DEVDESCSIZE); ! for (i = 0; i < noutdevs; i++) { t_symbol * sym; ! strcpy(str, outdevlist + i * DEVDESCSIZE); sym = gensym(str); ! SETSYMBOL(argv+i, sym); } - typedmess(pd->s_thing, selector, noutdevs, argv); } --- 889,913 ---- MAXNDEV, DEVDESCSIZE); ! if (f < 0) ! { ! int i; ! ! for (i = 0; i != noutdevs ;++i) ! { ! t_symbol * sym; ! strcpy(str, outdevlist + i * DEVDESCSIZE); ! sym = gensym(str); ! SETSYMBOL(argv+i, sym); ! } ! typedmess(pd->s_thing, selector, noutdevs, argv); ! } ! else if (f < noutdevs) { t_symbol * sym; ! strcpy(str, outdevlist + f * DEVDESCSIZE); sym = gensym(str); ! SETSYMBOL(argv, sym); ! typedmess(pd->s_thing, selector, 1, argv); } } *************** *** 905,909 **** for (i = 0; i < noutdev; i++) { ! SETFLOAT(argv+i, midiindev[i]); } typedmess(pd->s_thing, selector, nindev, argv); --- 935,939 ---- for (i = 0; i < noutdev; i++) { ! SETFLOAT(argv+i, midiindev[i]+1); } typedmess(pd->s_thing, selector, nindev, argv); *************** *** 932,936 **** for (i = 0; i < noutdev; i++) { ! SETFLOAT(argv+i, midioutdev[i]); } typedmess(pd->s_thing, selector, nindev, argv); --- 962,966 ---- for (i = 0; i < noutdev; i++) { ! SETFLOAT(argv+i, midioutdev[i]+1); } typedmess(pd->s_thing, selector, nindev, argv); Index: s_audio_portaudio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** s_audio_portaudio.c 4 Aug 2006 11:55:51 -0000 1.1.2.16 --- s_audio_portaudio.c 5 Aug 2006 19:03:59 -0000 1.1.2.17 *************** *** 209,212 **** --- 209,213 ---- { const PaStreamInfo * streaminfo = Pa_GetStreamInfo (pa_stream); + t_atom atoms[4]; *************** *** 216,223 **** sys_schedadvance = 1e-6 * streaminfo->outputLatency; SETFLOAT(atoms, (float)pa_indev); SETFLOAT(atoms+1, (float)inchans); SETFLOAT(atoms+2, (float)rate); ! SETFLOAT(atoms+3, (float)streaminfo->inputLatency * 1000); typedmess(pd->s_thing, selector1, 4, atoms); --- 217,225 ---- sys_schedadvance = 1e-6 * streaminfo->outputLatency; + SETFLOAT(atoms, (float)pa_indev); SETFLOAT(atoms+1, (float)inchans); SETFLOAT(atoms+2, (float)rate); ! SETFLOAT(atoms+3, (float)streaminfo->inputLatency * 1000.f); typedmess(pd->s_thing, selector1, 4, atoms); *************** *** 225,229 **** SETFLOAT(atoms+1, (float)outchans); SETFLOAT(atoms+2, (float)rate); ! SETFLOAT(atoms+3, (float)streaminfo->outputLatency * 1000); typedmess(pd->s_thing, selector2, 4, atoms); } --- 227,231 ---- SETFLOAT(atoms+1, (float)outchans); SETFLOAT(atoms+2, (float)rate); ! SETFLOAT(atoms+3, (float)streaminfo->outputLatency * 1000.f); typedmess(pd->s_thing, selector2, 4, atoms); } *************** *** 475,479 **** } ! void pa_getaudioindevinfo(t_float f) { int i = pdindev2paindev((int)f); --- 477,481 ---- } ! void pa_getaudioininfo(t_float f) { int i = pdindev2paindev((int)f); *************** *** 485,489 **** if (pdi) { ! t_symbol * selector = gensym("audioindevinfo"); t_symbol * pd = gensym("pd"); t_atom argv[4]; --- 487,491 ---- if (pdi) { ! t_symbol * selector = gensym("audioininfo"); t_symbol * pd = gensym("pd"); t_atom argv[4]; *************** *** 496,500 **** } ! void pa_getaudiooutdevinfo(t_float f) { int i = pdoutdev2paoutdev((int)f); --- 498,502 ---- } ! void pa_getaudiooutinfo(t_float f) { int i = pdoutdev2paoutdev((int)f); *************** *** 506,510 **** if (pdi) { ! t_symbol * selector = gensym("audiooutdevinfo"); t_symbol * pd = gensym("pd"); t_atom argv[4]; --- 508,512 ---- if (pdi) { ! t_symbol * selector = gensym("audiooutinfo"); t_symbol * pd = gensym("pd"); t_atom argv[4]; *************** *** 535,539 **** int outchans = atom_getfloatarg(4, ac, av); int advance = atom_getfloatarg(5, ac, av); - int blocksize = (advance * samplerate) / (1000000.); t_symbol * pd = gensym("pd"); t_symbol * selector = gensym("testaudiosettingresult"); --- 537,540 ---- *************** *** 564,568 **** ret = Pa_IsFormatSupported(&inputParameters, &outputParameters, samplerate); ! SETFLOAT(argv, ret); typedmess(pd->s_thing, selector, 1, argv); } --- 565,569 ---- ret = Pa_IsFormatSupported(&inputParameters, &outputParameters, samplerate); ! SETFLOAT(argv, ret == paNoError?1:0); typedmess(pd->s_thing, selector, 1, argv); } Index: s_midi_pm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v retrieving revision 1.4.4.1.2.3 retrieving revision 1.4.4.1.2.4 diff -C2 -d -r1.4.4.1.2.3 -r1.4.4.1.2.4 *** s_midi_pm.c 28 Jul 2006 14:46:43 -0000 1.4.4.1.2.3 --- s_midi_pm.c 5 Aug 2006 19:03:59 -0000 1.4.4.1.2.4 *************** *** 41,44 **** --- 41,45 ---- for (i = 0; i < nmidiin; i++) { + int found = 0; for (j = 0, devno = 0; j < Pm_CountDevices(); j++) { *************** *** 50,54 **** err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev], j, NULL, 100, NULL, NULL); ! if (err) post("could not open midi input %d (%s): %s", j, info->name, Pm_GetErrorText(err)); --- 51,55 ---- err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev], j, NULL, 100, NULL, NULL); ! if (err != pmNoError) post("could not open midi input %d (%s): %s", j, info->name, Pm_GetErrorText(err)); *************** *** 60,63 **** --- 61,65 ---- info->name); mac_nmidiindev++; + found = 1; } } *************** *** 65,68 **** --- 67,72 ---- } } + if(!found) + post("could not find midi device %d",midiinvec[i]); } *************** *** 70,73 **** --- 74,78 ---- for (i = 0; i < nmidiout; i++) { + int found = 0; for (j = 0, devno = 0; j < Pm_CountDevices(); j++) { *************** *** 89,92 **** --- 94,98 ---- info->name); mac_nmidioutdev++; + found = 1; } } *************** *** 94,97 **** --- 100,105 ---- } } + if(!found) + post("could not find midi device %d",midioutvec[i]); } }

1 0

pd/src desire.tk,1.1.2.285,1.1.2.286
by chunlee 05 Aug '06

05 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30232 Modified Files: Tag: devel_0_39 desire.tk Log Message: small fixes to finalise pdrc/ddrc editor Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.285 retrieving revision 1.1.2.286 diff -C2 -d -r1.1.2.285 -r1.1.2.286 *** desire.tk 4 Aug 2006 15:13:33 -0000 1.1.2.285 --- desire.tk 5 Aug 2006 13:06:31 -0000 1.1.2.286 *************** *** 777,781 **** } ! def* Menuable altkey {key iso} { global accels set key [if {$shift} {string toupper $key} {string tolower $key}] --- 777,781 ---- } ! def* Menuable altkey {key iso shift} { global accels set key [if {$shift} {string toupper $key} {string tolower $key}] *************** *** 1207,1214 **** $self bind <Control-Key> ctrlkey %K 0 $self bind <Control-Shift-Key> ctrlkey %K 1 ! $self bind <Alt-Key> altkey %K %A switch $OS { unix { ! $self bind <Mod1-Key> altkey %K %A $self bind <Mod4-Key> altkey %K %A } --- 1207,1215 ---- $self bind <Control-Key> ctrlkey %K 0 $self bind <Control-Shift-Key> ctrlkey %K 1 ! $self bind <Alt-Key> altkey %K %A 0 ! $self bind <Alt-Shift-Key> altkey %K %A 1 switch $OS { unix { ! $self bind <Mod1-Key> altkey %K %A 0 $self bind <Mod4-Key> altkey %K %A } *************** *** 4855,4859 **** frame $f.buttonsep -height 2 -borderwidth 1 -relief sunken frame $f.buttonframe ! foreach {a} {cancel apply ok} { button $f.buttonframe.$a -text [say $a] -command "$self $a" pack $f.buttonframe.$a -side left -expand 1 --- 4856,4860 ---- frame $f.buttonsep -height 2 -borderwidth 1 -relief sunken frame $f.buttonframe ! foreach {a} {default cancel apply ok} { button $f.buttonframe.$a -text [say $a] -command "$self $a" pack $f.buttonframe.$a -side left -expand 1 *************** *** 4890,4894 **** -command [list $self color_popup_select $frame $var [expr 0x$c]] } ! tk_popup $w [expr [winfo rootx .$self.$var.color]] [expr [winfo rooty $frame.color]] } --- 4891,4895 ---- -command [list $self color_popup_select $frame $var [expr 0x$c]] } ! tk_popup $w [expr [winfo rootx $frame.color]] [expr [winfo rooty $frame.color]] } *************** *** 4952,4957 **** --- 4953,4960 ---- def PagedDialog dir_remove {listbox} { set sel [$listbox curselection] + if {$sel != ""} { $listbox delete $sel $listbox selection set $sel + } } *************** *** 4969,4972 **** --- 4972,4976 ---- def PagedDialog dir_down {listbox} { set sel [$listbox curselection] + if {$sel != ""} { if {$sel < [expr [$listbox size] - 1]} { set line [$listbox get $sel] *************** *** 4976,4979 **** --- 4980,4984 ---- $listbox see [expr $sel + 1] } + } } *************** *** 5144,5148 **** close $fd } ! def ServerPrefsDialog init {} { global pdrc_options --- 5149,5154 ---- close $fd } ! def* ServerPrefsDialog default {} { ! } def ServerPrefsDialog init {} { global pdrc_options *************** *** 5357,5361 **** close $fd } ! def ClientPrefsDialog init {} { global ddrc_options look key --- 5363,5368 ---- close $fd } ! def* ClientPrefsDialog default {} { ! } def ClientPrefsDialog init {} { global ddrc_options look key

1 0

packages/darwin_app Makefile,1.47,1.48
by Hans-Christoph Steiner 04 Aug '06

04 Aug '06

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27275/darwin_app Modified Files: Makefile Log Message: arg it should be a tab, not spaces Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Makefile 2 Aug 2006 21:00:26 -0000 1.47 --- Makefile 4 Aug 2006 17:38:56 -0000 1.48 *************** *** 283,287 **** # some better tests should go in here echo "Ejecting $(DMG_NAME)" ! cd $(CWD) && hdiutil eject `mount | grep "$(DMG_NAME)" | cut -d ' ' -f 1` --- 283,287 ---- # some better tests should go in here echo "Ejecting $(DMG_NAME)" ! cd $(CWD) && hdiutil eject `mount | grep "$(DMG_NAME)" | cut -d ' ' -f 1`

1 0

pd/src desire.tk,1.1.2.284,1.1.2.285
by chunlee 04 Aug '06

04 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4291 Modified Files: Tag: devel_0_39 desire.tk Log Message: pdrc editor now also writes .pdrc Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.284 retrieving revision 1.1.2.285 diff -C2 -d -r1.1.2.284 -r1.1.2.285 *** desire.tk 4 Aug 2006 14:09:46 -0000 1.1.2.284 --- desire.tk 4 Aug 2006 15:13:33 -0000 1.1.2.285 *************** *** 4660,4663 **** --- 4660,4665 ---- -activestyle none -xscrollcommand "$f.a.xscroll set" foreach line $_($self:$name) {$f.a.list insert end $line} + # save the listbox path at _($self:$name) instead + set _($self:$name) $f.a.list scrollbar $f.a.yscroll -command "$f.a.list yview" scrollbar $f.a.xscroll -command "$f.a.list xview" -orient horizontal *************** *** 4695,4698 **** --- 4697,4702 ---- -activestyle none -xscrollcommand "$f.a.xscroll set" foreach line $_($self:$name) {$f.a.list insert end $line} + # save the listbox path at _($self:$name) instead + set _($self:$name) $f.a.list scrollbar $f.a.yscroll -command "$f.a.list yview" scrollbar $f.a.xscroll -command "$f.a.list xview" -orient horizontal *************** *** 4941,4945 **** def PagedDialog entry_set2listbox {listbox entry} { set var [$entry get] - puts $var $listbox insert end $var $listbox yview end --- 4945,4948 ---- *************** *** 5125,5137 **** foreach {type names} $pdrc_options { switch $type { ! radio {set name [lindex $names 0]} default {set name [lindex [split $names |] 0]} } set v $@$name switch $type { ! folders {foreach x $v {puts $fd "$name $x"}} ! files {foreach x $v {puts $fd "$name $x"}} ! void {if {[string length $v]} {if {$v} {puts $fd $name}}} ! radio {if {$v} {set t [lindex $names $v]; puts [split $t |]}} default {if {[string length $v]} {puts $fd "$name $v"}} } --- 5128,5142 ---- foreach {type names} $pdrc_options { switch $type { ! radio {set name [lindex [split $names |] 0]} default {set name [lindex [split $names |] 0]} } set v $@$name switch $type { ! folders {foreach item [$v get 0 [$v size]] {puts $fd "$name $item"}} ! lists {foreach item [$v get 0 [$v size]] {puts $fd "$name $item"}} ! #files {foreach x $v {puts $fd "$name $x"}} ! #void {if {[string length $v]} {if {$v} {puts $fd $name}}} ! #radio {if {$v} {set t [lindex $names $v]; puts [split $t |]}} ! radio {puts $fd "$v"} default {if {[string length $v]} {puts $fd "$name $v"}} }

1 0

pd/src desire.tk,1.1.2.283,1.1.2.284
by chunlee 04 Aug '06

04 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13972 Modified Files: Tag: devel_0_39 desire.tk Log Message: .pdrc can now be read into the pdrc editor... next: wirte .pdrc from the editor Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.283 retrieving revision 1.1.2.284 diff -C2 -d -r1.1.2.283 -r1.1.2.284 *** desire.tk 31 Jul 2006 15:56:18 -0000 1.1.2.283 --- desire.tk 4 Aug 2006 14:09:46 -0000 1.1.2.284 *************** *** 1041,1046 **** proc menu_audio {flag} {pd pd dsp $flag} ! set pd_prefix [file dirname [file dirname [exec which pd]]] ! set pd_guidir ${pd_prefix}/lib/pd set doc_number 1 --- 1041,1047 ---- proc menu_audio {flag} {pd pd dsp $flag} ! #set pd_prefix [file dirname [file dirname [exec which pd]]] ! #set pd_guidir ${pd_prefix}/lib/pd ! set pd_guidir "" set doc_number 1 *************** *** 2320,2323 **** --- 2321,2325 ---- def* Canvas obj_jump {} { + if {[llength $@children] != 0} { $self deselect_all set obj_sel [lindex $@children $@jump] *************** *** 2327,2330 **** --- 2329,2333 ---- incr @jump if {$@jump >= [llength $@children]} {set @jump 0} + } } *************** *** 4599,4611 **** frame $f set i 0 ! label $f.label -text [lindex $label 0] #pack [label $f.label -text [lindex $label 0]] $f -side left # this which is not good, need to sort it out... set m [menu $f.$name -tearoff 0] ! foreach part [lrange $label 1 end] { $m add command -label [say $part] -command [list $self dropmenu_set $f $name $part] } label $f.label_set -text [say $_($self:$name)] -relief raised -width 20 balloon $f.label_set "click to change setting" pack $f.label $f.label_set -side left --- 4602,4616 ---- frame $f set i 0 ! label $f.label -text [say [lindex [split $label |] 0]] #pack [label $f.label -text [lindex $label 0]] $f -side left # this which is not good, need to sort it out... set m [menu $f.$name -tearoff 0] ! set label [string range $label [expr [string first "|" $label 0]+1] end] ! foreach part [split $label |] { $m add command -label [say $part] -command [list $self dropmenu_set $f $name $part] } label $f.label_set -text [say $_($self:$name)] -relief raised -width 20 + #label $f.label_set -text poo -relief raised -width 20 balloon $f.label_set "click to change setting" pack $f.label $f.label_set -side left *************** *** 4652,4656 **** frame $f.a pack [label $f.label -text $label -width 20 -anchor e] -side left ! listbox $f.a.list -width 50 -height 5 -yscrollcommand "$f.a.yscroll set" \ -activestyle none -xscrollcommand "$f.a.xscroll set" foreach line $_($self:$name) {$f.a.list insert end $line} --- 4657,4661 ---- frame $f.a pack [label $f.label -text $label -width 20 -anchor e] -side left ! listbox $f.a.list -width 50 -height 8 -yscrollcommand "$f.a.yscroll set" \ -activestyle none -xscrollcommand "$f.a.xscroll set" foreach line $_($self:$name) {$f.a.list insert end $line} *************** *** 4680,4684 **** pack $f.b.6 -side top ! pack $f.b -side left } --- 4685,4731 ---- pack $f.b.6 -side top ! pack $f.b -side top ! } ! lists { ! set no_max_label 1 ! frame $f ! frame $f.a ! pack [label $f.label -text $label -width 20 -anchor e] -side left ! listbox $f.a.list -width 33 -height 10 -yscrollcommand "$f.a.yscroll set" \ ! -activestyle none -xscrollcommand "$f.a.xscroll set" ! foreach line $_($self:$name) {$f.a.list insert end $line} ! scrollbar $f.a.yscroll -command "$f.a.list yview" ! scrollbar $f.a.xscroll -command "$f.a.list xview" -orient horizontal ! ! pack $f.a.xscroll -side bottom -fill x ! pack $f.a.list -side left -fill both -expand 1 ! pack $f.a.yscroll -side left -fill y ! pack $f.a -side left ! ! frame $f.b -borderwidth 0 ! frame $f.b.entry -borderwidth 0 ! frame $f.b.butts -borderwidth 0 ! ! entry $f.b.entry.add -width 15 -borderwidth 5 -relief ridge ! pack $f.b.entry.add -side left ! button $f.b.entry.3 -command "$self entry_set2listbox $f.a.list $f.b.entry.add" -text "add" -width 6 ! balloon $f.b.entry.3 "click to select directory" ! pack $f.b.entry.3 -side left ! pack $f.b.entry -side top ! ! button $f.b.butts.5 -command "$self dir_up $f.a.list" -text "up" -width 4 ! balloon $f.b.butts.5 "click to select directory" ! pack $f.b.butts.5 -side left -padx 3 ! ! button $f.b.butts.6 -command "$self dir_down $f.a.list" -text "down" -width 4 ! balloon $f.b.butts.6 "click to select directory" ! pack $f.b.butts.6 -side left -padx 2 ! ! button $f.b.butts.4 -command "$self dir_remove $f.a.list" -text "remove" -width 6 ! balloon $f.b.butts.4 "click to select directory" ! pack $f.b.butts.4 -side left -padx 2 ! ! pack $f.b.butts -side top ! pack $f.b -side top } *************** *** 4892,4895 **** --- 4939,4950 ---- } + def PagedDialog entry_set2listbox {listbox entry} { + set var [$entry get] + puts $var + $listbox insert end $var + $listbox yview end + focus .$self + } + def PagedDialog dir_remove {listbox} { set sel [$listbox curselection] *************** *** 4965,4969 **** void -nodac void -noadc ! radio {audio_api_choice default -alsa -jack -mmio -portaudio|-pa|-asio -oss} void -32bit --- 5020,5024 ---- void -nodac void -noadc ! radio {audio_api_choice|default|-alsa|-jack|-mmio|-portaudio|-pa|-asio|-oss} void -32bit *************** *** 4975,4984 **** section section_externals ! files -lib section section_paths folders -path folders -helppath - folders -look section section_gui --- 5030,5038 ---- section section_externals ! lists -lib section section_paths folders -path folders -helppath section section_gui *************** *** 5015,5023 **** global pdrc_options pdrc_options_h cmdline set fd [open $cmdline(rcfilename) "RDONLY CREAT"] ! set contents [split [string map {"\n" " "} [read $fd]] " "] close $fd foreach {type names} $pdrc_options { switch $type { ! radio {set name [lindex $names 0]} default {set name [lindex [split $names |] 0]} } --- 5069,5078 ---- global pdrc_options pdrc_options_h cmdline set fd [open $cmdline(rcfilename) "RDONLY CREAT"] ! #set contents [split [string map {"\n" " "} [read $fd]] " "] ! set contents [split [read $fd] "\n"] close $fd foreach {type names} $pdrc_options { switch $type { ! radio {set name [lindex [split $names |] 0]} default {set name [lindex [split $names |] 0]} } *************** *** 5028,5034 **** } set i 0 ! while {$i < [llength $contents]} { ! set op [lindex $contents $i] ! if {[string length $op]==0} {break} if {![info exists pdrc_options_h($op)]} { error "unknown option: $op" --- 5083,5089 ---- } set i 0 ! ! foreach line $contents { ! foreach {op setting} $line { if {![info exists pdrc_options_h($op)]} { error "unknown option: $op" *************** *** 5036,5046 **** mset {type name} $pdrc_options_h($op) switch $type { ! folders {incr i; lappend @$name [lindex $contents $i]} files {incr i; lappend @$name [lindex $contents $i]} ! void {set @$name 1} ! default {incr i; set @$name [lindex $contents $i]} } ! incr i } } --- 5091,5121 ---- mset {type name} $pdrc_options_h($op) switch $type { ! folders {lappend @$name [lindex $line 1]} ! lists {lappend @$name [lindex $line 1]} files {incr i; lappend @$name [lindex $contents $i]} ! radio {set @$name $line} ! #void {set @$name 1} ! default {set @$name [lindex $contents 1]} } ! } ! } + + #while {$i < [llength $contents]} { + # set op [lindex $contents $i] + # puts "op ::: $op" + # if {[string length $op]==0} {break} + # if {![info exists pdrc_options_h($op)]} { + # error "unknown option: $op" + # } + # mset {type name} $pdrc_options_h($op) + # switch $type { + # folders {incr i; lappend @$name [lindex $contents $i]} + # files {incr i; lappend @$name [lindex $contents $i]} + # void {set @$name 1} + # default {incr i; set @$name [lindex $contents $i]} + # } + # incr i + #} } *************** *** 5076,5081 **** if {[llength $names] > 1} { set label [say [lindex $names 0]] } else { ! set label [say $names] } if {[string length $label] > $@max_label} {set @max_label [string length $label]} --- 5151,5158 ---- if {[llength $names] > 1} { set label [say [lindex $names 0]] + puts "label::::: $label" } else { ! set name [lindex [split $names |] 0] ! set label [say $name] } if {[string length $label] > $@max_label} {set @max_label [string length $label]} *************** *** 5093,5097 **** puts "babble :::: $babble" properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ ! [list [lindex $name 0] $babble choice {}] } folders { --- 5170,5174 ---- puts "babble :::: $babble" properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ ! [list $name $names choice {}] } folders { *************** *** 5099,5102 **** --- 5176,5183 ---- [list $name [say $name] $type {}] } + lists { + properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ + [list $name [say $name] $type {}] + } default { properties_dialog $self $f.main.$section ServerPrefsDialog_ok \

1 0

pd/src s_audio_portaudio.c, 1.1.2.15, 1.1.2.16 m_glob.c, 1.4.4.2.2.13, 1.4.4.2.2.14
by Tim Blechmann 04 Aug '06

04 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27745 Modified Files: Tag: devel_0_39 s_audio_portaudio.c m_glob.c Log Message: improved feedback to pd receiver when opening portaudio devices Index: s_audio_portaudio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** s_audio_portaudio.c 4 Aug 2006 11:37:49 -0000 1.1.2.15 --- s_audio_portaudio.c 4 Aug 2006 11:55:51 -0000 1.1.2.16 *************** *** 44,48 **** static PaStream *pa_stream; /* Initialize PortAudio */ ! PaError pa_status = -1; int pa_initialized = 0; --- 44,48 ---- static PaStream *pa_stream; /* Initialize PortAudio */ ! PaError pa_status = -1; int pa_initialized = 0; *************** *** 71,76 **** static int pdoutdev2paoutdev(int pdoutdev); ! int process (const void *input, void *output, unsigned long frameCount, ! const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void *userData); --- 71,76 ---- static int pdoutdev2paoutdev(int pdoutdev); ! int process (const void *input, void *output, unsigned long frameCount, ! const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void *userData); *************** *** 84,88 **** static int pa_indev = -1, pa_outdev = -1; ! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode) { --- 84,88 ---- static int pa_indev = -1, pa_outdev = -1; ! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode) { *************** *** 91,96 **** schedmode = 1; /* we don't support blocking io */ ! ! pa_initialize(); sys_setscheduler(schedmode); --- 91,96 ---- schedmode = 1; /* we don't support blocking io */ ! ! pa_initialize(); sys_setscheduler(schedmode); *************** *** 107,111 **** outchans = MAX_PA_CHANS; } ! if (inchans > 0) { --- 107,111 ---- outchans = MAX_PA_CHANS; } ! if (inchans > 0) { *************** *** 127,131 **** } } ! if (outchans > 0) { --- 127,131 ---- } } ! if (outchans > 0) { *************** *** 147,151 **** } } ! if (1/* sys_verbose */) --- 147,151 ---- } } ! if (1/* sys_verbose */) *************** *** 159,166 **** int blocksize; PaStreamParameters inputParameters, outputParameters; ! const PaDeviceInfo* pdi = Pa_GetDeviceInfo(pa_indev); const PaDeviceInfo* pdo = Pa_GetDeviceInfo(pa_outdev); ! /* initialize input */ inputParameters.device = pa_indev; --- 159,166 ---- int blocksize; PaStreamParameters inputParameters, outputParameters; ! const PaDeviceInfo* pdi = Pa_GetDeviceInfo(pa_indev); const PaDeviceInfo* pdo = Pa_GetDeviceInfo(pa_outdev); ! /* initialize input */ inputParameters.device = pa_indev; *************** *** 178,198 **** /* set block size */ ! // blocksize = sys_advance_samples; ! ! // if (blocksize > 8192) ! // blocksize = 8192; ! // else if (blocksize < sys_dacblocksize) ! // blocksize = sys_dacblocksize; ! ! // if (blocksize != (1 << ilog2(blocksize))) ! // { ! // blocksize = (1 << ilog2(blocksize)); ! // } ! blocksize=64; - // post("using blocksize %d", blocksize); - pa_blocksize = blocksize; ! /* initialize io buffer */ for (j=0; j != MAX_PA_CHANS;++j) --- 178,185 ---- /* set block size */ ! blocksize=64; pa_blocksize = blocksize; ! /* initialize io buffer */ for (j=0; j != MAX_PA_CHANS;++j) *************** *** 200,204 **** if (pa_inbuffer[j]) freealignedbytes(pa_inbuffer[j], 0); ! if (pa_outbuffer[j]) freealignedbytes(pa_outbuffer[j], 0); --- 187,191 ---- if (pa_inbuffer[j]) freealignedbytes(pa_inbuffer[j], 0); ! if (pa_outbuffer[j]) freealignedbytes(pa_outbuffer[j], 0); *************** *** 212,216 **** err = Pa_OpenStream(&pa_stream, ( (pa_indev != -1) ? &inputParameters : 0), ! ( (pa_outdev != -1) ? &outputParameters : 0), rate, pa_blocksize, --- 199,203 ---- err = Pa_OpenStream(&pa_stream, ( (pa_indev != -1) ? &inputParameters : 0), ! ( (pa_outdev != -1) ? &outputParameters : 0), rate, pa_blocksize, *************** *** 222,245 **** { const PaStreamInfo * streaminfo = Pa_GetStreamInfo (pa_stream); ! t_atom atoms[2]; t_symbol * pd = gensym("pd"); ! t_symbol * latency = gensym("latency"); ! t_symbol * selector1 = gensym("audioindev"); ! t_symbol * selector2 = gensym("audiooutdev"); sys_schedadvance = 1e-6 * streaminfo->outputLatency; ! SETSYMBOL(atoms, latency); ! SETFLOAT(atoms+1, streaminfo->inputLatency); ! typedmess(pd->s_thing, selector1, 2, atoms); ! ! SETFLOAT(atoms+1, streaminfo->outputLatency); ! typedmess(pd->s_thing, selector2, 2, atoms); } } else err = 0; ! if ( err != paNoError ) { --- 209,235 ---- { const PaStreamInfo * streaminfo = Pa_GetStreamInfo (pa_stream); ! t_atom atoms[4]; t_symbol * pd = gensym("pd"); ! t_symbol * selector1 = gensym("audiocurrentininfo"); ! t_symbol * selector2 = gensym("audiocurrentoutinfo"); sys_schedadvance = 1e-6 * streaminfo->outputLatency; ! SETFLOAT(atoms, (float)pa_indev); ! SETFLOAT(atoms+1, (float)inchans); ! SETFLOAT(atoms+2, (float)rate); ! SETFLOAT(atoms+3, (float)streaminfo->inputLatency * 1000); ! typedmess(pd->s_thing, selector1, 4, atoms); ! SETFLOAT(atoms, (float)pa_outdev); ! SETFLOAT(atoms+1, (float)outchans); ! SETFLOAT(atoms+2, (float)rate); ! SETFLOAT(atoms+3, (float)streaminfo->outputLatency * 1000); ! typedmess(pd->s_thing, selector2, 4, atoms); } } else err = 0; ! if ( err != paNoError ) { *************** *** 256,265 **** pa_inchans = inchans; pa_outchans = outchans; ! /* we might have adapted the channel count */ sys_setchsr(inchans, outchans, rate, sys_dacblocksize); ! err = Pa_StartStream(pa_stream); ! if ( err != paNoError ) { --- 246,255 ---- pa_inchans = inchans; pa_outchans = outchans; ! /* we might have adapted the channel count */ sys_setchsr(inchans, outchans, rate, sys_dacblocksize); ! err = Pa_StartStream(pa_stream); ! if ( err != paNoError ) { *************** *** 270,276 **** return (1); } ! post("successfully started"); ! return (0); } --- 260,266 ---- return (1); } ! post("successfully started"); ! return (0); } *************** *** 300,304 **** phase += 0.05; if( phase >= (2.0 * M_PI) ) phase -= (2.0 * M_PI); ! } for (i = 0; i != framesPerBuffer / sys_dacblocksize; ++i) --- 290,294 ---- phase += 0.05; if( phase >= (2.0 * M_PI) ) phase -= (2.0 * M_PI); ! } for (i = 0; i != framesPerBuffer / sys_dacblocksize; ++i) *************** *** 306,310 **** sched_tick(sys_time + sys_time_per_dsp_tick); } ! return 0; } --- 296,300 ---- sched_tick(sys_time + sys_time_per_dsp_tick); } ! return 0; } *************** *** 315,320 **** void sys_lock_timeout_notification(void); ! int process (const void *input, void *output, unsigned long frameCount, ! const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void *userData) { --- 305,310 ---- void sys_lock_timeout_notification(void); ! int process (const void *input, void *output, unsigned long frameCount, ! const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void *userData) { *************** *** 344,351 **** in, sys_dacblocksize); } ! sched_tick(sys_time + sys_time_per_dsp_tick); ! ! for (j = 0; j < sys_outchannels; j++) { t_sample * out = ((t_sample**)output)[j] + i * sys_dacblocksize; --- 334,341 ---- in, sys_dacblocksize); } ! sched_tick(sys_time + sys_time_per_dsp_tick); ! ! for (j = 0; j < sys_outchannels; j++) { t_sample * out = ((t_sample**)output)[j] + i * sys_dacblocksize; *************** *** 356,367 **** if (sys_meters) sys_peakmeters(); ! /* clear the output buffer */ zerovec(sys_soundout, pa_outchans * sys_dacblocksize); } ! run_all_idle_callbacks(); sys_unlock(); ! return 0; } --- 346,357 ---- if (sys_meters) sys_peakmeters(); ! /* clear the output buffer */ zerovec(sys_soundout, pa_outchans * sys_dacblocksize); } ! run_all_idle_callbacks(); sys_unlock(); ! return 0; } *************** *** 407,411 **** const PaDeviceInfo *pdi; PaError err; ! pa_initialize(); numDevices = Pa_GetDeviceCount(); --- 397,401 ---- const PaDeviceInfo *pdi; PaError err; ! pa_initialize(); numDevices = Pa_GetDeviceCount(); *************** *** 451,455 **** *canmulti = 1; /* one dev each for input and output */ ! pa_initialize(); ndev = Pa_GetDeviceCount(); --- 441,445 ---- *canmulti = 1; /* one dev each for input and output */ ! pa_initialize(); ndev = Pa_GetDeviceCount(); *************** *** 475,479 **** unsigned int apiNameLen = strlen(apiName); strcpy(outdevlist + nout * devdescsize, apiName); ! outdevlist[nout * devdescsize + apiNameLen] = '/'; strcpy(outdevlist + nout * devdescsize + apiNameLen + 1, pdi->name); --- 465,469 ---- unsigned int apiNameLen = strlen(apiName); strcpy(outdevlist + nout * devdescsize, apiName); ! outdevlist[nout * devdescsize + apiNameLen] = '/'; strcpy(outdevlist + nout * devdescsize + apiNameLen + 1, pdi->name); *************** *** 489,494 **** int i = pdindev2paindev((int)f); const PaDeviceInfo * pdi; ! ! pa_initialize(); pdi = Pa_GetDeviceInfo (i); --- 479,484 ---- int i = pdindev2paindev((int)f); const PaDeviceInfo * pdi; ! ! pa_initialize(); pdi = Pa_GetDeviceInfo (i); *************** *** 510,515 **** int i = pdoutdev2paoutdev((int)f); const PaDeviceInfo * pdi; ! ! pa_initialize(); pdi = Pa_GetDeviceInfo (i); --- 500,505 ---- int i = pdoutdev2paoutdev((int)f); const PaDeviceInfo * pdi; ! ! pa_initialize(); pdi = Pa_GetDeviceInfo (i); *************** *** 549,563 **** t_symbol * selector = gensym("testaudiosettingresult"); t_atom argv[1]; ! ! pa_initialize(); ! indev = pdindev2paindev(indev); outdev = pdoutdev2paoutdev(outdev); ! if ((pa_indev == -1) && (pa_outdev == -1)) { ! int ret; ! PaStreamParameters inputParameters, outputParameters; ! inputParameters.device = indev; inputParameters.channelCount = inchans; --- 539,553 ---- t_symbol * selector = gensym("testaudiosettingresult"); t_atom argv[1]; ! ! pa_initialize(); ! indev = pdindev2paindev(indev); outdev = pdoutdev2paoutdev(outdev); ! if ((pa_indev == -1) && (pa_outdev == -1)) { ! int ret; ! PaStreamParameters inputParameters, outputParameters; ! inputParameters.device = indev; inputParameters.channelCount = inchans; *************** *** 565,569 **** inputParameters.suggestedLatency = advance * 0.001; inputParameters.hostApiSpecificStreamInfo = NULL; ! outputParameters.device = outdev; outputParameters.channelCount = outchans; --- 555,559 ---- inputParameters.suggestedLatency = advance * 0.001; inputParameters.hostApiSpecificStreamInfo = NULL; ! outputParameters.device = outdev; outputParameters.channelCount = outchans; *************** *** 571,577 **** outputParameters.suggestedLatency = advance * 0.001; outputParameters.hostApiSpecificStreamInfo = NULL; ! ret = Pa_IsFormatSupported(&inputParameters, &outputParameters, samplerate); ! SETFLOAT(argv, ret); typedmess(pd->s_thing, selector, 1, argv); --- 561,567 ---- outputParameters.suggestedLatency = advance * 0.001; outputParameters.hostApiSpecificStreamInfo = NULL; ! ret = Pa_IsFormatSupported(&inputParameters, &outputParameters, samplerate); ! SETFLOAT(argv, ret); typedmess(pd->s_thing, selector, 1, argv); *************** *** 583,587 **** int j; int devno; ! pa_initialize(); for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) --- 573,577 ---- int j; int devno; ! pa_initialize(); for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) *************** *** 606,610 **** int j; int devno; ! pa_initialize(); for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) --- 596,600 ---- int j; int devno; ! pa_initialize(); for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) *************** *** 627,655 **** void pa_get_asio_latencies(t_float f) { ! int index = (int)f; ! const PaDeviceInfo *pdi = Pa_GetDeviceInfo(index); ! if (pdi->hostApi != paASIO) ! { ! post("device not an asio device"); ! return; ! } #ifdef WIN32 ! else ! { ! long minlat, maxlat, preflat, gran; ! t_atom argv[4]; ! t_symbol * selector = gensym("asiolatency"); ! t_symbol * pd = gensym("pd"); ! PaAsio_GetAvailableLatencyValues(index, &minlat, &maxlat, &preflat, &gran); ! SETFLOAT(argv, (float) minlat); ! SETFLOAT(argv + 1, (float) maxlat); ! SETFLOAT(argv + 2, (float) preflat); ! SETFLOAT(argv + 3, (float) gran); ! ! typedmess(pd->s_thing, selector, 4, argv); ! } #endif --- 617,645 ---- void pa_get_asio_latencies(t_float f) { ! int index = (int)f; ! const PaDeviceInfo *pdi = Pa_GetDeviceInfo(index); ! if (pdi->hostApi != paASIO) ! { ! post("device not an asio device"); ! return; ! } #ifdef WIN32 ! else ! { ! long minlat, maxlat, preflat, gran; ! t_atom argv[4]; ! t_symbol * selector = gensym("asiolatency"); ! t_symbol * pd = gensym("pd"); ! PaAsio_GetAvailableLatencyValues(index, &minlat, &maxlat, &preflat, &gran); ! SETFLOAT(argv, (float) minlat); ! SETFLOAT(argv + 1, (float) maxlat); ! SETFLOAT(argv + 2, (float) preflat); ! SETFLOAT(argv + 3, (float) gran); ! ! typedmess(pd->s_thing, selector, 4, argv); ! } #endif Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.4.4.2.2.13 retrieving revision 1.4.4.2.2.14 diff -C2 -d -r1.4.4.2.2.13 -r1.4.4.2.2.14 *** m_glob.c 4 Aug 2006 09:48:06 -0000 1.4.4.2.2.13 --- m_glob.c 4 Aug 2006 11:55:52 -0000 1.4.4.2.2.14 *************** *** 101,104 **** --- 101,108 ---- if (s == gensym("midicurrentoutdev")) return; + if (s == gensym("audiocurrentininfo")) + return; + if (s == gensym("audiocurrentoutinfo")) + return; startpost("%s: unknown message %s ", class_getname(pd_class(x)),

1 0

pd/src s_audio_portaudio.c,1.1.2.14,1.1.2.15
by Thomas Grill 04 Aug '06

04 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21298 Modified Files: Tag: devel_0_39 s_audio_portaudio.c Log Message: latencies in ms Index: s_audio_portaudio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** s_audio_portaudio.c 29 Jun 2006 12:13:16 -0000 1.1.2.14 --- s_audio_portaudio.c 4 Aug 2006 11:37:49 -0000 1.1.2.15 *************** *** 500,505 **** SETFLOAT(argv, pdi->maxInputChannels); SETFLOAT(argv+1, pdi->defaultSampleRate); ! SETFLOAT(argv+2, pdi->defaultLowInputLatency); ! SETFLOAT(argv+3, pdi->defaultHighInputLatency); typedmess(pd->s_thing, selector, 4, argv); } --- 500,505 ---- SETFLOAT(argv, pdi->maxInputChannels); SETFLOAT(argv+1, pdi->defaultSampleRate); ! SETFLOAT(argv+2, pdi->defaultLowInputLatency*1000.f); ! SETFLOAT(argv+3, pdi->defaultHighInputLatency*1000.f); typedmess(pd->s_thing, selector, 4, argv); } *************** *** 521,526 **** SETFLOAT(argv, pdi->maxOutputChannels); SETFLOAT(argv+1, pdi->defaultSampleRate); ! SETFLOAT(argv+2, pdi->defaultLowOutputLatency); ! SETFLOAT(argv+3, pdi->defaultHighOutputLatency); typedmess(pd->s_thing, selector, 4, argv); } --- 521,526 ---- SETFLOAT(argv, pdi->maxOutputChannels); SETFLOAT(argv+1, pdi->defaultSampleRate); ! SETFLOAT(argv+2, pdi->defaultLowOutputLatency*1000.f); ! SETFLOAT(argv+3, pdi->defaultHighOutputLatency*1000.f); typedmess(pd->s_thing, selector, 4, argv); }

1 0

pd/src m_glob.c,1.4.4.2.2.12,1.4.4.2.2.13
by Thomas Grill 04 Aug '06

04 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14802 Modified Files: Tag: devel_0_39 m_glob.c Log Message: made midi messages consistent Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.4.4.2.2.12 retrieving revision 1.4.4.2.2.13 diff -C2 -d -r1.4.4.2.2.12 -r1.4.4.2.2.13 *** m_glob.c 25 Jul 2006 01:56:30 -0000 1.4.4.2.2.12 --- m_glob.c 4 Aug 2006 09:48:06 -0000 1.4.4.2.2.13 *************** *** 224,229 **** class_addmethod(glob_pdobject, (t_method)glob_midi_getoutdevs, gensym("getmidioutdev"), 0); class_addmethod(glob_pdobject, (t_method)glob_midi_getindevs, gensym("getmidiindev"), 0); ! class_addmethod(glob_pdobject, (t_method)glob_midi_getcurrentoutdevs, gensym("getcurrentmidioutdev"), 0); ! class_addmethod(glob_pdobject, (t_method)glob_midi_getcurrentindevs, gensym("getcurrentmidiindev"), 0); /* tb } */ --- 224,229 ---- class_addmethod(glob_pdobject, (t_method)glob_midi_getoutdevs, gensym("getmidioutdev"), 0); class_addmethod(glob_pdobject, (t_method)glob_midi_getindevs, gensym("getmidiindev"), 0); ! class_addmethod(glob_pdobject, (t_method)glob_midi_getcurrentoutdevs, gensym("getmidicurrentoutdev"), 0); ! class_addmethod(glob_pdobject, (t_method)glob_midi_getcurrentindevs, gensym("getmidicurrentindev"), 0); /* tb } */

1 0

[PD-cvs] externals/grill/py/source modmeth.cpp, 1.22, 1.23 pybase.h, 1.11, 1.12 pybuffer.cpp, 1.9, 1.10
by Thomas Grill 03 Aug '06

03 Aug '06

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31148/source Modified Files: modmeth.cpp pybase.h pybuffer.cpp Log Message: added message bundle functionality (pyext.Bundle class) enable compiled-only scripts (without .py) small optimizations and fixes small changes for numpy support enable module packages (module/__init__.py[co]), now also for Max compiler flag to exclude DSP objects some ASSERTs for explicitly created pyext classes (should be runtime checks i guess) added pyext._list and pyext._tuple to convert input lists to Python sequence objects let _inlets and _outlets default to 0 Index: pybase.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pybase.h 23 Mar 2006 01:42:05 -0000 1.11 --- pybase.h 3 Aug 2006 16:33:37 -0000 1.12 *************** *** 120,128 **** #endif ! #ifdef PY_NUMARRAY ! static void setupNumarray(); ! static PyObject *py_import(PyObject *,PyObject *args); ! static PyObject *py_export(PyObject *,PyObject *args); ! #endif // ----thread stuff ------------ --- 120,125 ---- #endif ! static PyObject *py_list(PyObject *,PyObject *args); ! static PyObject *py_tuple(PyObject *,PyObject *args); // ----thread stuff ------------ Index: modmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/modmeth.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** modmeth.cpp 12 Dec 2005 00:18:42 -0000 1.22 --- modmeth.cpp 3 Aug 2006 16:33:37 -0000 1.23 *************** *** 3,7 **** py/pyext - python external object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and Max/MSP ! Copyright (c)2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 28,36 **** { "_setvalue", pybase::py_setvalue, METH_VARARGS,"Set value of a 'value' object" }, #endif ! {NULL, NULL, 0, NULL} // sentinel }; const char *pybase::py_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2005 Thomas Grill\n" "\n" "This is the pyext module. Available function:\n" --- 28,40 ---- { "_setvalue", pybase::py_setvalue, METH_VARARGS,"Set value of a 'value' object" }, #endif ! ! { "_list", pybase::py_list, METH_VARARGS,"Make a list from arguments" }, ! { "_tuple", pybase::py_tuple, METH_VARARGS,"Make a tuple from arguments" }, ! ! {NULL, NULL, 0, NULL} // sentinel }; const char *pybase::py_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2006 Thomas Grill\n" "\n" "This is the pyext module. Available function:\n" *************** *** 43,46 **** --- 47,53 ---- "_getvalue(name): Get value of a 'value' object\n" "_setvalue(name,float): Set value of a 'value' object\n" + + "_list(args...): Make a list from args\n" + "_tuple(args...): Make a tuple from args\n" ; *************** *** 241,242 **** --- 248,272 ---- } #endif + + PyObject *pybase::py_list(PyObject *,PyObject *args) + { + // should always be a tuple + FLEXT_ASSERT(PyTuple_Check(args)); + + const int sz = PyTuple_GET_SIZE(args); + PyObject *ret = PyList_New(sz); + for(int i = 0; i < sz; ++i) { + PyObject *el = PyTuple_GET_ITEM(args,i); + Py_INCREF(el); + PyList_SET_ITEM(ret,i,el); + } + return ret; + } + + PyObject *pybase::py_tuple(PyObject *,PyObject *args) + { + // should always be a tuple + FLEXT_ASSERT(PyTuple_Check(args)); + Py_INCREF(args); + return args; + } Index: pybuffer.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybuffer.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pybuffer.cpp 19 Nov 2005 23:14:18 -0000 1.9 --- pybuffer.cpp 3 Aug 2006 16:33:37 -0000 1.10 *************** *** 14,18 **** ! #if defined(PY_NUMERIC) #define PY_ARRAYS 1 #elif defined(PY_NUMARRAY) --- 14,18 ---- ! #if defined(PY_NUMERIC) || defined(PY_NUMPY) #define PY_ARRAYS 1 #elif defined(PY_NUMARRAY)

1 0

externals/grill/py/build config-lnx.def, 1.4, 1.5 config-mac.def, 1.3, 1.4 config-win.def, 1.6, 1.7
by Thomas Grill 03 Aug '06

03 Aug '06

Update of /cvsroot/pure-data/externals/grill/py/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31148/build Modified Files: config-lnx.def config-mac.def config-win.def Log Message: added message bundle functionality (pyext.Bundle class) enable compiled-only scripts (without .py) small optimizations and fixes small changes for numpy support enable module packages (module/__init__.py[co]), now also for Max compiler flag to exclude DSP objects some ASSERTs for explicitly created pyext classes (should be runtime checks i guess) added pyext._list and pyext._tuple to convert input lists to Python sequence objects let _inlets and _outlets default to 0 Index: config-mac.def =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/build/config-mac.def,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config-mac.def 14 Mar 2005 04:58:09 -0000 1.3 --- config-mac.def 3 Aug 2006 16:33:37 -0000 1.4 *************** *** 1,3 **** ! # uncomment if numarray support should be compiled in ! # for info about numarray see http://numeric.scipy.org # PY_NUMARRAY=1 --- 1,5 ---- ! # uncomment if numpy/numarray/numeric support should be compiled in ! # for info see http://numeric.scipy.org ! PY_NUMPY=1 # PY_NUMARRAY=1 + # PY_NUMERIC=1 Index: config-lnx.def =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/build/config-lnx.def,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config-lnx.def 14 Mar 2005 04:58:09 -0000 1.4 --- config-lnx.def 3 Aug 2006 16:33:37 -0000 1.5 *************** *** 3,9 **** # which Python version do you want to compile against? ! PYTHONVERSION=2.3 ! # uncomment if numarray support should be compiled in ! # for info about numarray see http://numeric.scipy.org # PY_NUMARRAY=1 --- 3,11 ---- # which Python version do you want to compile against? ! PYTHONVERSION=2.4 ! # uncomment if numpy/numarray/numeric support should be compiled in ! # for info see http://numeric.scipy.org ! PY_NUMPY=1 # PY_NUMARRAY=1 + # PY_NUMERIC=1 Index: config-win.def =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/build/config-win.def,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config-win.def 20 Sep 2005 20:50:40 -0000 1.6 --- config-win.def 3 Aug 2006 16:33:37 -0000 1.7 *************** *** 5,9 **** PYTHONPATH=%programfiles%/python$(PYTHONVER) ! # uncomment if numarray support should be compiled in ! # for info about numarray see http://numeric.scipy.org # PY_NUMARRAY=1 --- 5,11 ---- PYTHONPATH=%programfiles%/python$(PYTHONVER) ! # uncomment if numpy/numarray/numeric support should be compiled in ! # for info see http://numeric.scipy.org ! PY_NUMPY=1 # PY_NUMARRAY=1 + # PY_NUMERIC=1

1 0

← Newer
1
...
39
40
41
42
43
44
45
46
47
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 August 2006