Pd-cvs September 2005

pd-cvs@lists.iem.at

10 participants
189 discussions

pd/src desire.tk,1.1.2.38,1.1.2.39
by Mathieu Bouchard 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26926 Modified Files: Tag: devel_0_39 desire.tk Log Message: canvas item creation and update now goes to a proc called "item". Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.38 retrieving revision 1.1.2.39 diff -C2 -d -r1.1.2.38 -r1.1.2.39 *** desire.tk 10 Sep 2005 10:21:11 -0000 1.1.2.38 --- desire.tk 10 Sep 2005 18:18:27 -0000 1.1.2.39 *************** *** 1192,1217 **** set xyd [list [expr $x1+4] [expr $y1+4] [expr $x2+4] [expr $y2+4]] #shadow_draw $self $canvas $xya ! if {[llength [$canvas gettags ${self}BASE]] != 0} { ! $canvas coords ${self}BASE $xya ! $canvas coords ${self}BASE2 $xyb ! $canvas coords ${self}BASE3 $xyc ! } { ! $canvas create rectangle $xya -tag ${self}BASE -fill ${look(objectbg)} ! $canvas create line $xyb -tag ${self}BASE2 -fill ${look(objectframe3)} ! $canvas create line $xyc -tag ${self}BASE3 -fill ${look(objectframe3)} ! } io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs #set @clickeditevent objectbox_clickedit #set @clickevent objectbox_click if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} - - #if {[expr $@isnew == 0]} { - #if {[expr $@isselected == 1]} {set frcol $look(objectframe4)} \ - #{set frcol $look(objectframe3)} - #} {set frcol $look(objectframe3)} - $canvas itemconfigure ${self}BASE -outline $frcol - #$canvas itemconfigure ${self}BASE -outline $look(objectframe3) - if {$@isnew} { $canvas itemconfigure ${self}BASE -dash {8 8 8 8} --- 1192,1203 ---- set xyd [list [expr $x1+4] [expr $y1+4] [expr $x2+4] [expr $y2+4]] #shadow_draw $self $canvas $xya ! item $self $canvas BASE rectangle $xya -fill $look(objectbg) ! item $self $canvas BASE2 line $xyb -fill $look(objectframe2) ! item $self $canvas BASE3 line $xyc -fill $look(objectframe3) io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs #set @clickeditevent objectbox_clickedit #set @clickevent objectbox_click if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} $canvas itemconfigure ${self}BASE -outline $frcol if {$@isnew} { $canvas itemconfigure ${self}BASE -dash {8 8 8 8} *************** *** 1237,1241 **** def objectbox erase {canvas} { puts "objectbox_erase:: $self $canvas" ! $canvas delete ${self}BASE ${self}BASE2 ${self}BASE3 io_erase $self $canvas } --- 1223,1227 ---- def objectbox erase {canvas} { puts "objectbox_erase:: $self $canvas" ! $canvas delete ${self} io_erase $self $canvas } *************** *** 1263,1267 **** set points [list [expr $onset+$fx] [expr $y1-$fy] \ [expr $onset-$fx+$look(iowidth)] [expr $y1-$fy+$look(extrapix)]] ! if {[llength [$canvas gettags ${self}i$i]] != 0} { $canvas coords ${self}i$i $points } { --- 1249,1254 ---- set points [list [expr $onset+$fx] [expr $y1-$fy] \ [expr $onset-$fx+$look(iowidth)] [expr $y1-$fy+$look(extrapix)]] ! # will update this code when proc item deals with mult.tags ! if {[llength [$canvas gettags ${self}i$i]] != 0} { $canvas coords ${self}i$i $points } { *************** *** 1274,1277 **** --- 1261,1265 ---- set points [list [expr $onset+$fx] [expr $y2-1+$fy] \ [expr $onset-$fx+$look(iowidth)] [expr $y2+$fy]] + # will update this code when proc item deals with mult.tags if {[llength [$canvas gettags ${self}o$i]] != 0} { $canvas coords ${self}o$i $points *************** *** 1491,1497 **** set canvas_id [canvastosym $canvas] foreach obj $_($canvas_id:selection) { ! $canvas delete ${obj}BASE ${obj}BASE2 ${obj}BASE3 ! $canvas delete ${obj}i ${obj}o ! $canvas delete ${obj}TEXT ${obj}text destroy ${canvas}.${obj}text } --- 1479,1486 ---- set canvas_id [canvastosym $canvas] foreach obj $_($canvas_id:selection) { ! objectbox_delete $obj $canvas ! #$canvas delete ${obj}BASE ${obj}BASE2 ${obj}BASE3 ! #$canvas delete ${obj}i ${obj}o ! #$canvas delete ${obj}TEXT ${obj}text destroy ${canvas}.${obj}text } *************** *** 1503,1508 **** set _($canvas_id:obj_in_edit) 0 set _($canvas_id:selection) 0 - #$canvas delete ${self}BASE ${self}BASE2 ${self}BASE3 - #$canvas delete ${self}i ${self}o #$canvas delete ${self}TEXT ${self}text #destroy ${canvas}.${self}text --- 1492,1495 ---- *************** *** 2330,2342 **** if {$arrowsize < 5} {set arrow none} {set arrow last} set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]] ! ! if {[llength [$canvas gettags $self]] != 0} { ! $canvas coords $self $xys ! $canvas itemconfigure -arrow $arrow -arrowshape $arrowshape ! } { ! $canvas create line $xys -tags $self -width $thick \ ! -arrow $arrow -arrowshape $arrowshape -fill $look(wirefg) ! # -smooth yes ! } } --- 2317,2323 ---- if {$arrowsize < 5} {set arrow none} {set arrow last} set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]] ! item $self $canvas "" line $xys -width $thick \ ! -arrow $arrow -arrowshape $arrowshape -fill $look(wirefg) ! # -smooth yes } *************** *** 2491,2494 **** --- 2472,2476 ---- } { eval [concat [list $canvas itemconfigure ${self}$suffix] $args] + eval [concat [list $canvas coords ${self}$suffix] $coords] } } *************** *** 2498,2507 **** set light [darker ${look(objectbg)}] set dark [darker $light] ! if {[llength [$canvas gettags ${self}SHAD]] != 0} { ! $canvas coords ${self}SHAD $coords ! } { ! $canvas create rectangle $coords -tag ${self}SHAD \ ! -fill $dark -outline $light -width 2 ! } $canvas move ${self}SHAD 4 4 } --- 2480,2485 ---- set light [darker ${look(objectbg)}] set dark [darker $light] ! item $self $canvas SHAD rectangle $coords \ ! -fill $dark -outline $light -width 2 $canvas move ${self}SHAD 4 4 } *************** *** 2515,2523 **** [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2] #shadow_draw $self $canvas $points ! if {[llength [$canvas gettags ${self}BASE]] != 0} { ! $canvas coords ${self}BASE $points ! } { ! $canvas create polygon $points -tag ${self}BASE -fill $look(objectbg) -outline $look(objectframe3) ! } io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} --- 2493,2497 ---- [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2] #shadow_draw $self $canvas $points ! item $self $canvas BASE polygon $points -fill $look(objectbg) -outline $look(objectframe3) io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} *************** *** 2550,2558 **** return } ! if {[llength [$canvas gettags ${self}BASE]] != 0} { ! $canvas coords ${self}BASE $points ! } { ! $canvas create polygon $points -tag ${self}BASE -fill $look(objectbg) -outline $look(objectframe3) ! } io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} --- 2524,2528 ---- return } ! item $self $canvas BASE polygon $points -tag -fill $look(objectbg) -outline $look(objectframe3) io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} *************** *** 2583,2601 **** set points2 [list $x1 $y1 [expr $x1+$ys/2] [expr $y1+$ys/2] $x1 $y2] puts "numbox_draw $self $canvas" ! if {$isnew} { ! $canvas create polygon $points -tag ${self}BASE ! $canvas create polygon $points2 -tag ${self}BASE4 ! $canvas create text $xt $yt -anchor w -tags ${self}NUMBER ! set @clicking 0 ! } { ! $canvas coords ${self}BASE $points ! $canvas coords ${self}BASE4 $points2 ! $canvas coords ${self}NUMBER $xt $yt ! } set grabbed [expr ![string compare $self [canvas_grabber $canvas]]] if {$grabbed} {set color4 #00ff00} {set color4 $look(objectbg)} - $canvas itemconfigure ${self}BASE -fill [parse_color $@bcol] -outline $look(objectframe3) - $canvas itemconfigure ${self}BASE4 -fill $color4 -outline $look(objectframe3) - $canvas itemconfigure ${self}NUMBER -text [numbox_ftoa $self] -font [list $font $@fs bold] -fill [parse_color $@fcol] $canvas delete ${self}CURS if {[string length $@buf]>0} { --- 2553,2562 ---- set points2 [list $x1 $y1 [expr $x1+$ys/2] [expr $y1+$ys/2] $x1 $y2] puts "numbox_draw $self $canvas" ! if {$isnew} {set @clicking 0} ! item $self $canvas BASE polygon $points -fill [parse_color $@bcol] -outline $look(objectframe3) ! item $self $canvas BASE4 polygon $points2 -fill $color4 -outline $look(objectframe3) ! item $self $canvas NUMBER text $xt $yt -anchor w -text [numbox_ftoa $self] -font [list $font $@fs bold] -fill [parse_color $@fcol] set grabbed [expr ![string compare $self [canvas_grabber $canvas]]] if {$grabbed} {set color4 #00ff00} {set color4 $look(objectbg)} $canvas delete ${self}CURS if {[string length $@buf]>0} { *************** *** 2729,2744 **** set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] set xyc [list [expr $x2-1] [expr $y1+1] [expr $x2-1] [expr $y2-1] [expr $x1+1] [expr $y2-1]] - set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] #puts "bluebox: [parse_color $@bcol] [parse_color $@fcol] [parse_color $@lcol]" set color [bluify [parse_color $@bcol]] ! if {$isnew} { ! $canvas create rectangle $xya -tag ${self}BASE -fill $color ! $canvas create line $xyb -tag ${self}BASE2 -fill #ffffff ! $canvas create line $xyc -tag ${self}BASE3 -fill [darker $color] ! } { ! $canvas coords ${self}BASE $xya; $canvas itemconfigure ${self}BASE -fill $color ! $canvas coords ${self}BASE2 $xyb; $canvas itemconfigure ${self}BASE2 -fill #ffffff ! $canvas coords ${self}BASE3 $xyc; $canvas itemconfigure ${self}BASE3 -fill [darker $color] ! } io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} --- 2690,2698 ---- set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] set xyc [list [expr $x2-1] [expr $y1+1] [expr $x2-1] [expr $y2-1] [expr $x1+1] [expr $y2-1]] #puts "bluebox: [parse_color $@bcol] [parse_color $@fcol] [parse_color $@lcol]" set color [bluify [parse_color $@bcol]] ! item $self $canvas BASE rectangle $xya -fill $color ! item $self $canvas BASE2 line $xyb -fill #ffffff ! item $self $canvas BASE3 line $xyc -fill [darker $color] io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} *************** *** 2761,2765 **** def radio draw {canvas} { - set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] set orient [radio_orient $self] foreach {x1 y1} [object_xy $self $canvas] {} --- 2715,2718 ---- *************** *** 2775,2788 **** set size [expr $size/$n] for {set i 0} {$i<$n} {incr i} { ! if {$isnew} { ! $canvas create rectangle \ ! [expr $x1+3] [expr $y1+3] \ ! [expr $x1+$size-3] [expr $y1+$size-3] \ ! -fill #ffffff -outline #000000 -tags "${self}BUT ${self}BUT$i" ! } else { ! $canvas coords ${self}BUT$i \ ! [expr $x1+3] [expr $y1+3] \ ! [expr $x1+$size-3] [expr $y1+$size-3] ! } if {$orient} {set y1 [expr $y1+$size]} {set x1 [expr $x1+$size]} } --- 2728,2736 ---- set size [expr $size/$n] for {set i 0} {$i<$n} {incr i} { ! #fixme: item doesn't support multiple tags yet ! item $self $canvas "BUT$i BUT" rectangle \ ! [expr $x1+3] [expr $y1+3] \ ! [expr $x1+$size-3] [expr $y1+$size-3] \ ! -fill #ffffff -outline #000000 if {$orient} {set y1 [expr $y1+$size]} {set x1 [expr $x1+$size]} } *************** *** 2825,2829 **** def slider draw {canvas} { - set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] global look foreach {x1 y1} [object_xy $self $canvas] {} --- 2773,2776 ---- *************** *** 2838,2846 **** bluebox_draw $self $canvas $x1 $y1 $xs $ys $ins $outs if {![info exists @clicking]} {set @clicking 0} ! if {$isnew} { ! set color [bluify #ffffff] ! $canvas create rectangle $x1 $y1 $x1 $y1 -tags ${self}KNOB \ -outline #000000 -fill [darker $color] - } label_draw $self $canvas set @clickevent slider_click --- 2785,2791 ---- bluebox_draw $self $canvas $x1 $y1 $xs $ys $ins $outs if {![info exists @clicking]} {set @clicking 0} ! set color [bluify #ffffff] ! item $self $canvas KNOB rectangle $x1 $y1 $x1 $y1 \ -outline #000000 -fill [darker $color] label_draw $self $canvas set @clickevent slider_click *************** *** 2926,2930 **** def label draw {canvas} { - set isnew [expr [llength [$canvas gettags ${self}LABEL]] == 0] foreach {x1 y1} [object_xy $self $canvas] {} set lx [expr $x1+$@ldx] --- 2871,2874 ---- *************** *** 2935,2946 **** $@fs bold] set lcolor [parse_color $@lcol] ! if {$isnew} { ! $canvas create text $lx $ly -text $label -anchor w \ ! -font $lfont -fill $lcolor -tags ${self}LABEL ! } { ! $canvas coords ${self}LABEL $lx $ly ! $canvas itemconfigure ${self}LABEL -text $label -anchor w \ ! -font $lfont -fill $lcolor ! } } --- 2879,2884 ---- $@fs bold] set lcolor [parse_color $@lcol] ! item $self $canvas LABEL text $lx $ly -text $label -anchor w \ ! -font $lfont -fill $lcolor } *************** *** 2975,2979 **** #-----------------------------------------------------------------------------------# def bang draw {canvas} { - set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] foreach {x1 y1} [object_xy $self $canvas] {} set xs $@w --- 2913,2916 ---- *************** *** 2986,2997 **** bluebox_draw $self $canvas $x1 $y1 $xs $ys $ins $outs io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs ! if {$isnew} { ! $canvas create oval \ ! [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2] \ ! -fill [bluify $colour] -tags ${self}BUT ! } { ! $canvas coords ${self}BUT \ ! [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2] ! } label_draw $self $canvas set @clickevent bang_click --- 2923,2929 ---- bluebox_draw $self $canvas $x1 $y1 $xs $ys $ins $outs io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs ! item $self $canvas BUT oval \ ! [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2] \ ! -fill [bluify $colour] -tags ${self}BUT label_draw $self $canvas set @clickevent bang_click *************** *** 3021,3025 **** set ins [expr [string compare $@rcv empty]==0] set outs [expr [string compare $@snd empty]==0] - set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] set colour [parse_color $@bcol] bluebox_draw $self $canvas $x1 $y1 $xs $ys $ins $outs --- 2953,2956 ---- *************** *** 3033,3043 **** set x4 [expr $x2-$w-2] set y4 [expr $y2-$w-2] - if {$isnew} { - $canvas create line $x3 $y3 [expr $x4+1] [expr $y4+1] -width $w -fill $fill -tags ${self}X1 - $canvas create line $x3 $y4 [expr $x4+1] [expr $y3-1] -width $w -fill $fill -tags ${self}X2 - } { - $canvas coords ${self}X1 $x3 $y3 [expr $x4+1] [expr $y4+1] - $canvas coords ${self}X2 $x3 $y4 [expr $x4+1] [expr $y3-1] - } label_draw $self $canvas if {$@on} { --- 2964,2967 ---- *************** *** 3046,3052 **** set fill [bluify [parse_color $@bcol]] } ! $canvas itemconfigure ${self}X1 -fill $fill ! $canvas itemconfigure ${self}X2 -fill $fill ! set @clickevent toggle_click } --- 2970,2975 ---- set fill [bluify [parse_color $@bcol]] } ! item $self $canvas X1 line $x3 $y3 [expr $x4+1] [expr $y4+1] -width $w -fill $fill ! item $self $canvas X2 line $x3 $y4 [expr $x4+1] [expr $y3-1] -width $w -fill $fill set @clickevent toggle_click } *************** *** 3075,3079 **** def vu draw {canvas} { - set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] foreach {x1 y1} [object_xy $self $canvas] {} set xs $@w --- 2998,3001 ---- *************** *** 3084,3088 **** set outs 2 #[expr [string compare $@snd empty]==0] - set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] set colour [parse_color $@bcol] # bluebox_draw $self $canvas $x1 $y1 $xs $ys $ins $outs --- 3006,3009 ---- *************** *** 3098,3114 **** for {set i 1} {$i<=40} {incr i} { set y [expr $y1 + ($led_size+1)*(41-$i) - ($led_size+1)/2] ! $canvas create rectangle $x3 $y $x4 [expr $y+$led_size] \ ! -fill [parse_color [lindex $vu_col $i]] -tags ${self}RMS -width 0 ! } ! ! if {$isnew} { ! $canvas create rectangle $x3 $y1 $x4 $y1 -tags ${self}MASK \ ! -width 0 -fill [bluify $colour] ! } { ! $canvas coords ${self}MASK $x3 $y1 $x4 $y1 } if {!$@scale} {return} - $canvas delete ${self}SCALE set lfont [list \ --- 3019,3028 ---- for {set i 1} {$i<=40} {incr i} { set y [expr $y1 + ($led_size+1)*(41-$i) - ($led_size+1)/2] ! item $self $canvas RMS rectangle $x3 $y $x4 [expr $y+$led_size] \ ! -fill [parse_color [lindex $vu_col $i]] -width 0 } + item $self $canvas MASK rectangle $x3 $y1 $x4 $y1 -width 0 -fill [bluify $colour] if {!$@scale} {return} $canvas delete ${self}SCALE set lfont [list \ *************** *** 3123,3128 **** set k4 [expr $y1-$k3] set yyy [expr $k4 + $k1*($k2-4*$i)] ! $canvas create text [expr $x2+4] [expr $yyy+$k3-3] -text $level -anchor w \ ! -font $lfont -fill $lcolor -tags ${self}SCALE incr i } --- 3037,3042 ---- set k4 [expr $y1-$k3] set yyy [expr $k4 + $k1*($k2-4*$i)] ! item $self $canvas SCALE text [expr $x2+4] [expr $yyy+$k3-3] -text $level -anchor w \ ! -font $lfont -fill $lcolor incr i } *************** *** 3193,3202 **** set ys $@h set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] ! if {$isnew} { ! $canvas create rectangle $x1 $y1 [expr $x1+$xs] [expr $y1+$ys] \ ! -tags ${self}BASE -fill [parse_color $@bcol] ! } { ! $canvas coords ${self}BASE $x1 $y1 [expr $x1+$xs] [expr $y1+$ys] ! } label_draw $self $canvas } --- 3107,3112 ---- set ys $@h set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] ! item $self $canvas BASE rectangle $x1 $y1 [expr $x1+$xs] [expr $y1+$ys] \ ! -fill [parse_color $@bcol] label_draw $self $canvas }

1 0

[PD-cvs] externals/tb/sndfiler makefile, NONE, 1.1 sndfiler-help.pd, NONE, 1.1 sndfiler.c, NONE, 1.1
by Tim Blechmann 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/externals/tb/sndfiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27313 Added Files: makefile sndfiler-help.pd sndfiler.c Log Message: libsndfile base soundfiler. - supports only read command - no resize / nframe flags --- NEW FILE: sndfiler.c --- /* * * soundfiler based on libsndfile * Copyright (C) 2005 Tim Blechmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ #include "stdlib.h" #include "m_pd.h" #include "g_canvas.h" #include "m_fifo.h" #include "pthread.h" /* for helper thread */ #include "sched.h" /* for thread priority */ #include "alloca.h" #include "sndfile.h" #if (_POSIX_MEMLOCK - 0) >= 200112L #include <sys/mman.h> #endif /* _POSIX_MEMLOCK */ static t_class *sndfiler_class; typedef struct _sndfiler { t_object x_obj; t_canvas *x_canvas; } t_sndfiler; typedef struct _sfprocess { void* padding; void (* process) (t_sndfiler *, int, t_atom *); /* callback function */ t_sndfiler * x; /* soundfiler */ int argc; t_atom * argv; } t_sfprocess; /* this is the queue for all soundfiler objects */ typedef struct _sfqueue { t_fifo* x_jobs; pthread_mutex_t mutex; pthread_cond_t cond; } t_sfqueue; typedef struct _syncdata { t_garray** arrays; t_float** helper_arrays; int argc; t_int frames; } t_syncdata; static t_sfqueue sndfiler_queue; static pthread_t sf_thread_id; /* id of soundfiler thread */ static t_sndfiler *sndfiler_new(void) { t_sndfiler *x = (t_sndfiler *)pd_new(sndfiler_class); x->x_canvas = canvas_getcurrent(); outlet_new(&x->x_obj, &s_float); return (x); } /* global soundfiler thread ... sleeping until signaled */ static void sndfiler_thread(void) { while (1) { t_sfprocess * me; pthread_cond_wait(&sndfiler_queue.cond, &sndfiler_queue.mutex); while (me = (t_sfprocess *)fifo_get(sndfiler_queue.x_jobs)) { (me->process)(me->x, me->argc, me->argv); /* freeing the argument vector */ freebytes(me->argv, sizeof(t_atom) * me->argc); freebytes(me, sizeof(t_sfprocess)); } } } static void sndfiler_start_thread(void) { pthread_attr_t sf_attr; struct sched_param sf_param; int status; //initialize queue sndfiler_queue.x_jobs = fifo_init(); pthread_mutex_init (&sndfiler_queue.mutex,NULL); pthread_cond_init (&sndfiler_queue.cond,NULL); // initialize thread pthread_attr_init(&sf_attr); sf_param.sched_priority=sched_get_priority_min(SCHED_OTHER); pthread_attr_setschedparam(&sf_attr,&sf_param); #ifdef UNIX if (sys_hipriority == 1/* && getuid() == 0 */) { sf_param.sched_priority=sched_get_priority_min(SCHED_RR); pthread_attr_setschedpolicy(&sf_attr,SCHED_RR); } #endif /* UNIX */ //start thread status = pthread_create(&sf_thread_id, &sf_attr, (void *) sndfiler_thread,NULL); if (status != 0) error("Couldn't create sndfiler thread: %d",status); else post("global sndfiler thread launched, priority: %d", sf_param.sched_priority); } static void sndfiler_read_cb(t_sndfiler * x, int argc, t_atom* argv); /* syntax: * read soundfile array0..n * if the soundfile has less channels than arrays are given, these arrays are * set to zero * if there are too little arrays given, only the first n channels will be used * */ static void sndfiler_read(t_sndfiler * x, t_symbol *s, int argc, t_atom* argv) { t_sfprocess * process = getbytes(sizeof(t_sfprocess)); process->process = &sndfiler_read_cb; process->x = x; process->argc = argc; process->argv = (t_atom*) copybytes(argv, sizeof(t_atom) * argc); fifo_put(sndfiler_queue.x_jobs, process); pthread_cond_signal(&sndfiler_queue.cond); } static t_int sndfiler_synchonize(t_int * w); static void sndfiler_read_cb(t_sndfiler * x, int argc, t_atom* argv) { int resize = 0; int frames = -1; int i, j; int counter=0; int channel_count; t_float** helper_arrays; t_symbol* file; t_garray ** arrays; SNDFILE* sndfile; SF_INFO info; if (argc < 2) { pd_error(x, "Invalid arguments"); return; } file = atom_getsymbolarg(0, argc, argv); channel_count = argc - 1; helper_arrays = getbytes(channel_count * sizeof(t_float*)); arrays = getbytes(channel_count * sizeof(t_garray*)); for (i = 0; i != channel_count; ++i) { t_garray * array = (t_garray *)pd_findbyclass(atom_getsymbolarg(i+1, argc, argv), garray_class); if (array) arrays[i] = array; else { pd_error(x, "%s: no such array", atom_getsymbolarg(i+1, argc, argv)->s_name); return; } } sndfile = sf_open(file->s_name, SFM_READ, &info); if (sndfile) { int minchannels = (channel_count < info.channels) ? channel_count : info.channels; int maxchannels = (channel_count < info.channels) ? channel_count : info.channels; t_float * item = alloca(maxchannels * sizeof(t_float)); t_int ** syncdata = getbytes(sizeof(t_int*) * 5); #if (_POSIX_MEMLOCK - 0) >= 200112L munlockall(); #endif for (i = 0; i != channel_count; ++i) { helper_arrays[i] = getalignedbytes(info.frames * sizeof(t_float)); } for (i = 0; i != info.frames; ++i) { sf_read_float(sndfile, item, 1); for (j = 0; j != channel_count; ++j) { if (j < minchannels) helper_arrays[j][i] = item[j]; else helper_arrays[j][i] = 0; } } #if (_POSIX_MEMLOCK - 0) >= 200112L mlockall(MCL_FUTURE); #endif sf_close(sndfile); syncdata[0] = (t_int*)arrays; syncdata[1] = (t_int*)helper_arrays; syncdata[2] = (t_int*)channel_count; syncdata[3] = (t_int*)(long)info.frames; syncdata[4] = (t_int*)x; sys_callback(sndfiler_synchonize, (t_int*)syncdata, 5); } else { pd_error(x, "Error opening file"); } } static t_int sndfiler_synchonize(t_int * w) { int i; t_garray** arrays = (t_garray**) w[0]; t_float** helper_arrays = (t_float**) w[1]; t_int channel_count = (t_int)w[2]; t_int frames = (t_int)w[3]; t_sndfiler* x = (t_sndfiler*)w[4]; for (i = 0; i != channel_count; ++i) { t_garray * garray = arrays[i]; t_array * array = garray->x_scalar->sc_vec[0].w_array; t_glist * gl = garray->x_glist;; freealignedbytes(array->a_vec, array->a_n); array->a_vec = (char*)helper_arrays[i]; array->a_n = frames; if (gl->gl_list == &garray->x_gobj && !garray->x_gobj.g_next) { vmess(&gl->gl_pd, gensym("bounds"), "ffff", 0., gl->gl_y1, (double)(frames > 1 ? frames-1 : 1), gl->gl_y2); /* close any dialogs that might have the wrong info now... */ gfxstub_deleteforkey(gl); } else garray_redraw(garray); } free(arrays); free(helper_arrays); canvas_update_dsp(); outlet_float(x->x_obj.ob_outlet, frames); return 0; } void sndfiler_setup(void) { sndfiler_class = class_new(gensym("sndfiler"), (t_newmethod)sndfiler_new, 0, sizeof(t_sndfiler), 0, 0); class_addmethod(sndfiler_class, (t_method)sndfiler_read, gensym("read"), A_GIMME, 0); sndfiler_start_thread(); } --- NEW FILE: sndfiler-help.pd --- #N canvas 0 0 450 300 10; #X obj 36 103 sndfiler; #X obj 294 87 table array; #X msg 37 60 read \$1 array; #X obj 38 33 openpanel; #X obj 124 15 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X connect 2 0 0 0; #X connect 3 0 2 0; #X connect 4 0 3 0; --- NEW FILE: makefile --- NAME=sndfiler CSYM=sndfiler current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\bin\pd.lib .c.dll: cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB) # ----------------------- IRIX 5.x ----------------------- pd_irix5: $(NAME).pd_irix5 .SUFFIXES: .pd_irix5 SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 SGIINCLUDE = -I../../src .c.pd_irix5: $(CC) $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o rm $*.o # ----------------------- IRIX 6.x ----------------------- pd_irix6: $(NAME).pd_irix6 .SUFFIXES: .pd_irix6 SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ -Ofast=ip32 .c.pd_irix6: $(CC) $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o rm $*.o # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O3 -fPIC -funroll-loops -fomit-frame-pointer \ -Wall -W -Wshadow -Wstrict-prototypes -Werror \ -Wno-unused -Wno-parentheses -Wno-switch LINUXINCLUDE = -I/home/tim/pd/devel_0_39/src LSTRIP = strip --strip-unneeded -R .note -R .comment .c.pd_linux: cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c cc -Wl,-export_dynamic --shared -o $*.pd_linux $*.o -lm -lsndfile # $(LSTRIP) $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.pd_darwin: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations

1 0

externals/tb/sndfiler - New directory
by Tim Blechmann 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/externals/tb/sndfiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27196/sndfiler Log Message: Directory /cvsroot/pure-data/externals/tb/sndfiler added to the repository

1 0

pd/src desire.tk,1.1.2.37,1.1.2.38
by Mathieu Bouchard 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7072 Modified Files: Tag: devel_0_39 desire.tk Log Message: cleanup Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.37 retrieving revision 1.1.2.38 diff -C2 -d -r1.1.2.37 -r1.1.2.38 *** desire.tk 10 Sep 2005 09:50:14 -0000 1.1.2.37 --- desire.tk 10 Sep 2005 10:21:11 -0000 1.1.2.38 *************** *** 516,520 **** set _($object_id:name_len) [string length $obj_name] set _($canvas_id:obj_in_edit) 0 ! set _($object_id:class) textobj puts "obj x: [lindex $line 2] y: [lindex $line 3]" --- 516,520 ---- set _($object_id:name_len) [string length $obj_name] set _($canvas_id:obj_in_edit) 0 ! set _($object_id:class) objectbox puts "obj x: [lindex $line 2] y: [lindex $line 3]" *************** *** 784,788 **** set canvasmenu(put) { ! {Object {textobj_new} "Ctrl+1"} {Message {pd "%W msg 0 ;"} "Ctrl+2"} {Number {pd "%W floatatom 0 ;"} "Ctrl+3"} --- 784,788 ---- set canvasmenu(put) { ! {Object {objectbox_new} "Ctrl+1"} {Message {pd "%W msg 0 ;"} "Ctrl+2"} {Number {pd "%W floatatom 0 ;"} "Ctrl+3"} *************** *** 1175,1183 **** } - def brokenbox draw {canvas} { - puts "brokenbox_draw:: $self $canvas" - $canvas itemconfigure ${self}BASE -width 1 -dash {8 8 8 8} - } - def objectbox draw {canvas} { set xs 42; catch {set xs $@xs} --- 1175,1178 ---- *************** *** 1218,1221 **** --- 1213,1222 ---- $canvas itemconfigure ${self}BASE -outline $frcol #$canvas itemconfigure ${self}BASE -outline $look(objectframe3) + + if {$@isnew} { + $canvas itemconfigure ${self}BASE -dash {8 8 8 8} + } { + $canvas itemconfigure ${self}BASE -dash {} + } } *************** *** 1323,1332 **** set @sx sx set @sy sy ! if {[expr $@isnew == 1]} { ! brokenbox_draw $self $canvas ! } { ! objectbox_draw $self $canvas ! } ! text ${canvas}.${self}text -height 1 -width $name_len -relief flat \ -bg ${look(objectbg)} -borderwidth 0 \ --- 1324,1328 ---- set @sx sx set @sy sy ! objectbox_draw $self $canvas text ${canvas}.${self}text -height 1 -width $name_len -relief flat \ -bg ${look(objectbg)} -borderwidth 0 \ *************** *** 1370,1383 **** set _($self:sx) [expr ($font(width) * ($name_len+1) + $font(padx))] set _($self:sy) [expr $font(height) + $font(pady)] ! if {[expr $_($self:isnew) == 1]} { ! brokenbox_draw $self $canvas ! } { ! objectbox_draw $self $canvas ! } } #-----------------------------------------------------------------------------------# #proc object_new {} { ! class_new textobj { global offset _ set canvas $_(focus) --- 1366,1375 ---- set _($self:sx) [expr ($font(width) * ($name_len+1) + $font(padx))] set _($self:sy) [expr $font(height) + $font(pady)] ! objectbox_draw $self $canvas } #-----------------------------------------------------------------------------------# #proc object_new {} { ! class_new objectbox { global offset _ set canvas $_(focus) *************** *** 1385,1393 **** if {$_($self:mode) == "edit"} { ! set offset [expr $offset + 1] ! set object_id [format %x [expr 0x81168b0 - $offset]] ! set _($object_id:class) textobj ! puts "new object id -> $object_id" ! object_add $object_id $canvas } } --- 1377,1386 ---- if {$_($self:mode) == "edit"} { ! set offset [expr $offset + 1] ! set object_id [format %x [expr 0x81168b0 - $offset]] ! set _($object_id:class) objectbox ! set _($object_id:_class) objectbox ! puts "new object id -> $object_id" ! object_add $object_id $canvas } } *************** *** 1422,1426 **** set @sx [expr $font(width) + $font(padx)] set @sy [expr $font(height) + $font(pady)] ! brokenbox_draw $self $canvas text_create $self $canvas $font(size) "" } --- 1415,1419 ---- set @sx [expr $font(width) + $font(padx)] set @sy [expr $font(height) + $font(pady)] ! objectbox_draw $self $canvas text_create $self $canvas $font(size) "" } *************** *** 1444,1451 **** objectbox_erase $self $canvas ! objectbox_draw $self $canvas \ ! [expr ($@name_len*$font(width)) + $font(padx)] \ ! [expr $font(height) + $font(pady)] 1 3 ! #wire_update $wire_id $_($wire_id) #wire_draw2 $wire_id $canvas --- 1437,1443 ---- objectbox_erase $self $canvas ! set @sx [expr ($@name_len*$font(width)) + $font(padx)] ! set @sy [expr $font(height) + $font(pady)] ! objectbox_draw $self $canvas #wire_update $wire_id $_($wire_id) #wire_draw2 $wire_id $canvas *************** *** 1477,1486 **** } } ! #pdtk_text_new \ ! #$canvas ${self}TEXT 41.000000 42.000000 $obj_name $font(size) #000000 ! pdtk_text_new \ ! $canvas ${self}TEXT [expr $@cx+2] [expr $@cy+2] \ ! $obj_name $font(size) #000000 ! #puts "destroy check = [winfo exists ${canvas}.${self}text]" } --- 1469,1474 ---- } } ! pdtk_text_new $canvas ${self}TEXT [expr $@cx+2] [expr $@cy+2] \ ! $obj_name $font(size) #000000 } *************** *** 1574,1579 **** puts "**** class==> $_($obj:class) *****" switch $_($obj:class) { ! textobj { ! puts "move textobj" set $_($obj:sx) [expr ($_($obj:name_len)*$font(width)) + $font(padx)] set $_($obj:sy) [expr $font(height) + $font(pady)] --- 1562,1567 ---- puts "**** class==> $_($obj:class) *****" switch $_($obj:class) { ! objectbox { ! puts "move objectbox" set $_($obj:sx) [expr ($_($obj:name_len)*$font(width)) + $font(padx)] set $_($obj:sy) [expr $font(height) + $font(pady)] *************** *** 1860,1864 **** #} ! #textobj { # may need to call canvas_select_object here to work out # the shift+click selection --- 1848,1852 ---- #} ! #objectbox { # may need to call canvas_select_object here to work out # the shift+click selection *************** *** 2139,2143 **** switch $_($_($self:selection):class) { ! textobj { if {$_($self:obj_in_edit) == 0} { set _($self:obj_in_edit) 1 --- 2127,2131 ---- switch $_($_($self:selection):class) { ! objectbox { if {$_($self:obj_in_edit) == 0} { set _($self:obj_in_edit) 1 *************** *** 2322,2329 **** #-----------------------------------------------------------------------------------# - - # modes: - # 0: creation - # 1: resize (or move) def wire draw {canvas thick x1 y1 x2 y2} { puts "wire_draw:: $self $canvas $thick $x1 $y1 $x2 $y2" --- 2310,2313 ---- *************** *** 2357,2361 **** } - #-----------------------------------------------------------------------------------# def wire draw2 {canvas} { puts "wire_draw2:: $self $canvas" --- 2341,2344 ---- *************** *** 2368,2372 **** wire_draw $self $canvas 1 $x1 $y1 $x2 $y2 } ! #-----------------------------------------------------------------------------------# def wire select {canvas flag} { puts "wire_select:: $self $canvas $flag" --- 2351,2355 ---- wire_draw $self $canvas 1 $x1 $y1 $x2 $y2 } ! def wire select {canvas flag} { puts "wire_select:: $self $canvas $flag" *************** *** 2375,2379 **** $canvas itemconfigure $self -fill $colour } ! #-----------------------------------------------------------------------------------# def wire erase {canvas} { puts "wire_erase:: $self $canvas" --- 2358,2362 ---- $canvas itemconfigure $self -fill $colour } ! def wire erase {canvas} { puts "wire_erase:: $self $canvas" *************** *** 2381,2385 **** $canvas delete $self } ! #-----------------------------------------------------------------------------------# def wire update {d} { puts "wire_update:: $self $d" --- 2364,2368 ---- $canvas delete $self } ! def wire update {d} { puts "wire_update:: $self $d" *************** *** 2387,2391 **** [lrange $d 0 3] {} } ! #-----------------------------------------------------------------------------------# #def wire status {d} { # puts "wire_update:: $self $d" --- 2370,2374 ---- [lrange $d 0 3] {} } ! #def wire status {d} { # puts "wire_update:: $self $d" *************** *** 2393,2398 **** # [lrange $d 0 3] {} #} - #-----------------------------------------------------------------------------------# ############ colouring --- 2376,2381 ---- # [lrange $d 0 3] {} #} + #-----------------------------------------------------------------------------------# ############ colouring *************** *** 2479,2482 **** --- 2462,2466 ---- set class objectbox catch {set class [lindex $classinfo($_($self:class)) 1]} + set _($self:_class) $class eval [linsert $args 0 ${class}_$sel $self] } *************** *** 2502,2511 **** ############ rendering ! # for future use ! proc update_item {self canvas suffix type coords args} { if {![llength [$canvas gettags ${self}${suffix}]]} { ! $canvas create $type $coords -tags ${self}$suffix $args... } { ! $canvas itemconfigure ${self}$suffix $args... } } --- 2486,2494 ---- ############ rendering ! proc item {self canvas suffix type coords args} { if {![llength [$canvas gettags ${self}${suffix}]]} { ! eval [concat [list $canvas create $type $coords -tags ${self}$suffix] $args] } { ! eval [concat [list $canvas itemconfigure ${self}$suffix] $args] } } *************** *** 2524,2529 **** } - def brokenbox erase {canvas} {objectbox_erase $self $canvas} - def message draw {canvas xs ys ins outs} { global look --- 2507,2510 ----

1 0

pd/src desire.tk,1.1.2.36,1.1.2.37
by Mathieu Bouchard 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3036 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixing menu stuff Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.36 retrieving revision 1.1.2.37 diff -C2 -d -r1.1.2.36 -r1.1.2.37 *** desire.tk 10 Sep 2005 08:26:46 -0000 1.1.2.36 --- desire.tk 10 Sep 2005 09:50:14 -0000 1.1.2.37 *************** *** 25,30 **** } ! rename unknown _original_unknown ! proc unknown {args} { global _ if {[catch { --- 25,30 ---- } ! #rename unknown _original_unknown ! proc unknownBLEH {args} { global _ if {[catch { *************** *** 195,207 **** menu .mbar.find -tearoff $pd_tearoff; .mbar add cascade -label "Find" -menu .mbar.find menu .mbar.windows -postcommand pdtk_fixwindowmenu -tearoff $pd_tearoff ! menu .mbar.audio -tearoff $pd_tearoff ! if {$pd_nt != 2} { ! .mbar add cascade -label "Windows" -menu .mbar.windows ! .mbar add cascade -label "Media" -menu .mbar.audio ! } else { ! # 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 --- 195,202 ---- menu .mbar.find -tearoff $pd_tearoff; .mbar add cascade -label "Find" -menu .mbar.find menu .mbar.windows -postcommand pdtk_fixwindowmenu -tearoff $pd_tearoff ! menu .mbar.media -tearoff $pd_tearoff ! # Mac HIG want "Window Help" as the last menus ! .mbar add cascade -label "Media" -menu .mbar.media ! .mbar add cascade -label "Window" -menu .mbar.windows menu .mbar.help -tearoff $pd_tearoff .mbar add cascade -label "Help" -menu .mbar.help *************** *** 220,223 **** --- 215,226 ---- } + proc pdtk_pd_startup {version apilist midiapilist fontname} { + global pd_myversion pd_apilist pd_midiapilist + set pd_myversion $version + set pd_apilist $apilist + set pd_midiapilist $midiapilist + menu_addstd .mbar + } + foreach z {in out} { set f .controls.$z *************** *** 671,678 **** {"Open" {menu_open} "Ctrl+o"} {} ! {"Class List" {foo class_browser} ""} ! {".pdrc Editor" {foo pdrc_editor_new} ""} ! {"Message" {foo menu_send} "Ctrl+m"} ! {"Path..." {foo "pd start-path-dialog ;"} ""} {} {"Quit" {menu_quit} "Ctrl+q"} --- 674,681 ---- {"Open" {menu_open} "Ctrl+o"} {} ! {"Class List" {class_browser} ""} ! {".pdrc Editor" {pdrc_editor_new} ""} ! {"Message" {menu_send} "Ctrl+m"} ! {"Path..." {pd "pd start-path-dialog ;"} ""} {} {"Quit" {menu_quit} "Ctrl+q"} *************** *** 748,833 **** } - proc menu_addstd {mbar} { - puts "menu_addstd::: $mbar" - - global pd_apilist - populate_menu $mbar.audio {} { - {"audio ON" {menu_audio 1} "Ctrl+/"} - {"audio OFF" {menu_audio 0} "Ctrl+."} - } - for {set x 0} {$x<[llength $pd_apilist]} {incr x} { - $mbar.audio add radiobutton -label [lindex [lindex $pd_apilist $x] 0] \ - -command {menu_audio 0} -variable pd_whichapi \ - -value [lindex [lindex $pd_apilist $x] 1] - #-command {pd "pd audio-setapi $pd_whichapi ;"} - } - populate_menu $mbar.audio {} { - {"Audio settings..." {foo pd "pd audio-properties"} ""} - {"MIDI settings..." {foo pd "pd midi-properties"} ""} - {"Test Audio and MIDI" {foo pd "menu_doc_open doc/7.stuff/tools testtone.pd"} ""} - {"Load Meter" {foo pd "menu_doc_open doc/7.stuff/tools load-meter.pd"} ""} - } - populate_menu $mbar.help {} { - {"About Pd" {foo pd "menu_about"} ""} - {"Pure Documentation..." {foo pd "menu_documentation"} ""} - } - - } - #-----------------------------------------------------------------------------------# set canvasmenu(file) { {New {menu_new} "Ctrl+n"} ! {Open {foo menu_open} "Ctrl+o"} {} ! {Message {foo menu_send} "Ctrl+m"} ! {Path... {foo pd "pd start-path-dialog"} {}} {} ! {Close {foo menu_close} "Ctrl+w"} {Save {menu_save} "Ctrl+s"} {"Save as..." {menu_saveas} "Ctrl+S"} {Print {menu_print} "Ctrl+p"} {} ! {Quit {foo menu_quit} "Ctrl+q"} } set canvasmenu(edit) { ! {Undo {foo menu_undo} "Ctrl+z"} ! {Redo {foo menu_redo} "Ctrl+Z"} {} ! {Cut {foo pd "%W cut"} "Ctrl+x"} ! {Copy {foo pd "%W copy"} "Ctrl+c"} ! {Paste {foo pd "%W paste"} "Ctrl+v"} ! {Duplicate {foo pd "%W duplicate"} "Ctrl+d"} ! {"Select all" {foo pd "%W selectall"} "Ctrl+a"} {} ! {"Text Editor" {foo pd "%W texteditor"} "Ctrl+t"} ! {Font {foo pd "%W menufont"} {}} ! {"Tidy Up" {foo pd "%W tidy"} {}} {} } - #-----------------------------------------------------------------------------------# - # only "put object" worx for now, the error proof the rest set canvasmenu(put) { {Object {textobj_new} "Ctrl+1"} ! {Message {foo pd "%W msg 0"} "Ctrl+2"} ! {Number {foo pd "%W floatatom 0"} "Ctrl+3"} ! {Symbol {foo pd "%W symbolatom 0"} "Ctrl+4"} ! {Comment {foo pd "%W text 0"} "Ctrl+5"} {} {Bang {bang_new} "Alt+b"} ! {Toggle {foo "pd %W toggle 0"} "Alt+t"} ! {Number2 {foo "pd %W numbox 0"} "Alt+n"} ! {Vslider {foo "pd %W vslider 0"} "Alt+v"} ! {Hslider {foo "pd %W hslider 0"} "Alt+h"} ! {Vradio {foo "pd %W vradio 0"} "Alt+d"} ! {Hradio {foo "pd %W hradio 0"} "Alt+i"} ! {VU {foo "pd %W vumeter 0"} "Alt+u"} ! {dropper {foo "pd %W dropper 0"} "Alt+x"} ! {Canvas {foo "pd %W mycnv 0 ;"} "Alt+c"} {} ! {Graph {foo "pd %W graph ;"} {}} ! {Array {foo "pd %W menuarray ;"} {}} } #-----------------------------------------------------------------------------------# --- 751,848 ---- } #-----------------------------------------------------------------------------------# set canvasmenu(file) { {New {menu_new} "Ctrl+n"} ! {Open {menu_open} "Ctrl+o"} {} ! {Message {menu_send} "Ctrl+m"} ! {Path... {pd "pd start-path-dialog"} {}} {} ! {Close {menu_close} "Ctrl+w"} {Save {menu_save} "Ctrl+s"} {"Save as..." {menu_saveas} "Ctrl+S"} {Print {menu_print} "Ctrl+p"} {} ! {Quit {menu_quit} "Ctrl+q"} } set canvasmenu(edit) { ! {Undo {menu_undo} "Ctrl+z"} ! {Redo {menu_redo} "Ctrl+Z"} {} ! {Cut {pd "%W cut"} "Ctrl+x"} ! {Copy {pd "%W copy"} "Ctrl+c"} ! {Paste {pd "%W paste"} "Ctrl+v"} ! {Duplicate {pd "%W duplicate"} "Ctrl+d"} ! {"Select all" {pd "%W selectall"} "Ctrl+a"} {} ! {"Text Editor" {pd "%W texteditor"} "Ctrl+t"} ! {Font {pd "%W menufont"} {}} ! {"Tidy Up" {pd "%W tidy"} {}} {} } set canvasmenu(put) { {Object {textobj_new} "Ctrl+1"} ! {Message {pd "%W msg 0 ;"} "Ctrl+2"} ! {Number {pd "%W floatatom 0 ;"} "Ctrl+3"} ! {Symbol {pd "%W symbolatom 0 ;"} "Ctrl+4"} ! {Comment {pd "%W text 0 ;"} "Ctrl+5"} {} {Bang {bang_new} "Alt+b"} ! {Toggle {pd "%W toggle 0 ;"} "Alt+t"} ! {Number2 {pd "%W numbox 0 ;"} "Alt+n"} ! {Vslider {pd "%W vslider 0 ;"} "Alt+v"} ! {Hslider {pd "%W hslider 0 ;"} "Alt+h"} ! {Vradio {pd "%W vradio 0 ;"} "Alt+d"} ! {Hradio {pd "%W hradio 0 ;"} "Alt+i"} ! {VU {pd "%W vumeter 0 ;"} "Alt+u"} ! {dropper {pd "%W dropper 0 ;"} "Alt+x"} ! {Canvas {pd "%W mycnv 0 ;"} "Alt+c"} {} ! {Graph {pd "%W graph ;"} {}} ! {Array {pd "%W menuarray ;"} {}} ! } ! ! set canvasmenu(media) { ! {{audio ON} {menu_audio 1} "Ctrl+/"} ! {{audio OFF} {menu_audio 0} "Ctrl+."} ! {} ! } ! ! if {$pd_nt != 2} { ! lappend canvasmenu(media) {{Audio settings...} {pd pd audio-properties \;} {}} ! lappend canvasmenu(media) {{MIDI settings...} {pd pd midi-properties \;} {}} ! } ! ! lappend canvasmenu(media) {} \ ! {"Test Audio and MIDI" {pd "menu_doc_open doc/7.stuff/tools testtone.pd"} ""} \ ! {"Load Meter" {pd "menu_doc_open doc/7.stuff/tools load-meter.pd"} ""} ! ! proc menu_addstd {mbar} { ! global pd_apilist pd_midiapilist canvasmenu ! populate_menu $mbar.media {} $canvasmenu(media) ! set x 0 ! populate_menu $mbar.media {} {{}} ! foreach a $pd_apilist { ! $mbar.media add radiobutton -label [lindex $a 0] \ ! -command {menu_audio 0} -variable pd_whichapi -value [lindex $a 1] \ ! -command {pd "pd audio-setapi $pd_whichapi ;"} ! incr x ! } ! populate_menu $mbar.media {} {{}} ! foreach a $pd_midiapilist { ! $mbar.media add radiobutton -label [lindex $a 0] \ ! -command {menu_midi 0} -variable pd_whichmidiapi -value [lindex $a 1] \ ! -command {pd "pd midi-setapi $pd_whichmidiapi ;"} ! incr x ! } ! populate_menu $mbar.help {} { ! {"About Pd" {pd "menu_about"} ""} ! {"Pure Documentation..." {pd "menu_documentation"} ""} ! } ! } + #-----------------------------------------------------------------------------------# *************** *** 924,935 **** {} } ! menu $name.m.audio -tearoff $pd_tearoff ! if {$pd_nt != 2} { ! $name.m add cascade -label Windows -menu $name.m.windows ! $name.m add cascade -label Media -menu $name.m.audio ! } else { ! $name.m add cascade -label Media -menu $name.m.audio ! $name.m add cascade -label Window -menu $name.m.windows ! } menu $name.m.help -tearoff $pd_tearoff $name.m add cascade -label Help -menu $name.m.help --- 939,945 ---- {} } ! menu $name.m.media -tearoff $pd_tearoff ! $name.m add cascade -label Media -menu $name.m.media ! $name.m add cascade -label Window -menu $name.m.windows menu $name.m.help -tearoff $pd_tearoff $name.m add cascade -label Help -menu $name.m.help *************** *** 1140,1151 **** proc get_font_size {} { global font ! set font(width) \ ! [font measure [format -*-courier-medium--normal--%d-* $font(size)] W] ! set font(height) \ ! [font metrics [format -*-courier-medium--normal--%d-* $font(size)] -linespace] ! puts "font width: $font(width) | font height: $font(height)" } - get_font_size #-----------------------------------------------------------------------------------# def object xy {canvas} { --- 1150,1160 ---- proc get_font_size {} { global font ! set fontstr [format -*-courier-medium--normal--%d-* $font(size)] ! set font(width) [font measure $fontstr W] ! set font(height) [font metrics $fontstr -linespace] ! # puts "font width: $font(width) | font height: $font(height)" } get_font_size + #-----------------------------------------------------------------------------------# def object xy {canvas} { *************** *** 1154,1160 **** return [list $@cx $@cy] } { - #set @cx [$canvas canvasx 30] - #set @cy [$canvas canvasy 30] - #don't delete these two lines set @cx 40; catch {set @cx $_($canvas_id:current_x)} --- 1163,1166 ---- *************** *** 1362,1371 **** #puts "$self:state -> $@state" ! set sx [expr ($font(width) * ($name_len+1) + $font(padx))] ! set sy [expr $font(height) + $font(pady)] if {[expr $_($self:isnew) == 1]} { ! brokenbox_draw $self $canvas $sx $sy 0 0 } { ! objectbox_draw $self $canvas $sx $sy 1 3 } } --- 1368,1377 ---- #puts "$self:state -> $@state" ! set _($self:sx) [expr ($font(width) * ($name_len+1) + $font(padx))] ! set _($self:sy) [expr $font(height) + $font(pady)] if {[expr $_($self:isnew) == 1]} { ! brokenbox_draw $self $canvas } { ! objectbox_draw $self $canvas } } *************** *** 1414,1420 **** puts "self:selection: [lindex $_($canvas_id:selection) 0]" #puts "set $self:isnew -> $@isnew" ! ! brokenbox_draw $self $canvas [expr $font(width) + $font(padx)] \ ! [expr $font(height) + $font(pady)] 0 0 text_create $self $canvas $font(size) "" } --- 1420,1426 ---- puts "self:selection: [lindex $_($canvas_id:selection) 0]" #puts "set $self:isnew -> $@isnew" ! set @sx [expr $font(width) + $font(padx)] ! set @sy [expr $font(height) + $font(pady)] ! brokenbox_draw $self $canvas text_create $self $canvas $font(size) "" } *************** *** 1950,1955 **** proc pdtk_canvas_mouseup {canvas x y b} { - puts "pdtk_canvas_mouseup::: $canvas $x $y $b" - pdtk_canvas_mouseup2 $canvas $x $y $b statusbar_update [canvastosym $canvas] $x $y --- 1956,1959 ---- *************** *** 1958,1962 **** proc pdtk_canvas_mouseup2 {name x y b} { puts "pdtk_canvas_mouseup2::: $name $x $y $b" - global pdtk_canvas_mouseup wire_from wire_to _ font look offset_wire set canvas $name --- 1962,1965 ----

1 0

pd/src desire.tk,1.1.2.35,1.1.2.36
by Mathieu Bouchard 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22347 Modified Files: Tag: devel_0_39 desire.tk Log Message: whatever Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.35 retrieving revision 1.1.2.36 diff -C2 -d -r1.1.2.35 -r1.1.2.36 *** desire.tk 6 Sep 2005 11:37:52 -0000 1.1.2.35 --- desire.tk 10 Sep 2005 08:26:46 -0000 1.1.2.36 *************** *** 13,17 **** # (thanks for taking time looking at this code) #-----------------------------------------------------------------------------------# ! # This section is matju's object system proc class_new {name body} { --- 13,18 ---- # (thanks for taking time looking at this code) #-----------------------------------------------------------------------------------# ! # This section is matju's object system (the base class is called base because ! # there's already something else called class) proc class_new {name body} { *************** *** 24,27 **** --- 25,41 ---- } + rename unknown _original_unknown + proc unknown {args} { + global _ + if {[catch { + set name $_($self:_class)_$selector + set self [lindex $args 0] + set selector [lindex $args 1] + uplevel 1 [linsert [concat [list $self] [lrange $args 2 end] 0 $selector]] + }]} { + uplevel 1 [linsert $args 0 _original_unknown] + } + } + #some questions to matju --chun # *************** *** 162,179 **** for {set i 0} {$i < $argc} {incr i} { ! global cmdline set o [lindex $argv $i] switch -regexp -- $o { ! -console { ! incr i ! set cmdline(console) [lindex $argv $i] ! } ! -gdb {set cmdline(gdb) 1} ! -nogdb {set cmdline(gdb) 0} ! -* {puts "ERROR: command line argument: unknown $o"} ! default { ! incr i ! lappend files_to_open [lindex $argv $i] ! } } } --- 176,187 ---- for {set i 0} {$i < $argc} {incr i} { ! global cmdline files_to_open set o [lindex $argv $i] switch -regexp -- $o { ! ^-console\$ {incr i; set cmdline(console) [lindex $argv $i]} ! ^-gdb\$ {set cmdline(gdb) 1} ! ^-nogdb\$ {set cmdline(gdb) 0} ! ^- {puts "ERROR: command line argument: unknown $o"} ! default {lappend files_to_open [lindex $argv $i]} } } *************** *** 315,322 **** poll_sock global files_to_open foreach f $files_to_open { ! set ff [file split $f] set ffl [llength $ff] ! pd "pd open [lindex $ff [expr $ffl-1]] [file join [lrange $ff 0 [expr $ffl-2]]] ;" } } { --- 323,335 ---- poll_sock global files_to_open + post "files_to_open='$files_to_open'" foreach f $files_to_open { ! set ff [file split [file normalize $f]] set ffl [llength $ff] ! set file [lindex $ff [expr $ffl-1]] ! set dir [join [lrange $ff 0 [expr $ffl-2]] [file separator]] ! post "f='$f' ff='$ff' ffl='$ffl'" ! post "pd open $file $dir ;" ! pd "pd open $file $dir ;" } } { *************** *** 513,517 **** objectbox_draw $object_id $canvas.c \ [expr ($_($object_id:name_len)*$font(width)) + $font(padx)] \ ! [expr $font(height) + $font(pady)] 1 3 pdtk_text_new \ --- 526,530 ---- objectbox_draw $object_id $canvas.c \ [expr ($_($object_id:name_len)*$font(width)) + $font(padx)] \ ! [expr $font(height) + $font(pady)] pdtk_text_new \ *************** *** 632,658 **** #-----------------------------------------------------------------------------------# proc populate_menu {menu context list} { - #puts "__populate_menu::: $menu $context $list" - global accels foreach e $list { ! switch -- [llength $e] { ! 0 { ! $menu add separator ! } ! 3 { ! set cmd [lindex $e 1] ! set accel [accel_munge [lindex $e 2]] ! if {$accel != ""} {set accels([string tolower $accel]) $cmd} ! regsub -all %W $cmd $context cmd ! $menu add command -label [lindex $e 0] -command $cmd \ ! -accelerator $accel ! } ! 4 { ! set cmd [lindex $e 1] ! set accel [accel_munge [lindex $e 2]] ! if {$accel != ""} {set accels([string tolower $accel]) $cmd} ! regsub -all %W $cmd $context cmd ! $menu add checkbutton -label [lindex $e 0] -command $cmd \ ! -accelerator $accel -indicatoron ??? } } --- 645,661 ---- #-----------------------------------------------------------------------------------# proc populate_menu {menu context list} { global accels foreach e $list { ! if {[llength $e]==0} {$menu add separator} { ! set cmd [lindex $e 1] ! set accel [accel_munge [lindex $e 2]] ! regsub -all %W $cmd $context cmd ! if {$accel != ""} {set accels([string tolower $accel]) $cmd} ! if {[llength $e]==3} { ! $menu add command -label [lindex $e 0] -command $cmd \ ! -accelerator $accel ! } { # 4 ! $menu add checkbutton -label [lindex $e 0] -command $cmd \ ! -accelerator $accel -indicatoron ??? } } *************** *** 693,697 **** #-----------------------------------------------------------------------------------# set look(iowidth) 7 ! set look(iopos) 1 set look(objectfg) #000000 set look(objectbg) #ffffff --- 696,700 ---- #-----------------------------------------------------------------------------------# set look(iowidth) 7 ! set look(iopos) 0 set look(objectfg) #000000 set look(objectbg) #ffffff *************** *** 735,738 **** --- 738,751 ---- } #-----------------------------------------------------------------------------------# + + proc menu_close {name} {pd "$name menuclose 0 ;"} + proc menu_save {name} {pdtk_canvas_checkgeometry $name; pd "$name menusave ;"} + proc menu_saveas {name} {pdtk_canvas_checkgeometry $name; pd "$name menusaveas ;"} + proc menu_print {name} { + set filename [tk_getSaveFile -initialfile pd.ps -defaultextension .ps \ + -filetypes { {{postscript} {.ps}} }] + if {$filename != ""} {$name.c postscript -file $filename} + } + proc menu_addstd {mbar} { puts "menu_addstd::: $mbar" *************** *** 771,777 **** {} {Close {foo menu_close} "Ctrl+w"} ! {Save {foo menu_save} "Ctrl+s"} ! {"Save as..." {foo menu_saveas} "Ctrl+S"} ! {Print {foo menu_print} "Ctrl+p"} {} {Quit {foo menu_quit} "Ctrl+q"} --- 784,790 ---- {} {Close {foo menu_close} "Ctrl+w"} ! {Save {menu_save} "Ctrl+s"} ! {"Save as..." {menu_saveas} "Ctrl+S"} ! {Print {menu_print} "Ctrl+p"} {} {Quit {foo menu_quit} "Ctrl+q"} *************** *** 1081,1089 **** # for quit/save/undo ! #switch -- $key { ! # q {if {$shift} {menu_really_quit} else {menu_quit}; return} ! # s {if {$shift} {menu_saveas $topname} {menu_save $topname}; return} ! # z {if {$shift} {menu_redo $topname} else {menu_undo $topname}; return} ! #} global accels --- 1094,1102 ---- # for quit/save/undo ! switch -- $key { ! #q {if {$shift} {menu_really_quit} else {menu_quit}; return} ! s {if {$shift} {menu_saveas $topname} {menu_save $topname}; return} ! #z {if {$shift} {menu_redo $topname} else {menu_undo $topname}; return} ! } global accels *************** *** 1107,1110 **** --- 1120,1124 ---- } } + #-----------------------------------------------------------------------------------# proc pdtk_canvas_altkey {name key iso} { *************** *** 1122,1130 **** } } - #-----------------------------------------------------------------------------------# - - proc foo {args} { - puts " $args not there yet...." - } #-----------------------------------------------------------------------------------# --- 1136,1139 ---- *************** *** 1141,1145 **** #-----------------------------------------------------------------------------------# def object xy {canvas} { - puts "object_xy" set canvas_id [canvastosym $canvas] if {[info exists @cx]} { --- 1150,1153 ---- *************** *** 1150,1172 **** #don't delete these two lines ! set @cx $_($canvas_id:current_x) ! set @cy $_($canvas_id:current_y) ! ! #set @cx 40 ! #set @cy 40 ! return [list $@cx $@cy] } } ! #-----------------------------------------------------------------------------------# ! def brokenbox draw {canvas xs ys ins outs} { ! puts "brokenbox_draw:: $self $canvas $xs $ys $ins $outs" ! objectbox_draw $self $canvas $xs $ys $ins $outs ! $canvas itemconfigure ${self}BASE -outline blue -width 3 } ! #-----------------------------------------------------------------------------------# ! def objectbox draw {canvas xs ys ins outs} { ! puts "objectbox_draw ::: $self $canvas $xs $ys $ins $outs" global look --- 1158,1183 ---- #don't delete these two lines ! set @cx 40; catch {set @cx $_($canvas_id:current_x)} ! set @cy 40; catch {set @cy $_($canvas_id:current_y)} return [list $@cx $@cy] } } ! ! proc canvas_of {self} { ! global _ ! return $_($self:canvas) } ! def brokenbox draw {canvas} { ! puts "brokenbox_draw:: $self $canvas" ! $canvas itemconfigure ${self}BASE -width 1 -dash {8 8 8 8} ! } ! ! def objectbox draw {canvas} { ! set xs 42; catch {set xs $@xs} ! set ys 42; catch {set ys $@ys} ! set ins 2; catch {set ins $@nins} ! set outs 2; catch {set outs $@nouts} ! puts "objectbox_draw ::: $self $canvas" global look *************** *** 1304,1311 **** set sx [expr ($font(width) * ($name_len+1) + $font(padx))] set sy [expr $font(height) + $font(pady)] if {[expr $@isnew == 1]} { ! brokenbox_draw $self $canvas $sx $sy 0 0 } { ! objectbox_draw $self $canvas $sx $sy 1 3 } --- 1315,1324 ---- set sx [expr ($font(width) * ($name_len+1) + $font(padx))] set sy [expr $font(height) + $font(pady)] + set @sx sx + set @sy sy if {[expr $@isnew == 1]} { ! brokenbox_draw $self $canvas } { ! objectbox_draw $self $canvas } *************** *** 1553,1591 **** set _($obj:cx) [expr $_($obj:cx) + $cx-$old_x] set _($obj:cy) [expr $_($obj:cy) + $cy-$old_y] - puts "**** class==> $_($obj:class) *****" - switch $_($obj:class) { ! ! ! textobj { ! ! puts "move textobj" ! ! objectbox_draw $obj $canvas \ ! [expr ($_($obj:name_len)*$font(width)) + $font(padx)] \ ! [expr $font(height) + $font(pady)] 1 3 ! ! set text_pos [list [expr $_($obj:cx)+1] [expr $_($obj:cy)+1]] ! set text_pos2 [list [expr $_($obj:cx)+2] [expr $_($obj:cy)+2]] ! ! if {$_($self:obj_in_edit)} {$canvas coords ${obj}text $text_pos} ! $canvas coords ${obj}TEXT $text_pos2 ! ! ! } ! ! bang { ! ! puts "move bang" ! bang_draw $obj $canvas ! ! } ! ! } - - - #----handles the wire update---- #set _($self:inlets) $ins --- 1566,1586 ---- set _($obj:cx) [expr $_($obj:cx) + $cx-$old_x] set _($obj:cy) [expr $_($obj:cy) + $cy-$old_y] puts "**** class==> $_($obj:class) *****" switch $_($obj:class) { ! textobj { ! puts "move textobj" ! set $_($obj:sx) [expr ($_($obj:name_len)*$font(width)) + $font(padx)] ! set $_($obj:sy) [expr $font(height) + $font(pady)] ! objectbox_draw $obj $canvas ! set text_pos [list [expr $_($obj:cx)+1] [expr $_($obj:cy)+1]] ! set text_pos2 [list [expr $_($obj:cx)+2] [expr $_($obj:cy)+2]] ! if {$_($self:obj_in_edit)} {$canvas coords ${obj}text $text_pos} ! $canvas coords ${obj}TEXT $text_pos2 ! } ! bang { ! puts "move bang" ! bang_draw $obj $canvas ! } } #----handles the wire update---- #set _($self:inlets) $ins *************** *** 2463,2467 **** #set fields(msg) ! set classinfo(obj) {Object object} set classinfo(tgl) {Toggle toggle} set classinfo(bng) {Bang bang} --- 2458,2462 ---- #set fields(msg) ! set classinfo(obj) {Object objectbox} set classinfo(tgl) {Toggle toggle} set classinfo(bng) {Bang bang} *************** *** 2479,2483 **** proc call {sel self args} { global _ classinfo ! set class [lindex $classinfo($_($self:class)) 1] eval [linsert $args 0 ${class}_$sel $self] } --- 2474,2479 ---- proc call {sel self args} { global _ classinfo ! set class objectbox ! catch {set class [lindex $classinfo($_($self:class)) 1]} eval [linsert $args 0 ${class}_$sel $self] }

1 0

pd/src desire.c,1.1.2.7,1.1.2.8
by Mathieu Bouchard 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22149 Modified Files: Tag: devel_0_39 desire.c Log Message: removing more dead code Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** desire.c 10 Sep 2005 06:22:25 -0000 1.1.2.7 --- desire.c 10 Sep 2005 08:25:35 -0000 1.1.2.8 *************** *** 389,393 **** } ! static void message_click(t_message *x, t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { --- 389,393 ---- } ! /*static void message_click(t_message *x, t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { *************** *** 400,404 **** clock_delay(x->m_clock, 120); } ! } static void message_tick(t_message *x) --- 400,404 ---- clock_delay(x->m_clock, 120); } ! }*/ static void message_tick(t_message *x) *************** *** 669,702 **** } ! static void gatom_click(t_gatom *x, ! t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, ! t_floatarg alt) ! { ! if (x->a_text.te_width == 1) ! { ! if (x->a_atom.a_type == A_FLOAT) ! gatom_float(x, (x->a_atom.a_w.w_float == 0)); ! } ! else ! { ! if (alt) ! { ! if (x->a_atom.a_type != A_FLOAT) return; ! if (x->a_atom.a_w.w_float != 0) ! { ! x->a_toggle = x->a_atom.a_w.w_float; ! gatom_float(x, 0); ! return; ! } ! else gatom_float(x, x->a_toggle); ! } ! x->a_shift = shift; ! x->a_buf[0] = 0; ! glist_grab(x->a_glist, &x->a_text.te_g, gatom_motion, gatom_key, ! xpos, ypos); ! } ! } ! ! /* message back from dialog window */ static void gatom_param(t_gatom *x, t_symbol *sel, int argc, t_atom *argv) { --- 669,673 ---- } ! /* message back from dialog window */ static void gatom_param(t_gatom *x, t_symbol *sel, int argc, t_atom *argv) { *************** *** 897,934 **** } - static int text_click(t_gobj *z, struct _glist *glist, - int xpix, int ypix, int shift, int alt, int dbl, int doit) - { - t_text *x = (t_text *)z; - if (x->te_type == T_OBJECT) - { - t_symbol *clicksym = gensym("click"); - if (zgetfn(&x->te_pd, clicksym)) - { - if (doit) - pd_vmess(&x->te_pd, clicksym, "fffff", - (double)xpix, (double)ypix, - (double)shift, 0, (double)alt); - return (1); - } - else return (0); - } - else if (x->te_type == T_ATOM) - { - if (doit) - gatom_click((t_gatom *)x, (t_floatarg)xpix, (t_floatarg)ypix, - (t_floatarg)shift, 0, (t_floatarg)alt); - return (1); - } - else if (x->te_type == T_MESSAGE) - { - if (doit) - message_click((t_message *)x, (t_floatarg)xpix, (t_floatarg)ypix, - (t_floatarg)shift, 0, (t_floatarg)alt); - return (1); - } - else return (0); - } - void text_save(t_gobj *z, t_binbuf *b) { --- 868,871 ---- *************** *** 996,1000 **** text_delete, text_vis, ! text_click, }; --- 933,937 ---- text_delete, text_vis, ! 0, }; *************** *** 1007,1127 **** #endif - /* draw inlets and outlets for a text object or for a graph. */ void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, ! char *tag, int x1, int y1, int x2, int y2) ! { ! int n = obj_noutlets(ob), nplus = (n == 1 ? 1 : n-1), i; ! int width = x2 - x1; ! for (i = 0; i < n; i++) ! { ! int onset = x1 + (width - IOWIDTH) * i / nplus; ! if (firsttime) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %so%d\n", ! glist_getcanvas(glist), ! onset, y2 - 1, ! onset + IOWIDTH, y2, ! tag, i); ! else ! sys_vgui(".x%x.c coords %so%d %d %d %d %d\n", ! glist_getcanvas(glist), tag, i, ! onset, y2 - 1, ! onset + IOWIDTH, y2); ! } ! n = obj_ninlets(ob); ! nplus = (n == 1 ? 1 : n-1); ! for (i = 0; i < n; i++) ! { ! int onset = x1 + (width - IOWIDTH) * i / nplus; ! if (firsttime) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %si%d\n", ! glist_getcanvas(glist), ! onset, y1, ! onset + IOWIDTH, y1 + EXTRAPIX, ! tag, i); ! else ! sys_vgui(".x%x.c coords %si%d %d %d %d %d\n", ! glist_getcanvas(glist), tag, i, ! onset, y1, ! onset + IOWIDTH, y1 + EXTRAPIX); ! } ! } ! void text_drawborder(t_text *x, t_glist *glist, ! char *tag, int width2, int height2, int firsttime) ! { ! t_object *ob; ! int x1, y1, x2, y2, width, height; ! text_getrect(&x->te_g, glist, &x1, &y1, &x2, &y2); ! width = x2 - x1; ! height = y2 - y1; ! if (x->te_type == T_OBJECT) ! { ! if (firsttime) ! sys_vgui(".x%x.c create line\ ! %d %d %d %d %d %d %d %d %d %d -tags %sR\n", ! glist_getcanvas(glist), ! x1, y1, x2, y1, x2, y2, x1, y2, x1, y1, tag); ! else ! sys_vgui(".x%x.c coords %sR\ ! %d %d %d %d %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, ! x1, y1, x2, y1, x2, y2, x1, y2, x1, y1); ! } ! else if (x->te_type == T_MESSAGE) ! { ! if (firsttime) ! sys_vgui(".x%x.c create line\ ! %d %d %d %d %d %d %d %d %d %d %d %d %d %d -tags %sR\n", ! glist_getcanvas(glist), ! x1, y1, x2+4, y1, x2, y1+4, x2, y2-4, x2+4, y2, ! x1, y2, x1, y1, ! tag); ! else ! sys_vgui(".x%x.c coords %sR\ ! %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, ! x1, y1, x2+4, y1, x2, y1+4, x2, y2-4, x2+4, y2, ! x1, y2, x1, y1); ! } ! else if (x->te_type == T_ATOM) ! { ! if (firsttime) ! sys_vgui(".x%x.c create line\ ! %d %d %d %d %d %d %d %d %d %d %d %d -tags %sR\n", ! glist_getcanvas(glist), ! x1, y1, x2-4, y1, x2, y1+4, x2, y2, x1, y2, x1, y1, ! tag); ! else ! sys_vgui(".x%x.c coords %sR\ ! %d %d %d %d %d %d %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, ! x1, y1, x2-4, y1, x2, y1+4, x2, y2, x1, y2, x1, y1); ! } ! /* draw inlets/outlets */ ! ! if ((ob = pd_checkobject(&x->te_pd))) ! glist_drawiofor(glist, ob, firsttime, tag, x1, y1, x2, y2); ! } ! ! void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag) ! { ! int i, n; ! n = obj_noutlets(ob); ! for (i = 0; i < n; i++) ! sys_vgui(".x%x.c delete %so%d\n", ! glist_getcanvas(glist), tag, i); ! n = obj_ninlets(ob); ! for (i = 0; i < n; i++) ! sys_vgui(".x%x.c delete %si%d\n", ! glist_getcanvas(glist), tag, i); ! } ! ! void text_eraseborder(t_text *x, t_glist *glist, char *tag) ! { ! if (x->te_type == T_TEXT) return; ! sys_vgui(".x%x.c delete %sR\n", ! glist_getcanvas(glist), tag); ! glist_eraseiofor(glist, x, tag); ! } /* change text; if T_OBJECT, remake it. LATER we'll have an undo buffer --- 944,953 ---- #endif void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, ! char *tag, int x1, int y1, int x2, int y2) {} void text_drawborder(t_text *x, t_glist *glist, ! char *tag, int width2, int height2, int firsttime) {} ! void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag) {} ! void text_eraseborder(t_text *x, t_glist *glist, char *tag) {} /* change text; if T_OBJECT, remake it. LATER we'll have an undo buffer *************** *** 1181,1196 **** class_addlist(message_class, message_list); class_addanything(message_class, message_list); ! class_addmethod(message_class, (t_method)message_click, gensym("click"), ! A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(message_class, (t_method)message_set, gensym("set"), ! A_GIMME, 0); ! class_addmethod(message_class, (t_method)message_add, gensym("add"), ! A_GIMME, 0); ! class_addmethod(message_class, (t_method)message_add2, gensym("add2"), ! A_GIMME, 0); ! ! messresponder_class = class_new(gensym("messresponder"), 0, 0, ! sizeof(t_text), CLASS_PD, 0); class_addbang(messresponder_class, messresponder_bang); class_addfloat(messresponder_class, (t_method) messresponder_float); --- 1007,1015 ---- class_addlist(message_class, message_list); class_addanything(message_class, message_list); + class_addmethod(message_class, (t_method)message_set, gensym("set"), A_GIMME, 0); + class_addmethod(message_class, (t_method)message_add, gensym("add"), A_GIMME, 0); + class_addmethod(message_class, (t_method)message_add2, gensym("add2"), A_GIMME, 0); ! messresponder_class = class_new(gensym("messresponder"), 0, 0, sizeof(t_text), CLASS_PD, 0); class_addbang(messresponder_class, messresponder_bang); class_addfloat(messresponder_class, (t_method) messresponder_float); *************** *** 1204,1218 **** class_addfloat(gatom_class, gatom_float); class_addsymbol(gatom_class, gatom_symbol); ! class_addmethod(gatom_class, (t_method)gatom_set, gensym("set"), ! A_GIMME, 0); ! class_addmethod(gatom_class, (t_method)gatom_click, gensym("click"), ! A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(gatom_class, (t_method)gatom_param, gensym("param"), ! A_GIMME, 0); class_setpropertiesfn(gatom_class, gatom_properties); } ! static int iemgui_color_hex[]= ! { 0xfcfcfc, 0xa0a0a0, 0x404040, 0xfce0e0, 0xfce0c0, 0xfcfcc8, 0xd8fcd8, 0xd8fcfc, 0xdce4fc, 0xf8d8fc, --- 1023,1032 ---- class_addfloat(gatom_class, gatom_float); class_addsymbol(gatom_class, gatom_symbol); ! class_addmethod(gatom_class, (t_method)gatom_set, gensym("set"), A_GIMME, 0); ! class_addmethod(gatom_class, (t_method)gatom_param, gensym("param"), A_GIMME, 0); class_setpropertiesfn(gatom_class, gatom_properties); } ! static int iemgui_color_hex[]= { 0xfcfcfc, 0xa0a0a0, 0x404040, 0xfce0e0, 0xfce0c0, 0xfcfcc8, 0xd8fcd8, 0xd8fcfc, 0xdce4fc, 0xf8d8fc,

1 0

pd/src desire.c,1.1.2.6,1.1.2.7
by Mathieu Bouchard 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1833 Modified Files: Tag: devel_0_39 desire.c Log Message: deleting dead code from desire.c (widgetbehavior, etc) Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** desire.c 10 Sep 2005 05:59:56 -0000 1.1.2.6 --- desire.c 10 Sep 2005 06:22:25 -0000 1.1.2.7 *************** *** 121,138 **** static int iemgui_clip_size(int size); - static int iemgui_clip_font(int size); - static t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv); static void iemgui_size(t_iemgui *x); - - /* adds the aforementioned methods to a iemgui class (pd has no inheritance) */ static void iemgui_subclass (t_class *c); - - /* widgetbehaviour */ - static void iemgui_displace(t_gobj *z, t_glist *glist, int dx, int dy); - static void iemgui_select(t_gobj *z, t_glist *glist, int selected); - static void iemgui_delete(t_gobj *z, t_glist *glist); - static void iemgui_vis(t_gobj *z, t_glist *glist, int vis); - - /* miscellaneous */ void sys_mgui(t_gobj *self, const char *sel, const char *fmt, ...); t_iemgui *iemgui_new(t_class *qlass); --- 121,126 ---- *************** *** 196,200 **** t_text *x = (t_text *)pd_new(text_class); t_atom at; ! sys_vgui("global _; set _(%x:canvas) .%lx.c\n",(long)x,(long)gl); x->te_width = 0; /* don't know it yet. */ x->te_type = T_TEXT; --- 184,188 ---- t_text *x = (t_text *)pd_new(text_class); t_atom at; ! sys_vgui("global _; set _(%x:canvas) .x%lx.c\n",(long)x,(long)gl); x->te_width = 0; /* don't know it yet. */ x->te_type = T_TEXT; *************** *** 240,246 **** void canvas_getargs(int *argcp, t_atom **argvp); ! static void canvas_objtext(t_glist *gl, int xpix, int ypix, int selected, ! t_binbuf *b) ! { t_text *x=0; int argc; --- 228,232 ---- void canvas_getargs(int *argcp, t_atom **argvp); ! static void canvas_objtext(t_glist *gl, int xpix, int ypix, int selected, t_binbuf *b) { t_text *x=0; int argc; *************** *** 260,264 **** } if (!x) x = (t_text *)pd_new(text_class); ! sys_vgui("global _; set _(%x:canvas) .%lx.c\n",(long)x,(long)gl); x->te_binbuf = b; x->te_xpix = xpix; --- 246,250 ---- } if (!x) x = (t_text *)pd_new(text_class); ! sys_vgui("global _; set _(%x:canvas) .x%lx.c\n",(long)x,(long)gl); x->te_binbuf = b; x->te_xpix = xpix; *************** *** 277,286 **** /* object creation routine. These are called without any arguments if ! they're invoked from the ! gui; when pasting or restoring from a file, we get at least x and y. */ ! ! void canvas_obj(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! t_text *x; t_binbuf *b = binbuf_new(); if (argc >= 2) { --- 263,268 ---- /* object creation routine. These are called without any arguments if ! they're invoked from the gui; when pasting or restoring from a file, we get at least x and y. */ ! void canvas_obj(t_glist *gl, t_symbol *s, int argc, t_atom *argv) { t_binbuf *b = binbuf_new(); if (argc >= 2) { *************** *** 670,675 **** /* for numbers, only let reasonable characters through */ if ((x->a_atom.a_type == A_SYMBOL) || ! (c >= '0' && c <= '9' || c == '.' || c == '-' ! || c == 'e' || c == 'E')) { x->a_buf[len] = c; --- 652,656 ---- /* for numbers, only let reasonable characters through */ if ((x->a_atom.a_type == A_SYMBOL) || ! (c >= '0' && c <= '9') || c == '.' || c == '-' || c == 'e' || c == 'E') { x->a_buf[len] = c; *************** *** 770,834 **** } - /* ---------------- gatom-specific widget functions --------------- */ - static void gatom_getwherelabel(t_gatom *x, t_glist *glist, int *xp, int *yp) - { - int x1, y1, x2, y2, width, height; - text_getrect(&x->a_text.te_g, glist, &x1, &y1, &x2, &y2); - width = x2 - x1; - height = y2 - y1; - if (x->a_wherelabel == ATOM_LABELLEFT) - { - *xp = x1 - 3 - - strlen(canvas_realizedollar(x->a_glist, x->a_label)->s_name) * - sys_fontwidth(glist_getfont(glist)); - *yp = y1 + 2; - } - else if (x->a_wherelabel == ATOM_LABELRIGHT) - { - *xp = x2 + 2; - *yp = y1 + 2; - } - else if (x->a_wherelabel == ATOM_LABELUP) - { - *xp = x1 - 1; - *yp = y1 - 1 - sys_fontheight(glist_getfont(glist));; - } - else - { - *xp = x1 - 1; - *yp = y2 + 3; - } - } - - static void gatom_displace(t_gobj *z, t_glist *glist, - int dx, int dy) - { - t_gatom *x = (t_gatom*)z; - text_displace(z, glist, dx, dy); - sys_vgui(".x%x.c move %x.l %d %d\n", glist_getcanvas(glist), - x, dx, dy); - } - - static void gatom_vis(t_gobj *z, t_glist *glist, int vis) - { - t_gatom *x = (t_gatom*)z; - text_vis(z, glist, vis); - if (*x->a_label->s_name) - { - if (vis) - { - int x1, y1; - gatom_getwherelabel(x, glist, &x1, &y1); - sys_vgui("pdtk_text_new .x%x.c %x.l %f %f {%s} %d %s\n", - glist_getcanvas(glist), x, - (double)x1, (double)y1, - canvas_realizedollar(x->a_glist, x->a_label)->s_name, - sys_hostfontsize(glist_getfont(glist)), - "black"); - } - else sys_vgui(".x%x.c delete %x.l\n", glist_getcanvas(glist), x); - } - } - void canvas_atom(t_glist *gl, t_atomtype type, t_symbol *s, int argc, t_atom *argv) --- 751,754 ---- *************** *** 970,974 **** static void text_vis(t_gobj *z, t_glist *glist, int vis) { t_text *x = (t_text *)z; - t_rtext *y = glist_findrtext(glist, x); if (vis) { if (text_shouldvis(x, glist)) {if (vis) pd_changed(x); else sys_mgui(z,"erase","");} --- 890,893 ---- *************** *** 1181,1185 **** /* draw inlets/outlets */ ! if (ob = pd_checkobject(&x->te_pd)) glist_drawiofor(glist, ob, firsttime, tag, x1, y1, x2, y2); } --- 1100,1104 ---- /* draw inlets/outlets */ ! if ((ob = pd_checkobject(&x->te_pd))) glist_drawiofor(glist, ob, firsttime, tag, x1, y1, x2, y2); } *************** *** 1313,1330 **** int iemgui_clip_size(int size) {return MAX(8,size);} - int iemgui_clip_font(int size) {return MAX(4,size);} - - t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv) - { - if (IS_A_SYMBOL(argv, indx)) - return (atom_getsymbolarg(indx, 100000, argv)); - else if (IS_A_FLOAT(argv, indx)) - { - char str[80]; - sprintf(str, "%d", (int)atom_getintarg(indx, 100000, argv)); - return (gensym(str)); - } - else return (gensym("empty")); - } int convert_color2(int x) { --- 1232,1235 ---- *************** *** 1412,1446 **** } - void iemgui_displace(t_gobj *z, t_glist *glist, int dx, int dy) - { - t_iemgui *x = (t_iemgui *)z; - x->obj.te_xpix += dx; - x->obj.te_ypix += dy; - pd_changed(z); - canvas_fixlinesfor(glist_getcanvas(glist), (t_text *)z); - } - - void iemgui_select(t_gobj *z, t_glist *glist, int selected) - {sys_vgui("canvas_select_object .x%x %x %d; ",glist,z,selected); pd_changed(z);} - - void iemgui_delete(t_gobj *z, t_glist *glist) - {canvas_deletelinesfor(glist, (t_text *)z); /*why?*/} - - void iemgui_vis(t_gobj *z, t_glist *glist, int vis) { - if (vis) pd_changed(z); else sys_mgui(z,"erase",""); - } - - /*int iemgui_dialog(t_iemgui *x, t_symbol **srl, int argc, t_atom *argv) { - if(rcvable) { - if(srl[1]==x->rcv)) { - if(x->rcv_able) pd_unbind((t_pd *)x, x->rcv); - x->rcv = srl[1]; pd_bind((t_pd *)x, x->rcv); - } - } else if(!rcvable && x->rcv_able) { - pd_unbind((t_pd *)x, x->rcv); x->rcv = srl[1]; - } - x->snd = srl[0]; x->lab = srl[2]; return 0;} - */ - static int pd_scanargs(int argc, t_atom *argv, char *fmt, ...) { int i=0; --- 1317,1320 ---- *************** *** 1664,1677 **** } - static void iemgui_getrect(t_gobj *z, t_glist *glist, - int *xp1, int *yp1, int *xp2, int *yp2) - { - t_iemgui* x = (t_iemgui*)z; - *xp1 = text_xpix((t_text *)x,glist); - *yp1 = text_ypix((t_text *)x,glist); - *xp2 = *xp1+x->w; - *yp2 = *yp1+x->h; - } - static t_class *bng_class; --- 1538,1541 ---- *************** *** 1726,1733 **** } - static void bng_tick_hld(t_bng *x) {x->flashed = 0;} - static void bng_tick_brk(t_bng *x) {} - static void bng_tick_lck(t_bng *x) {x->locked = 0;} - static int bng_pickle(t_bng *x, t_foo *foo) { return pd_pickle(foo,"iiiiaaaiiiiccc", --- 1590,1593 ---- *************** *** 1889,1901 **** } - static void radio_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) - { - t_radio *x = (t_radio *)z; - *xp1 = text_xpix((t_text *)x, glist); - *yp1 = text_ypix((t_text *)x, glist); - *xp2 = *xp1 + x->w*(isvert(x)?1:x->number); - *yp2 = *yp1 + x->h*(isvert(x)?x->number:1); - } - static void radio_set(t_radio *x, t_floatarg f) { --- 1749,1752 ---- *************** *** 2076,2088 **** #define IEM_SL_MINSIZE 2 - static void slider_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) - { - t_slider* x = (t_slider*)z; - *xp1 = text_xpix((t_text *)x, glist) - (isvert(x)?0:3); - *yp1 = text_ypix((t_text *)x, glist) - (isvert(x)?2:0); - *xp2 = *xp1 + x->w + (isvert(x)?0:5); - *yp2 = *yp1 + x->h + (isvert(x)?5:0); - } - static void slider_check_width(t_slider *x, int w) { --- 1927,1930 ---- *************** *** 2234,2248 **** static t_class *nbclass; - /* widget helper functions */ - - static void nbtick_reset(t_nbx *x) - { - if(!x->change) return; - x->change = 0; CH - glist_grab(x->glist, 0, 0, 0, 0, 0); - pd_changed(x); - } - - static void nbtick_wait(t_nbx *x) {pd_changed(x);} void nbclip(t_nbx *x) {CLAMP(x->val,x->min,x->max);} --- 2076,2079 ---- *************** *** 2255,2268 **** } - static void nbgetrect(t_gobj *z, t_glist *glist, - int *xp1, int *yp1, int *xp2, int *yp2) - { - t_nbx* x = (t_nbx*)z; - *xp1 = text_xpix((t_text *)x, glist); - *yp1 = text_ypix((t_text *)x, glist); - *xp2 = *xp1 + x->numwidth; - *yp2 = *yp1 + x->h; - } - int nbcheck_minmax(t_nbx *x) { --- 2086,2089 ---- *************** *** 2288,2300 **** } - static void nbmotion(t_nbx *x, t_floatarg dx, t_floatarg dy) - { - double k2= x->finemoved ? 0.01 : 1.0; - if(x->is_log) x->val *= pow(x->k, -k2*dy); else x->val -= k2*dy; - nbclip(x); - pd_changed(x); - nbbang(x); - } - static void nbset(t_nbx *x, t_floatarg f) {x->val=f; nbclip(x); pd_changed(x);} --- 2109,2112 ---- *************** *** 2437,2450 **** {if(glist_isvisible(glist)) sys_mgui((t_gobj *)x,"set","ii",x->rms,x->peak);} - static void vu_getrect(t_gobj *z, t_glist *glist, - int *xp1, int *yp1, int *xp2, int *yp2) - { - t_vu* x = (t_vu*)z; - *xp1 = text_xpix((t_text *)x, glist) - 1; - *yp1 = text_ypix((t_text *)x, glist) - 2; - *xp2 = *xp1 + x->w + 2; - *yp2 = *yp1 + x->h + 4; - } - static void vu_check_height(t_vu *x, int h) { --- 2249,2252 ----

1 0

pd/src desire.c,1.1.2.5,1.1.2.6
by Mathieu Bouchard 10 Sep '05

10 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31483 Modified Files: Tag: devel_0_39 desire.c Log Message: t_widgetbehavior is obsolete Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** desire.c 8 Sep 2005 12:26:00 -0000 1.1.2.5 --- desire.c 10 Sep 2005 05:59:56 -0000 1.1.2.6 *************** *** 24,27 **** --- 24,165 ---- #include <string.h> + #define CLAMP(_var,_min,_max) { if (_var<_min) _var=_min; else if (_var>_max) _var=_max; } + #define MIN(a,b) ((a)<(b)?(a):(b)) + #define MAX(a,b) ((a)>(b)?(a):(b)) + #define IS_A_FLOAT(atom,index) ((atom+index)->a_type == A_FLOAT) + #define IS_A_SYMBOL(atom,index) ((atom+index)->a_type == A_SYMBOL) + EXTERN void canvas_savecontainerto(t_canvas *x, t_binbuf *b); + typedef void (*t_iemfunptr)(void *x, t_glist *glist, int mode); [...1302 lines suppressed...] ! { ! static t_widgetbehavior wb = { ! iemgui_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0 ! }; t_class *c = dropper_class = class_new(gensym("dropper"), (t_newmethod)dropper_new, (t_method)iemgui_free, sizeof(t_dropper), 0, A_GIMME, 0); --- 2665,2669 ---- } ! static void g_dropper_setup(void) { t_class *c = dropper_class = class_new(gensym("dropper"), (t_newmethod)dropper_new, (t_method)iemgui_free, sizeof(t_dropper), 0, A_GIMME, 0); *************** *** 2885,2889 **** class_addsymbol(c, dropper_symbol); class_addmethod(c, (t_method)dropper_reload, gensym("reload"), A_GIMME, 0); - class_setwidget(c, &wb); class_setsavefn(c, (t_savefn)dropper_savefn); class_sethelpsymbol(c, gensym("dropper")); --- 2672,2675 ----

1 0

pd/src m_conf.c,1.1.1.3.12.2,1.1.1.3.12.3
by Mathieu Bouchard 08 Sep '05

08 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6884 Modified Files: Tag: devel_0_39 m_conf.c Log Message: fixing a problem with msvc on tgrill's request Index: m_conf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_conf.c,v retrieving revision 1.1.1.3.12.2 retrieving revision 1.1.1.3.12.3 diff -C2 -d -r1.1.1.3.12.2 -r1.1.1.3.12.3 *** m_conf.c 8 Sep 2005 07:54:36 -0000 1.1.1.3.12.2 --- m_conf.c 8 Sep 2005 20:46:29 -0000 1.1.1.3.12.3 *************** *** 8,34 **** #include "m_pd.h" ! #define S(name) void name##_setup(void); name##_setup(); ! void conf_init(void) ! { ! S(g_array) S(g_canvas) S(g_guiconnect) #ifdef DESIRE S(desire) #else S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) ! S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) ! S(g_text) #endif ! S(g_io) ! S(g_scalar) ! S(g_template) ! S(g_traversal) ! S(m_pd) ! S(x_acoustics) S(x_interface) S(x_connective) ! S(x_time) S(x_arithmetic) S(x_midi) ! S(x_misc) S(x_net) S(x_qlist) S(x_gui) S(x_list) ! S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) S(d_delay) S(d_fft) S(d_filter) S(d_global) S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen) - } --- 8,43 ---- #include "m_pd.h" ! /* tgrill told me that msvc doesn't like decls interspersed ! with statements within a func. d'oh. ! */ ! #define S(name) void name##_setup(void); #ifdef DESIRE S(desire) #else S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) ! S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text) #endif ! S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template) ! S(g_traversal) S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) ! S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) ! S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) S(d_delay) S(d_fft) S(d_filter) S(d_global) S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen) + #undef S + #define S(name) name##_setup(); + void conf_init(void) { + #ifdef DESIRE + S(desire) + #else + S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) + S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text) + #endif + S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template) + S(g_traversal) S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) + S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) + S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) + S(d_delay) S(d_fft) S(d_filter) S(d_global) + S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen) + }

1 0

← Newer
1
...
11
12
13
14
15
16
17
18
19
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 September 2005