Pd-cvs January 2009

pd-cvs@lists.iem.at

23 participants
357 discussions

SF.net SVN: pure-data:[10538] branches/pd-devel/0.41.4/src/pd_menus.tcl
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10538 http://pure-data.svn.sourceforge.net/pure-data/?rev=10538&view=rev Author: eighthave Date: 2009-01-13 18:14:05 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - renamed procs to make more sense: "create" procs actually create 'menu' widgets "build" procs build up a 'menu' widget to be a menu - reordered so program flows from top to bottom Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd_menus.tcl Modified: branches/pd-devel/0.41.4/src/pd_menus.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 18:11:48 UTC (rev 10537) +++ branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 18:14:05 UTC (rev 10538) @@ -38,16 +38,18 @@ option add *tearOff 0 } +# ------------------------------------------------------------------------------ +# proc ::pd_menus::create_menubar {mymenubar} { menu $mymenubar set menulist "file edit put find media window help" - if { [tk windowingsystem] eq "aqua" } {make_apple_menu $mymenubar} - if { [tk windowingsystem] eq "win32" } {make_system_menu $mymenubar} + if { [tk windowingsystem] eq "aqua" } {create_apple_menu $mymenubar} + if { [tk windowingsystem] eq "win32" } {create_system_menu $mymenubar} foreach mymenu $menulist { menu $mymenubar.$mymenu $mymenubar add cascade -label [string totitle $mymenu] \ -menu $mymenubar.$mymenu - [format create_%s_menu $mymenu] $mymenubar.$mymenu PLACEHOLDER + [format build_%s_menu $mymenu] $mymenubar.$mymenu PLACEHOLDER if {[tk windowingsystem] eq "win32"} { # fix menu font size on Windows with tk scaling = 1 $mymenubar.$mymenu configure -font menufont @@ -72,9 +74,12 @@ } } +# ------------------------------------------------------------------------------ +# menu building functions for Mac OS X/aqua + # for Mac OS X only -proc ::pd_menus::make_apple_menu {mymenu} { - puts stderr CREATE_APPLE_MENU +proc ::pd_menus::create_apple_menu {mymenu} { + puts stderr BUILD_APPLE_MENU # TODO this should open a Pd patch called about.pd menu $mymenu.apple $mymenu.apple add command -label [say "About Pd"] \ @@ -88,17 +93,7 @@ } } -# for Windows only -proc ::pd_menus::make_system_menu {mymenu} { - $mymenu add cascade -menu [menu $mymenu.system] - # TODO add Close, Minimize, etc and whatever else is on the little menu - # that is on the top left corner of the window frame -} - -# ------------------------------------------------------------------------------ -# menu building functions for Mac OS X/aqua - -proc ::pd_menus::create_file_menu_aqua {mymenu} { +proc ::pd_menus::build_file_menu_aqua {mymenu} { variable accelerator $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" @@ -117,10 +112,10 @@ # the "Edit", "Put", and "Find" menus do not have cross-platform differences -proc ::pd_menus::create_media_menu_aqua {mymenu} { +proc ::pd_menus::build_media_menu_aqua {mymenu} { } -proc ::pd_menus::create_window_menu_aqua {mymenu} { +proc ::pd_menus::build_window_menu_aqua {mymenu} { } # the "Help" does not have cross-platform differences @@ -128,7 +123,7 @@ # ------------------------------------------------------------------------------ # menu building functions for UNIX/X11 -proc ::pd_menus::create_file_menu_x11 {mymenu} { +proc ::pd_menus::build_file_menu_x11 {mymenu} { variable accelerator $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" @@ -147,10 +142,10 @@ # the "Edit", "Put", and "Find" menus do not have cross-platform differences -proc ::pd_menus::create_media_menu_x11 {mymenu} { +proc ::pd_menus::build_media_menu_x11 {mymenu} { } -proc ::pd_menus::create_window_menu_x11 {mymenu} { +proc ::pd_menus::build_window_menu_x11 {mymenu} { } # the "Help" does not have cross-platform differences @@ -158,7 +153,14 @@ # ------------------------------------------------------------------------------ # menu building functions for Windows/Win32 -proc ::pd_menus::create_file_menu_win32 {mymenu} { +# for Windows only +proc ::pd_menus::create_system_menu {mymenu} { + $mymenu add cascade -menu [menu $mymenu.system] + # TODO add Close, Minimize, etc and whatever else is on the little menu + # that is on the top left corner of the window frame +} + +proc ::pd_menus::build_file_menu_win32 {mymenu} { variable accelerator $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" @@ -177,10 +179,10 @@ # the "Edit", "Put", and "Find" menus do not have cross-platform differences -proc ::pd_menus::create_media_menu_win32 {mymenu} { +proc ::pd_menus::build_media_menu_win32 {mymenu} { } -proc ::pd_menus::create_window_menu_win32 {mymenu} { +proc ::pd_menus::build_window_menu_win32 {mymenu} { } # the "Help" does not have cross-platform differences @@ -188,8 +190,8 @@ # ------------------------------------------------------------------------------ # menu building functions -proc ::pd_menus::create_file_menu {mymenu mytoplevel} { - [format create_file_menu_%s [tk windowingsystem]] $mymenu +proc ::pd_menus::build_file_menu {mymenu mytoplevel} { + [format build_file_menu_%s [tk windowingsystem]] $mymenu $mymenu entryconfigure [say "new_file"] -command "menu_new" $mymenu entryconfigure [say "Open"] -command "menu_open" $mymenu entryconfigure [say "Save"] -command "pdsend \"$mytoplevel menusave ;\"" @@ -200,7 +202,7 @@ $mymenu entryconfigure [say "Print..."] -command "menu_print $mytoplevel" } -proc ::pd_menus::create_edit_menu {mymenu mytoplevel} { +proc ::pd_menus::build_edit_menu {mymenu mytoplevel} { variable accelerator $mymenu add command -label [say "Undo"] -accelerator "$accelerator+Z" \ -command "menu_undo $mytoplevel" @@ -250,7 +252,7 @@ } } -proc ::pd_menus::create_put_menu {mymenu mytoplevel} { +proc ::pd_menus::build_put_menu {mymenu mytoplevel} { variable accelerator $mymenu add command -label [say "Object"] -accelerator "$accelerator+1" \ -command "pdsend \"$mytoplevel obj 0;\"" @@ -286,7 +288,7 @@ $mymenu add command -label Array -command "pdsend \"$mytoplevel menuarray ;\"" } -proc ::pd_menus::create_find_menu {mymenu mytoplevel} { +proc ::pd_menus::build_find_menu {mymenu mytoplevel} { variable accelerator $mymenu add command -label [say "Find..."] -accelerator "$accelerator+F" \ -command "menu_findobject $mytoplevel" @@ -296,7 +298,7 @@ -command "pdsend \"$mytoplevel finderror ;\"" } -proc ::pd_menus::create_media_menu {mymenu mytoplevel} { +proc ::pd_menus::build_media_menu {mymenu mytoplevel} { variable accelerator $mymenu add radiobutton -label [say "Compute Audio On"] -accelerator "$accelerator+/" \ -command "pdsend \"pd dsp 1 ;\"" @@ -309,7 +311,7 @@ -command "menu_doc_open doc/7.stuff/tools load-meter.pd" } -proc ::pd_menus::create_window_menu {mymenu mytoplevel} { +proc ::pd_menus::build_window_menu {mymenu mytoplevel} { variable accelerator if {[tk windowingsystem] eq "aqua"} { $mymenu add command -label [say "Minimize"] -command "menu_minimize ." \ @@ -323,7 +325,7 @@ $mymenu add separator } -proc ::pd_menus::create_help_menu {mymenu mytoplevel} { +proc ::pd_menus::build_help_menu {mymenu mytoplevel} { if {[tk windowingsystem] ne "aqua"} { $mymenu add command -label {About Pd} \ -command "placeholder menu_doc_open doc/1.manual 1.introduction.txt" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10537] branches/pd-devel/0.41.4/src/wheredoesthisgo. tcl
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10537 http://pure-data.svn.sourceforge.net/pure-data/?rev=10537&view=rev Author: eighthave Date: 2009-01-13 18:11:48 +0000 (Tue, 13 Jan 2009) Log Message: ----------- added emtpy sketch of pdtk_pd_dsp to get rid of catch dumps Modified Paths: -------------- branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl Modified: branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl =================================================================== --- branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-13 18:09:13 UTC (rev 10536) +++ branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-13 18:11:48 UTC (rev 10537) @@ -35,6 +35,13 @@ # ------------------------------------------------------------------------------ # lost pdtk functions... +# set the checkbox on the "Compute Audio" menuitem and checkbox +proc pdtk_pd_dsp {value} { + if {$value eq "ON"} { + #TODO + } else { + } +} # ------------------------------------------------------------------------------ # kludges to avoid changing C code This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10536] trunk/externals/iem/iem_spec2/src/ spec2_tabreceive~.c
by zmoelnig＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10536 http://pure-data.svn.sourceforge.net/pure-data/?rev=10536&view=rev Author: zmoelnig Date: 2009-01-13 18:09:13 +0000 (Tue, 13 Jan 2009) Log Message: ----------- fixed typo Modified Paths: -------------- trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c Modified: trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c =================================================================== --- trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c 2009-01-13 18:00:15 UTC (rev 10535) +++ trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c 2009-01-13 18:09:13 UTC (rev 10536) @@ -76,7 +76,7 @@ out += 16; n -= 16; } - out[0] = iemarray_getfkiat(vec, 0); + out[0] = iemarray_getfloat(vec, 0); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10535] branches/pd-devel/0.41.4/src/apple_events.tcl
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10535 http://pure-data.svn.sourceforge.net/pure-data/?rev=10535&view=rev Author: eighthave Date: 2009-01-13 18:00:15 +0000 (Tue, 13 Jan 2009) Log Message: ----------- temporarily disabled Mac-only exit proc because it doesn't work yet, and is annoying Modified Paths: -------------- branches/pd-devel/0.41.4/src/apple_events.tcl Modified: branches/pd-devel/0.41.4/src/apple_events.tcl =================================================================== --- branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-13 18:00:10 UTC (rev 10534) +++ branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-13 18:00:15 UTC (rev 10535) @@ -11,33 +11,32 @@ # kAEOpenDocuments proc ::tk::mac::OpenDocument {} { + # TODO } # kEventAppHidden proc ::tk::mac::OnHide {} { + # TODO } # kEventAppShown proc ::tk::mac::OnShow {} { + # TODO } -#kAEShowPreferences +# kAEShowPreferences proc ::tk::mac::ShowPreferences {} { puts "apple prefs menu item callback" puts "::tk::mac::ShowPreferences " -# menu_preferences + # TODO + #menu_preferences } -#kAEQuitApplication -proc exit {} { - puts stderr "Custom exit proc" - # this proc overrides the built-in exit so we can grab the Quit event - pdsend "pd verifyquit;" - ::exit - # TODO sort this out... -} - -proc spinCursor {widget count} { - $widget configure -cursor spinning$count - after 100 spinCursor [incr count] -} +# kAEQuitApplication +#proc exit {} { +# # TODO sort this out... +# puts stderr "Custom exit proc" +# # this proc overrides the built-in exit so we can grab the Quit event +# pdsend "pd verifyquit;" +# ::exit +#} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10534] trunk/externals/iem/iem_bin_ambi/src
by zmoelnig＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10534 http://pure-data.svn.sourceforge.net/pure-data/?rev=10534&view=rev Author: zmoelnig Date: 2009-01-13 18:00:10 +0000 (Tue, 13 Jan 2009) Log Message: ----------- hopefully made 64bit able Modified Paths: -------------- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_calc_HRTF.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode2.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft2.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir2.c Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_calc_HRTF.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_calc_HRTF.c 2009-01-13 17:57:25 UTC (rev 10533) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_calc_HRTF.c 2009-01-13 18:00:10 UTC (rev 10534) @@ -37,10 +37,10 @@ int *x_phi; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - float *x_beg_fade_out_hrir; - float *x_beg_hrir; - float **x_beg_hrtf_re; - float **x_beg_hrtf_im; + iemarray_t *x_beg_fade_out_hrir; + float *x_beg_hrir; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -227,9 +227,9 @@ { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -285,8 +285,9 @@ int fs2=fftsize/2; t_garray *a; int npoints; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; - t_float *vec_hrtf_re, *vec_hrtf_im; + t_float *vec; + iemarray_t *vec_fade_out_hrir; + iemarray_t *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrir, *hrtf_re, *hrtf_im; float decr, sum; @@ -327,11 +328,11 @@ vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; j<fs2; j++) - vec[j] = vec_hrir[j]*vec_fade_out_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j)*iemarray_getfloat(vec_fade_out_hrir,j); } else { @@ -339,13 +340,13 @@ n = fs2 * 3; n /= 4; for(j=0; j<n; j++) - vec[j] = vec_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j); sum = 1.0f; decr = 4.0f / (float)fs2; for(j=n, k=0; j<fs2; j++, k++) { sum -= decr; - vec[j] = vec_hrir[j] * sum; + vec[j] = iemarray_getfloat(vec_hrir,j) * sum; } } } @@ -359,7 +360,8 @@ BIN_AMBI_COMPLEX old1, old2, w; BIN_AMBI_COMPLEX *sincos = x->x_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec; - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; int n_ls = x->x_n_ls; if(index < 0) @@ -424,15 +426,15 @@ } } - vec_hrtf_re[0] = val[0].real; - vec_hrtf_im[0] = 0.0f; + iemarray_getfloat(vec_hrtf_re,0) = val[0].real; + iemarray_getfloat(vec_hrtf_im,0) = 0.0f; for( i = 1; i < fs2; i++ ) { - vec_hrtf_re[i] = 2.0f*val[i].real; - vec_hrtf_im[i] = 2.0f*val[i].imag; + iemarray_getfloat(vec_hrtf_re,i) = 2.0f*val[i].real; + iemarray_getfloat(vec_hrtf_im,i) = 2.0f*val[i].imag; } - vec_hrtf_re[fs2] = 0.0f; - vec_hrtf_im[fs2] = 0.0f; + iemarray_getfloat(vec_hrtf_re,fs2) = 0.0f; + iemarray_getfloat(vec_hrtf_im,fs2) = 0.0f; } static void bin_ambi_calc_HRTF_free(t_bin_ambi_calc_HRTF *x) @@ -537,10 +539,10 @@ x->x_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (float *)0; + x->x_beg_fade_out_hrir = 0; x->x_beg_hrir = (float *)getbytes(x->x_fftsize * x->x_n_ls * sizeof(float)); - x->x_beg_hrtf_re = (float **)getbytes(x->x_n_ls * sizeof(float *)); - x->x_beg_hrtf_im = (float **)getbytes(x->x_n_ls * sizeof(float *)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ls * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ls * sizeof(iemarray_t *)); x->x_pi_over_180 = 4.0 * atan(1.0) / 180.0; Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode.c 2009-01-13 17:57:25 UTC (rev 10533) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode.c 2009-01-13 18:00:10 UTC (rev 10534) @@ -45,10 +45,10 @@ int *x_sym_flag; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - float *x_beg_fade_out_hrir; - float *x_beg_hrir; - float **x_beg_hrtf_re; - float **x_beg_hrtf_im; + iemarray_t *x_beg_fade_out_hrir; + float *x_beg_hrir; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -638,9 +638,9 @@ { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -698,8 +698,10 @@ int fs2=fftsize/2; t_garray *a; int npoints; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; - t_float *vec_hrtf_re, *vec_hrtf_im; + iemarray_t *vec_hrir; + t_float *vec; + iemarray_t *vec_fade_out_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrir, *hrtf_re, *hrtf_im; float decr, sum; @@ -740,11 +742,11 @@ vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; j<fs2; j++) - vec[j] = vec_hrir[j]*vec_fade_out_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j)*iemarray_getfloat(vec_fade_out_hrir,j); } else { @@ -752,13 +754,13 @@ n = fs2 * 3; n /= 4; for(j=0; j<n; j++) - vec[j] = vec_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j); sum = 1.0f; decr = 4.0f / (float)fs2; for(j=n, k=0; j<fs2; j++, k++) { sum -= decr; - vec[j] = vec_hrir[j] * sum; + vec[j] = iemarray_getfloat(vec_hrir,j) * sum; } } } @@ -772,7 +774,8 @@ BIN_AMBI_COMPLEX old1, old2, w; BIN_AMBI_COMPLEX *sincos = x->x_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec; - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; double *dv, *db=x->x_inv_work2; int n_ambi = x->x_n_ambi; int n_ambi2 = 2*n_ambi; @@ -854,15 +857,15 @@ } for(i = 0; i<fs2; i++) { - vec_hrtf_re[i] = val[i].real; - vec_hrtf_im[i] = val[i].imag; + iemarray_getfloat(vec_hrtf_re,i) = val[i].real; + iemarray_getfloat(vec_hrtf_im,i) = val[i].imag; } - vec_hrtf_re[fs2] = val[fs2].real; - vec_hrtf_im[fs2] = 0.0f; + iemarray_getfloat(vec_hrtf_re,fs2) = val[fs2].real; + iemarray_getfloat(vec_hrtf_im,fs2) = 0.0f; for(i = fs2+1; i < fftsize; i++) { - vec_hrtf_re[i] = 0.0f; - vec_hrtf_im[i] = 0.0f; + iemarray_getfloat(vec_hrtf_re,i) = 0.0f; + iemarray_getfloat(vec_hrtf_im,i) = 0.0f; } } @@ -1207,10 +1210,10 @@ x->x_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (float *)0; + x->x_beg_fade_out_hrir = 0; x->x_beg_hrir = (float *)getbytes(x->x_fftsize * x->x_n_ambi * sizeof(float)); - x->x_beg_hrtf_re = (float **)getbytes(x->x_n_ambi * sizeof(float *)); - x->x_beg_hrtf_im = (float **)getbytes(x->x_n_ambi * sizeof(float *)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode2.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode2.c 2009-01-13 17:57:25 UTC (rev 10533) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode2.c 2009-01-13 18:00:10 UTC (rev 10534) @@ -50,10 +50,10 @@ int *x_sym_flag; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - float *x_beg_fade_out_hrir; + iemarray_t *x_beg_fade_out_hrir; float *x_beg_hrir; - float **x_beg_hrtf_re; - float **x_beg_hrtf_im; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -664,9 +664,9 @@ { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -728,7 +728,8 @@ t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + iemarray_t *vec_hrir, *vec_fade_out_hrir; + t_float *vec; float decr, sum; if(index < 0) @@ -750,11 +751,11 @@ vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; j<fs2; j++) - vec[j] = vec_hrir[j]*vec_fade_out_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j)*iemarray_getfloat(vec_fade_out_hrir,j); } else { @@ -762,13 +763,13 @@ n = fs2 * 3; n /= 4; for(j=0; j<n; j++) - vec[j] = vec_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j); sum = 1.0f; decr = 4.0f / (float)fs2; for(j=n, k=0; j<fs2; j++, k++) { sum -= decr; - vec[j] = vec_hrir[j] * sum; + vec[j] = iemarray_getfloat(vec_hrir,j) * sum; } } } @@ -780,7 +781,7 @@ t_garray *a; int npoints; int fftsize = x->x_fftsize; - t_float *vec_hrtf_re, *vec_hrtf_im; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrtf_re, *hrtf_im; if(index < 0) @@ -818,7 +819,8 @@ BIN_AMBI_COMPLEX old1, old2, w; BIN_AMBI_COMPLEX *sincos = x->x_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec;/*weighted decoder-matrix with n_ls lines and n_ambi columns*/ - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; double *dv, *db=x->x_prod; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_ls; @@ -902,15 +904,15 @@ } for(i = 0; i<fs2; i++) { - vec_hrtf_re[i] = val[i].real; - vec_hrtf_im[i] = val[i].imag; + iemarray_getfloat(vec_hrtf_re,i) = val[i].real; + iemarray_getfloat(vec_hrtf_im,i) = val[i].imag; } - vec_hrtf_re[fs2] = val[fs2].real; - vec_hrtf_im[fs2] = 0.0f; + iemarray_getfloat(vec_hrtf_re,fs2) = val[fs2].real; + iemarray_getfloat(vec_hrtf_im,fs2) = 0.0f; for(i = fs2+1; i < fftsize; i++) { - vec_hrtf_re[i] = 0.0f; - vec_hrtf_im[i] = 0.0f; + iemarray_getfloat(vec_hrtf_re,i) = 0.0f; + iemarray_getfloat(vec_hrtf_im,i) = 0.0f; } } } @@ -1284,10 +1286,10 @@ x->x_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (float *)0; - x->x_beg_hrir = (float *)getbytes(x->x_fftsize * x->x_n_ls * sizeof(float)); - x->x_beg_hrtf_re = (float **)getbytes(x->x_n_ambi * sizeof(float *)); - x->x_beg_hrtf_im = (float **)getbytes(x->x_n_ambi * sizeof(float *)); + x->x_beg_fade_out_hrir = 0; + x->x_beg_hrir = (float *)getbytes(x->x_fftsize * x->x_n_ls * sizeof(float)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft.c 2009-01-13 17:57:25 UTC (rev 10533) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft.c 2009-01-13 18:00:10 UTC (rev 10534) @@ -54,10 +54,10 @@ int *x_sym_flag; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - float *x_beg_fade_out_hrir; + iemarray_t *x_beg_fade_out_hrir; float *x_beg_hrir; - float **x_beg_hrtf_re; - float **x_beg_hrtf_im; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -788,9 +788,9 @@ { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -853,7 +853,8 @@ t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + t_float *vec; + iemarray_t *vec_hrir, *vec_fade_out_hrir; float decr, sum; if(index < 0) @@ -875,11 +876,11 @@ vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; j<fs2; j++) - vec[j] = vec_hrir[j]*vec_fade_out_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j)*iemarray_getfloat(vec_fade_out_hrir,j); } else { @@ -887,13 +888,13 @@ n = fs2 * 3; n /= 4; for(j=0; j<n; j++) - vec[j] = vec_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j); sum = 1.0f; decr = 4.0f / (float)fs2; for(j=n, k=0; j<fs2; j++, k++) { sum -= decr; - vec[j] = vec_hrir[j] * sum; + vec[j] = iemarray_getfloat(vec_hrir,j) * sum; } } } @@ -905,7 +906,7 @@ t_garray *a; int npoints; int fftsize = x->x_fftsize; - t_float *vec_hrtf_re, *vec_hrtf_im; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrtf_re, *hrtf_im; if(index < 0) @@ -943,7 +944,8 @@ BIN_AMBI_COMPLEX old1, old2, w; BIN_AMBI_COMPLEX *sincos = x->x_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec;/*weighted decoder-matrix with n_ls lines and n_ambi columns*/ - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; double *dv, *db=x->x_prod3; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_ind_ls + x->x_n_mrg_mir_ls; @@ -1027,15 +1029,15 @@ } for(i = 0; i<fs2; i++) { - vec_hrtf_re[i] = val[i].real; - vec_hrtf_im[i] = val[i].imag; + iemarray_getfloat(vec_hrtf_re, i) = val[i].real; + iemarray_getfloat(vec_hrtf_im, i) = val[i].imag; } - vec_hrtf_re[fs2] = val[fs2].real; - vec_hrtf_im[fs2] = 0.0f; + iemarray_getfloat(vec_hrtf_re, fs2) = val[fs2].real; + iemarray_getfloat(vec_hrtf_im, fs2) = 0.0f; for(i = fs2+1; i < fftsize; i++) { - vec_hrtf_re[i] = 0.0f; - vec_hrtf_im[i] = 0.0f; + iemarray_getfloat(vec_hrtf_re, i) = 0.0f; + iemarray_getfloat(vec_hrtf_im, i) = 0.0f; } } } @@ -1430,10 +1432,10 @@ x->x_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (float *)0; - x->x_beg_hrir = (float *)getbytes(x->x_fftsize * (x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(float)); - x->x_beg_hrtf_re = (float **)getbytes(x->x_n_ambi * sizeof(float *)); - x->x_beg_hrtf_im = (float **)getbytes(x->x_n_ambi * sizeof(float *)); + x->x_beg_fade_out_hrir = 0; + x->x_beg_hrir = (float *)getbytes(x->x_fftsize * (x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(float)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft2.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft2.c 2009-01-13 17:57:25 UTC (rev 10533) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft2.c 2009-01-13 18:00:10 UTC (rev 10534) @@ -53,10 +53,10 @@ int *x_sym_flag; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - t_float *x_beg_fade_out_hrir; + iemarray_t *x_beg_fade_out_hrir; t_float *x_beg_hrir; - t_float **x_beg_hrtf_re; - t_float **x_beg_hrtf_im; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -645,12 +645,12 @@ { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; int i, n; double *dv3=x->x_prod3; double *dv2=x->x_prod2; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -745,7 +745,8 @@ t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + t_float*vec; + iemarray_t *vec_hrir, *vec_fade_out_hrir; t_float decr, sum; if(index < 0) @@ -767,11 +768,11 @@ vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; j<fs2; j++) - vec[j] = vec_hrir[j]*vec_fade_out_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir, j)*iemarray_getfloat(vec_fade_out_hrir, j); } else { @@ -779,13 +780,13 @@ n = fs2 * 3; n /= 4; for(j=0; j<n; j++) - vec[j] = vec_hrir[j]; + vec[j] =iemarray_getfloat(vec_hrir,j); sum = 1.0f; decr = 4.0f / (t_float)fs2; for(j=n, k=0; j<fs2; j++, k++) { sum -= decr; - vec[j] = vec_hrir[j] * sum; + vec[j] = iemarray_getfloat(vec_hrir,j) * sum; } } } @@ -797,7 +798,7 @@ t_garray *a; int npoints; int fftsize = x->x_fftsize; - t_float *vec_hrtf_re, *vec_hrtf_im; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrtf_re, *hrtf_im; if(index < 0) @@ -835,7 +836,8 @@ BIN_AMBI_COMPLEX old1, old2, w; BIN_AMBI_COMPLEX *sincos = x->x_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec;/*weighted decoder-matrix with n_ls lines and n_ambi columns*/ - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t*vec_hrtf_re, *vec_hrtf_im; double *dv, *db=x->x_prod3; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_real_ls; @@ -919,15 +921,15 @@ } for(i = 0; i<fs2; i++) { - vec_hrtf_re[i] = val[i].real; - vec_hrtf_im[i] = val[i].imag; + iemarray_getfloat(vec_hrtf_re, i) = val[i].real; + iemarray_getfloat(vec_hrtf_im, i) = val[i].imag; } - vec_hrtf_re[fs2] = val[fs2].real; - vec_hrtf_im[fs2] = 0.0f; + iemarray_getfloat(vec_hrtf_re, fs2) = val[fs2].real; + iemarray_getfloat(vec_hrtf_im, fs2) = 0.0f; for(i = fs2+1; i < fftsize; i++) { - vec_hrtf_re[i] = 0.0f; - vec_hrtf_im[i] = 0.0f; + iemarray_getfloat(vec_hrtf_re, i) = 0.0f; + iemarray_getfloat(vec_hrtf_im, i) = 0.0f; } } } @@ -1310,10 +1312,10 @@ x->x_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (t_float *)0; + x->x_beg_fade_out_hrir = 0; x->x_beg_hrir = (t_float *)getbytes(x->x_fftsize * x->x_n_real_ls * sizeof(t_float)); - x->x_beg_hrtf_re = (t_float **)getbytes(x->x_n_ambi * sizeof(t_float *)); - x->x_beg_hrtf_im = (t_float **)getbytes(x->x_n_ambi * sizeof(t_float *)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir.c 2009-01-13 17:57:25 UTC (rev 10533) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir.c 2009-01-13 18:00:10 UTC (rev 10534) @@ -52,9 +52,9 @@ int *x_phi; int *x_phi_sym; int *x_sym_flag; - float *x_beg_fade_out_hrir; - float *x_beg_hrir; - float **x_beg_hrir_red; + iemarray_t *x_beg_fade_out_hrir; + float *x_beg_hrir; + iemarray_t **x_beg_hrir_red; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrir_red; @@ -770,7 +770,7 @@ int npoints; iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -834,7 +834,8 @@ int npoints; t_symbol *hrir; iemarray_t *vec_hrir; - t_float *vec, *vec_fade_out_hrir; + t_float *vec; + iemarray_t *vec_fade_out_hrir; float decr, sum; if(index < 0) @@ -856,11 +857,11 @@ vec = x->x_beg_hrir; vec += index * firsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; j<fs2; j++) - vec[j] = vec_hrir[j]*vec_fade_out_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j)*iemarray_getfloat(vec_fade_out_hrir,j); } else { @@ -868,13 +869,13 @@ n = fs2 * 3; n /= 4; for(j=0; j<n; j++) - vec[j] = vec_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j); sum = 1.0f; decr = 4.0f / (float)fs2; for(j=n, k=0; j<fs2; j++, k++) { sum -= decr; - vec[j] = vec_hrir[j] * sum; + vec[j] = iemarray_getfloat(vec_hrir,j) * sum; } } } @@ -904,7 +905,7 @@ error("%s: bad array-size: %d", hrir_red->s_name, npoints); else { - x->x_beg_hrir_red[index] = vec_hrir_red; + x->x_beg_hrir_red[index] = vec_hrir_red; } } @@ -913,7 +914,8 @@ int index=(int)findex - 1; int i, j; int firsize = x->x_firsize; - t_float *vec_hrir, *vec_hrir_red; + t_float *vec_hrir; + iemarray_t*vec_hrir_red; double *dv; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_ind_ls + x->x_n_mrg_mir_ls; @@ -933,7 +935,7 @@ vec_hrir = x->x_beg_hrir; for(i=0; i<firsize; i++)/*first step of acumulating the HRIRs*/ { - vec_hrir_red[i] = mul * vec_hrir[i]; + iemarray_getfloat(vec_hrir_red,i) = mul * vec_hrir[i]; } for(j=1; j<n_ls; j++) @@ -944,7 +946,7 @@ vec_hrir += j * firsize; for(i=0; i<firsize; i++) { - vec_hrir_red[i] += mul * vec_hrir[i]; + iemarray_getfloat(vec_hrir_red,i) += mul * vec_hrir[i]; } } } @@ -1307,10 +1309,10 @@ x->x_phi_sym = (int *)getbytes((x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(int)); x->x_sym_flag = (int *)getbytes((x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(int)); - x->x_beg_fade_out_hrir = (float *)0; + x->x_beg_fade_out_hrir = 0; x->x_beg_hrir = (float *)getbytes(x->x_firsize * (x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(float)); - x->x_beg_hrir_red = (float **)getbytes(x->x_n_ambi * sizeof(float *)); - + x->x_beg_hrir_red = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; x->x_sqrt6_4 = sqrt(6.0) / 4.0; Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir2.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir2.c 2009-01-13 17:57:25 UTC (rev 10533) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir2.c 2009-01-13 18:00:10 UTC (rev 10534) @@ -51,9 +51,9 @@ int *x_phi; int *x_phi_sym; int *x_sym_flag; - t_float *x_beg_fade_out_hrir; - t_float *x_beg_hrir; - t_float **x_beg_hrir_red; + iemarray_t *x_beg_fade_out_hrir; + t_float *x_beg_hrir; + iemarray_t **x_beg_hrir_red; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrir_red; @@ -624,12 +624,12 @@ { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; int i, n; double *dv3=x->x_prod3; double *dv2=x->x_prod2; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -723,7 +723,8 @@ t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + t_float *vec; + iemarray_t *vec_hrir, *vec_fade_out_hrir; t_float decr, sum; if(index < 0) @@ -745,11 +746,11 @@ vec = x->x_beg_hrir; vec += index * firsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; j<firsize; j++) - vec[j] = vec_hrir[j]*vec_fade_out_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j)*iemarray_getfloat(vec_fade_out_hrir,j); } else { @@ -757,13 +758,13 @@ n = firsize * 3; n /= 4; for(j=0; j<n; j++) - vec[j] = vec_hrir[j]; + vec[j] = iemarray_getfloat(vec_hrir,j); sum = 1.0f; decr = 4.0f / (t_float)firsize; for(j=n, k=0; j<firsize; j++, k++) { sum -= decr; - vec[j] = vec_hrir[j] * sum; + vec[j] = iemarray_getfloat(vec_hrir,j) * sum; } } } @@ -775,7 +776,7 @@ t_garray *a; int npoints; int firsize = x->x_firsize; - t_float *vec_hrir_red; + iemarray_t *vec_hrir_red; t_symbol *hrir_red; if(index < 0) @@ -802,7 +803,8 @@ int index=(int)findex - 1; int i, j; int firsize = x->x_firsize; - t_float *vec_hrir, *vec_hrir_red; + t_float *vec_hrir; + iemarray_t*vec_hrir_red; double *dv; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_real_ls; @@ -822,7 +824,7 @@ vec_hrir = x->x_beg_hrir; for(i=0; i<firsize; i++)/*first step of acumulating the HRIRs*/ { - vec_hrir_red[i] = mul * vec_hrir[i]; + iemarray_getfloat(vec_hrir_red,i) = mul * vec_hrir[i]; } for(j=1; j<n_ls; j++) @@ -834,7 +836,7 @@ for(i=0; i<firsize; i++) { - vec_hrir_red[i] += mul * vec_hrir[i]; + iemarray_getfloat(vec_hrir_red,i) += mul * vec_hrir[i]; } } } @@ -1185,9 +1187,9 @@ x->x_phi_sym = (int *)getbytes(x->x_n_real_ls * sizeof(int)); x->x_sym_flag = (int *)getbytes(x->x_n_real_ls * sizeof(int)); - x->x_beg_fade_out_hrir = (t_float *)0; - x->x_beg_hrir = (t_float *)getbytes(x->x_firsize * x->x_n_real_ls * sizeof(t_float)); - x->x_beg_hrir_red = (t_float **)getbytes(x->x_n_ambi * sizeof(t_float *)); + x->x_beg_fade_out_hrir = 0; + x->x_beg_hrir = (t_float *)getbytes(x->x_firsize * x->x_n_real_ls * sizeof(t_float)); + x->x_beg_hrir_red = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10533] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10533 http://pure-data.svn.sourceforge.net/pure-data/?rev=10533&view=rev Author: eighthave Date: 2009-01-13 17:57:25 +0000 (Tue, 13 Jan 2009) Log Message: ----------- - named variables after the Tk widgets they represent $mytoplevel = 'toplevel' $mymenubar = the 'menu' attached to the 'toplevel' $mymenu = 'menu' attached to the menubar 'menu' $menuitem = 'menu' item $mycanvas = 'canvas' $canvasitem = 'canvas' item - replaced canvastosym/to_top with [winfo toplevel ...] - reordered procs in pd_menus.tcl to go in order of creation Modified Paths: -------------- branches/pd-devel/0.41.4/src/apple_events.tcl branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_bindings.tcl branches/pd-devel/0.41.4/src/pd_menucommands.tcl branches/pd-devel/0.41.4/src/pd_menus.tcl branches/pd-devel/0.41.4/src/pdtk_canvas.tcl branches/pd-devel/0.41.4/src/pdtk_text.tcl Modified: branches/pd-devel/0.41.4/src/apple_events.tcl =================================================================== --- branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-13 17:13:31 UTC (rev 10532) +++ branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-13 17:57:25 UTC (rev 10533) @@ -23,6 +23,9 @@ #kAEShowPreferences proc ::tk::mac::ShowPreferences {} { + puts "apple prefs menu item callback" + puts "::tk::mac::ShowPreferences " +# menu_preferences } #kAEQuitApplication Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 17:13:31 UTC (rev 10532) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-13 17:57:25 UTC (rev 10533) @@ -41,25 +41,31 @@ # # -# * when possible use "" doublequotes to delimit messages +# - when possible use "" doublequotes to delimit messages +# - instead of 'global myvar' use '$::myvar' # # # -# ## Names for Common Variables #---------------------------- -# $name == window name -# $canvasname == $name.c == canvas name +# +# variables named after the Tk widgets they represent +# $mytoplevel = 'toplevel' +# $mymenubar = the 'menu' attached to the 'toplevel' +# $mymenu = 'menu' attached to the menubar 'menu' +# $menuitem = 'menu' item +# $mycanvas = 'canvas' +# $canvasitem = 'canvas' item - #------------------------------------------------------------------------------# # global variables + +# file types for Open/Save panels set filetypes "" - # for the sake of clarity, I think there should not be any inline code, # everything should be in a procedure that is ultimately triggered from main() # -hans(a)eds.org @@ -95,7 +101,6 @@ # init functions proc init {} { - global filetypes switch -- [tk windowingsystem] { "x11" { # add control to show/hide hidden files in the open panel (load @@ -104,14 +109,14 @@ set ::tk::dialog::file::showHiddenBtn 1 set ::tk::dialog::file::showHiddenVar 0 # set file types that open/save recognize - set filetypes { + set ::filetypes { {{pd files} {.pd} } {{max text files} {.pat} } } } "aqua" { # set file types that open/save recognize - set filetypes { + set ::filetypes { {{Pd Files} {.pd} } {{Max Text Files (.pat)} {.pat} } } @@ -119,7 +124,7 @@ "win32" { font create menufont -family Tahoma -size -11 # set file types that open/save recognize - set filetypes { + set ::filetypes { {{Pd Files} {.pd} } {{Max Text Files} {.pat} } } @@ -159,32 +164,34 @@ puts stderr "Running pdtk_fixwindowmenu" } -# TODO rename "name" to "topname" to be clear -proc pdtk_canvas_new {name width height geometry editable} { +proc pdtk_canvas_new {mytoplevel width height geometry editable} { # TODO check size of window - toplevel $name -width $width -height $height - ::pd_menus::create_menubar $name.menubar - $name configure -menu $name.menubar + toplevel $mytoplevel -width $width -height $height + ::pd_menus::create_menubar $mytoplevel.menubar + $mytoplevel configure -menu $mytoplevel.menubar # TODO slide off screen windows into view - wm geometry $name $geometry + wm geometry $mytoplevel $geometry if {[tk windowingsystem] eq "aqua"} { - wm minsize $name 50 20 + wm minsize $mytoplevel 50 20 } else { # leave room for the menubar - wm minsize $name 310 30 + wm minsize $mytoplevel 310 30 } - canvas $name.c -width $width -height $height -background white \ + canvas $mytoplevel.c -width $width -height $height -background white \ -highlightthickness 0 # TODO add scrollbars here - pack $name.c -side left -expand 1 -fill both + pack $mytoplevel.c -side left -expand 1 -fill both - ::pd_bindings::canvas_bindings $name + ::pd_bindings::canvas_bindings $mytoplevel # the popup menu for the canvas - menu $name.popup -tearoff false - $name.popup add command -label "Properties" -command "popup_action $name 0" - $name.popup add command -label "Open" -command "popup_action $name 1" - $name.popup add command -label "Help" -command "popup_action $name 2" + menu $mytoplevel.popup -tearoff false + $mytoplevel.popup add command -label "Properties" \ + -command "popup_action $mytoplevel 0" + $mytoplevel.popup add command -label "Open" \ + -command "popup_action $mytoplevel 1" + $mytoplevel.popup add command -label "Help" \ + -command "popup_action $mytoplevel 2" } proc check_font {$fontname} { Modified: branches/pd-devel/0.41.4/src/pd_bindings.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 17:13:31 UTC (rev 10532) +++ branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-13 17:57:25 UTC (rev 10533) @@ -18,133 +18,140 @@ } } -proc ::pd_bindings::window_bindings {name} { +proc ::pd_bindings::window_bindings {mytoplevel} { variable modifier # File menu - bind $name <$modifier-Key-b> "menu_helpbrowser" - bind $name <$modifier-Key-n> "menu_new" - bind $name <$modifier-Key-o> "menu_open" - bind $name <$modifier-Key-p> "menu_print $name" - bind $name <$modifier-Key-q> "pdsend \"pd verifyquit ;\"" - bind $name <$modifier-Key-r> "menu_raiseconsole" - bind $name <$modifier-Key-w> "pdsend \"$name menuclose 0 ;\"" - bind $name <$modifier-Shift-Key-L> "menu_clear_console" - bind $name <$modifier-Shift-Key-Q> "pdsend \"pd quit ;\"" - bind $name <$modifier-Shift-Key-R> "menu_toggle_console" - bind $name <$modifier-Shift-Key-W> "pdsend \"$name menuclose 1 ;\"" + bind $mytoplevel <$modifier-Key-b> "menu_helpbrowser" + bind $mytoplevel <$modifier-Key-n> "menu_new" + bind $mytoplevel <$modifier-Key-o> "menu_open" + bind $mytoplevel <$modifier-Key-p> "menu_print $mytoplevel" + bind $mytoplevel <$modifier-Key-q> "pdsend \"pd verifyquit ;\"" + bind $mytoplevel <$modifier-Key-r> "menu_raiseconsole" + bind $mytoplevel <$modifier-Key-w> "pdsend \"$mytoplevel menuclose 0 ;\"" + bind $mytoplevel <$modifier-Shift-Key-L> "menu_clear_console" + bind $mytoplevel <$modifier-Shift-Key-Q> "pdsend \"pd quit ;\"" + bind $mytoplevel <$modifier-Shift-Key-R> "menu_toggle_console" + bind $mytoplevel <$modifier-Shift-Key-W> "pdsend \"$mytoplevel menuclose 1 ;\"" # DSP control - bind $name <$modifier-Key-slash> "pdsend \"pd dsp 1 ;\"" - bind $name <$modifier-Key-period> "pdsend \"pd dsp 0 ;\"" + bind $mytoplevel <$modifier-Key-slash> "pdsend \"pd dsp 1 ;\"" + bind $mytoplevel <$modifier-Key-period> "pdsend \"pd dsp 0 ;\"" } -proc ::pd_bindings::pdwindow_bindings {name} { +proc ::pd_bindings::pdwindow_bindings {mytoplevel} { variable modifier - window_bindings $name + window_bindings $mytoplevel # TODO update this to work with the console, if it is used - bind . <$modifier-Key-a> ".printout.text tag add sel 1.0 end" - bind . <$modifier-Key-x> "tk_textCut .printout.text" - bind . <$modifier-Key-c> "tk_textCopy .printout.text" - bind . <$modifier-Key-v> "tk_textPaste .printout.text" - bind . <$modifier-Key-w> {::pd_post::pdtk_post "Can't close Pd window, ignored.\n"} + bind $mytoplevel <$modifier-Key-a> ".printout.text tag add sel 1.0 end" + bind $mytoplevel <$modifier-Key-x> "tk_textCut .printout.text" + bind $mytoplevel <$modifier-Key-c> "tk_textCopy .printout.text" + bind $mytoplevel <$modifier-Key-v> "tk_textPaste .printout.text" + bind $mytoplevel <$modifier-Key-w> { + ::pd_post::pdtk_post "Can't close Pd window, ignored.\n" + } # Tcl event bindings - wm protocol . WM_DELETE_WINDOW "pdsend \"pd verifyquit ;\"" + wm protocol $mytoplevel WM_DELETE_WINDOW "pdsend \"pd verifyquit ;\"" # do window maintenance when entering the Pd window (Window menu, scrollbars, etc) - #bind $name <FocusIn> {pdtk_pdwindowmaintenance} + #bind $mytoplevel <FocusIn> {pdtk_pdwindowmaintenance} } -proc ::pd_bindings::panel_bindings {name} { +proc ::pd_bindings::panel_bindings {mytoplevel} { variable modifier - window_bindings $name + window_bindings $mytoplevel -# bind $name <KeyPress-Escape> [format "%s_cancel %s" $panelname $name] -# bind $name <KeyPress-Return> [format "%s_ok %s" $panelname $name] -# bind $name <$modifier_key-Key-w> [format "%s_cancel %s" $panelname $name] +# bind $mytoplevel <KeyPress-Escape> [format "%s_cancel %s" $panelname $mytoplevel] +# bind $mytoplevel <KeyPress-Return> [format "%s_ok %s" $panelname $mytoplevel] +# bind $mytoplevel <$modifier_key-Key-w> [format "%s_cancel %s" $panelname $mytoplevel] -# wm protocol $name WM_DELETE_WINDOW "$panelname_cancel" +# wm protocol $mytoplevel WM_DELETE_WINDOW "$panelname_cancel" } -proc ::pd_bindings::canvas_bindings {name} { +proc ::pd_bindings::canvas_bindings {mytoplevel} { variable modifier - window_bindings $name - + window_bindings $mytoplevel + set mycanvas $mytoplevel.c + # key bindings ------------------------------------------------------------- - bind $name <$modifier-Key-1> "pdsend \"$name obj ;\"" - bind $name <$modifier-Key-2> "pdsend \"$name msg ;\"" - bind $name <$modifier-Key-3> "pdsend \"$name floatatom ;\"" - bind $name <$modifier-Key-4> "pdsend \"$name symbolatom ;\"" - bind $name <$modifier-Key-5> "pdsend \"$name text ;\"" - bind $name <$modifier-Key-a> "pdsend \"$name selectall ;\"" - bind $name <$modifier-Key-c> "pdsend \"$name copy ;\"" - bind $name <$modifier-Key-d> "pdsend \"$name duplicate ;\"" - bind $name <$modifier-Key-e> "pdsend \"$name editmode 0 ;\"" - bind $name <$modifier-Key-f> "menu_findobject $name" - bind $name <$modifier-Key-g> "pdsend \"$name findagain ;\"" - bind $name <$modifier-Key-s> "pdsend \"$name menusave ;\"" - bind $name <$modifier-Key-v> "pdsend \"$name paste ;\"" - bind $name <$modifier-Key-x> "pdsend \"$name cut ;\"" - bind $name <$modifier-Key-z> "menu_undo $name" - bind $name <$modifier-Key-slash> "pdsend \"pd dsp 1 ;\"" - bind $name <$modifier-Key-period> "pdsend \"pd dsp 0 ;\"" + bind $mytoplevel <$modifier-Key-1> "pdsend \"$mytoplevel obj ;\"" + bind $mytoplevel <$modifier-Key-2> "pdsend \"$mytoplevel msg ;\"" + bind $mytoplevel <$modifier-Key-3> "pdsend \"$mytoplevel floatatom ;\"" + bind $mytoplevel <$modifier-Key-4> "pdsend \"$mytoplevel symbolatom ;\"" + bind $mytoplevel <$modifier-Key-5> "pdsend \"$mytoplevel text ;\"" + bind $mytoplevel <$modifier-Key-a> "pdsend \"$mytoplevel selectall ;\"" + bind $mytoplevel <$modifier-Key-c> "pdsend \"$mytoplevel copy ;\"" + bind $mytoplevel <$modifier-Key-d> "pdsend \"$mytoplevel duplicate ;\"" + bind $mytoplevel <$modifier-Key-e> "pdsend \"$mytoplevel editmode 0 ;\"" + bind $mytoplevel <$modifier-Key-f> "menu_findobject $mytoplevel" + bind $mytoplevel <$modifier-Key-g> "pdsend \"$mytoplevel findagain ;\"" + bind $mytoplevel <$modifier-Key-s> "pdsend \"$mytoplevel menusave ;\"" + bind $mytoplevel <$modifier-Key-v> "pdsend \"$mytoplevel paste ;\"" + bind $mytoplevel <$modifier-Key-x> "pdsend \"$mytoplevel cut ;\"" + bind $mytoplevel <$modifier-Key-z> "menu_undo $mytoplevel" + bind $mytoplevel <$modifier-Key-slash> "pdsend \"pd dsp 1 ;\"" + bind $mytoplevel <$modifier-Key-period> "pdsend \"pd dsp 0 ;\"" # annoying, but Tk's bind needs uppercase letter to get the Shift - bind $name <$modifier-Shift-Key-B> "pdsend \"$name bng 1 ;\"" - bind $name <$modifier-Shift-Key-C> "pdsend \"$name mycnv 1 ;\"" - bind $name <$modifier-Shift-Key-D> "pdsend \"$name vradio 1 ;\"" - bind $name <$modifier-Shift-Key-H> "pdsend \"$name hslider 1 ;\"" - bind $name <$modifier-Shift-Key-I> "pdsend \"$name hradio 1 ;\"" - bind $name <$modifier-Shift-Key-N> "pdsend \"$name numbox 1 ;\"" - bind $name <$modifier-Shift-Key-S> "pdsend \"$name menusaveas ;\"" - bind $name <$modifier-Shift-Key-T> "pdsend \"$name toggle 1 ;\"" - bind $name <$modifier-Shift-Key-U> "pdsend \"$name vumeter 1 ;\"" - bind $name <$modifier-Shift-Key-V> "pdsend \"$name vslider 1 ;\"" - bind $name <$modifier-Shift-Key-Z> "menu_redo $name" + bind $mytoplevel <$modifier-Shift-Key-B> "pdsend \"$mytoplevel bng 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-C> "pdsend \"$mytoplevel mycnv 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-D> "pdsend \"$mytoplevel vradio 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-H> "pdsend \"$mytoplevel hslider 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-I> "pdsend \"$mytoplevel hradio 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-N> "pdsend \"$mytoplevel numbox 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-S> "pdsend \"$mytoplevel menusaveas ;\"" + bind $mytoplevel <$modifier-Shift-Key-T> "pdsend \"$mytoplevel toggle 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-U> "pdsend \"$mytoplevel vumeter 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-V> "pdsend \"$mytoplevel vslider 1 ;\"" + bind $mytoplevel <$modifier-Shift-Key-Z> "menu_redo $mytoplevel" if {[tk windowingsystem] eq "aqua"} { - bind $name <$modifier-Key-m> "menu_minimize $name" - bind $name <$modifier-Key-t> "menu_font $name" - bind $name <$modifier-quoteleft> "menu_raisenextwindow" + bind $mytoplevel <$modifier-Key-m> "menu_minimize $mytoplevel" + bind $mytoplevel <$modifier-Key-t> "menu_font $mytoplevel" + bind $mytoplevel <$modifier-quoteleft> "menu_raisenextwindow" } else { - bind $name <$modifier-Key-m> "menu_send" - bind $name <$modifier-Key-t> "menu_texteditor" + bind $mytoplevel <$modifier-Key-m> "menu_send" + bind $mytoplevel <$modifier-Key-t> "menu_texteditor" } # mouse bindings ----------------------------------------------------------- - # these need to be bound to $name.c because %W will return $name for - # events over the window frame and $name.c for events over the canvas - bind $name.c <Motion> "pdtk_canvas_motion %W %x %y 0" - bind $name.c <Button> "pdtk_canvas_mouse %W %x %y %b 0" - bind $name.c <ButtonRelease> "pdtk_canvas_mouseup %W %x %y %b" - bind $name.c <$modifier-Button> "pdtk_canvas_mouse %W %x %y %b 0" + # these need to be bound to $mytoplevel.c because %W will return $mytoplevel for + # events over the window frame and $mytoplevel.c for events over the canvas + bind $mycanvas <Motion> "pdtk_canvas_motion %W %x %y 0" + bind $mycanvas <Button> "pdtk_canvas_mouse %W %x %y %b 0" + bind $mycanvas <ButtonRelease> "pdtk_canvas_mouseup %W %x %y %b" + bind $mycanvas <$modifier-Button> "pdtk_canvas_mouse %W %x %y %b 0" # TODO look into "virtual events' for a means for getting Shift-Button, etc. switch {[tk windowingsystem]} { "aqua" { # on Mac OS X, emulate a rightclick with Ctrl-click - bind.c $name <Ctrl-Button> "pdtk_canvas_rightclick %W %x %y %b" + bind $mycanvas <Ctrl-Button> "pdtk_canvas_rightclick %W %x %y %b" + # TODO try replacing the above with this (and making it global by binding to "." + #bind all <Control-ButtonPress-1> {event generate %W <ButtonPress-2> \ + # -x %x -y %y -rootx %X -rooty %Y \ + # -button 2 -time %t} } "x11" { # on X11, button 2 "pastes" from the X windows clipboard - bind.c $name <Button-2> "pdtk_canvas_clickpaste %W %x %y %b" + bind $mycanvas <Button-2> "pdtk_canvas_clickpaste %W %x %y %b" } } - #TODO bind $name <MouseWheel> + #TODO bind $mytoplevel <MouseWheel> # event bindings ----------------------------------------------------------- - bind $name <Map> "pdtk_canvas_map %W" - bind $name <Unmap> "pdtk_canvas_unmap %W" - #TODO bind $name <Configure> "pdtk_canvas_getscroll %W" + bind $mytoplevel <Map> "pdtk_canvas_map %W" + bind $mytoplevel <Unmap> "pdtk_canvas_unmap %W" + #TODO bind $mytoplevel <Configure> "pdtk_canvas_getscroll %W" # do window maintenance when entering a window (Window menu, scrollbars...) # maybe use WM_TAKE_FOCUS for this? - #bind $name <FocusIn> {pdtk_canvaswindowmaintenance} + #bind $mytoplevel <FocusIn> {pdtk_canvaswindowmaintenance} # window protocol bindings - wm protocol $name WM_DELETE_WINDOW "pdsend \"$name menuclose 0 ;\"" + wm protocol $mytoplevel WM_DELETE_WINDOW "pdsend \"$mytoplevel menuclose 0 ;\"" } Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-13 17:13:31 UTC (rev 10532) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-13 17:57:25 UTC (rev 10533) @@ -55,12 +55,12 @@ # TODO insert real send panel here } -proc ::pd_menucommands::menu_print {name} { +proc ::pd_menucommands::menu_print {mytoplevel} { set filename [tk_getSaveFile -initialfile pd.ps \ -defaultextension .ps \ -filetypes { {{postscript} {.ps}} }] if {$filename != ""} { - $name.c postscript -file $filename + $mytoplevel.c postscript -file $filename } } @@ -85,7 +85,7 @@ } } -proc ::pd_menucommands::menu_maximize {window} { - wm state $window zoomed +proc ::pd_menucommands::menu_maximize {mytoplevel} { + wm state $mytoplevel zoomed } Modified: branches/pd-devel/0.41.4/src/pd_menus.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 17:13:31 UTC (rev 10532) +++ branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-13 17:57:25 UTC (rev 10533) @@ -38,32 +38,89 @@ option add *tearOff 0 } +proc ::pd_menus::create_menubar {mymenubar} { + menu $mymenubar + set menulist "file edit put find media window help" + if { [tk windowingsystem] eq "aqua" } {make_apple_menu $mymenubar} + if { [tk windowingsystem] eq "win32" } {make_system_menu $mymenubar} + foreach mymenu $menulist { + menu $mymenubar.$mymenu + $mymenubar add cascade -label [string totitle $mymenu] \ + -menu $mymenubar.$mymenu + [format create_%s_menu $mymenu] $mymenubar.$mymenu PLACEHOLDER + if {[tk windowingsystem] eq "win32"} { + # fix menu font size on Windows with tk scaling = 1 + $mymenubar.$mymenu configure -font menufont + } + } +} + +proc ::pd_menus::configure_pdwindow {mymenubar} { + # these are meaningless for the Pd window, so disable them + set file_items_to_disable {"Save" "Save As..." "Print..." "Close"} + foreach menuitem $file_items_to_disable { + $mymenubar.file entryconfigure $menuitem -state disabled + } + set edit_items_to_disable {"Undo" "Redo" "Duplicate" "Tidy Up" "Edit Mode"} + foreach menuitem $edit_items_to_disable { + $mymenubar.edit entryconfigure $menuitem -state disabled + } + # disable everything on the Put menu + for {set i 0} {$i <= [$mymenubar.put index end]} {incr i} { + # catch errors by trying to disable separators + catch {$mymenubar.put entryconfigure $i -state disabled } + } +} + +# for Mac OS X only +proc ::pd_menus::make_apple_menu {mymenu} { + puts stderr CREATE_APPLE_MENU + # TODO this should open a Pd patch called about.pd + menu $mymenu.apple + $mymenu.apple add command -label [say "About Pd"] \ + -command "menu_doc_open doc/1.manual 1.introduction.txt" + $mymenu add cascade -label "Apple" -menu $mymenu.apple + # starting in 8.4.14, this is created automatically + if {[regsub -- {[0-9]\.[0-9]\.([0-9][0-9]*)} [info patchlevel] {\1}] < 14} { + $mymenu.apple add separator + $mymenu.apple add command -label [say "Preferences..."] \ + -command "menu_preferences" -accelerator "Cmd+," + } +} + +# for Windows only +proc ::pd_menus::make_system_menu {mymenu} { + $mymenu add cascade -menu [menu $mymenu.system] + # TODO add Close, Minimize, etc and whatever else is on the little menu + # that is on the top left corner of the window frame +} + # ------------------------------------------------------------------------------ # menu building functions for Mac OS X/aqua -proc ::pd_menus::create_file_menu_aqua {rootmenu} { +proc ::pd_menus::create_file_menu_aqua {mymenu} { variable accelerator - $rootmenu add command -label [say "new_file"] -accelerator "$accelerator+N" - $rootmenu add command -label [say "Open"] -accelerator "$accelerator+O" - $rootmenu add cascade -label [say "Open Recent"] - $rootmenu add separator - $rootmenu add command -label [say "Close"] -accelerator "$accelerator+W" - $rootmenu add command -label [say "Save"] -accelerator "$accelerator+S" - $rootmenu add command -label [say "Save As..."] -accelerator "$accelerator+Shift+S" - #$rootmenu add command -label [say "Save All"] - $rootmenu add command -label [say "Revert to Saved"] - $rootmenu add separator - $rootmenu add command -label [say "Message"] - $rootmenu add separator - $rootmenu add command -label [say "Print..."] -accelerator "$accelerator+P" + $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" + $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" + $mymenu add cascade -label [say "Open Recent"] + $mymenu add separator + $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" + $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" + $mymenu add command -label [say "Save As..."] -accelerator "$accelerator+Shift+S" + #$mymenu add command -label [say "Save All"] + $mymenu add command -label [say "Revert to Saved"] + $mymenu add separator + $mymenu add command -label [say "Message"] + $mymenu add separator + $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" } # the "Edit", "Put", and "Find" menus do not have cross-platform differences -proc ::pd_menus::create_media_menu_aqua {rootmenu} { +proc ::pd_menus::create_media_menu_aqua {mymenu} { } -proc ::pd_menus::create_window_menu_aqua {rootmenu} { +proc ::pd_menus::create_window_menu_aqua {mymenu} { } # the "Help" does not have cross-platform differences @@ -71,29 +128,29 @@ # ------------------------------------------------------------------------------ # menu building functions for UNIX/X11 -proc ::pd_menus::create_file_menu_x11 {rootmenu} { +proc ::pd_menus::create_file_menu_x11 {mymenu} { variable accelerator - $rootmenu add command -label [say "new_file"] -accelerator "$accelerator+N" - $rootmenu add command -label [say "Open"] -accelerator "$accelerator+O" - $rootmenu add separator - $rootmenu add command -label [say "Save"] -accelerator "$accelerator+S" - $rootmenu add command -label [say "Save As..."] -accelerator "Shift+$accelerator+S" - # $rootmenu add command -label "Revert" - $rootmenu add separator - $rootmenu add command -label [say "Message"] -accelerator "$accelerator+M" - $rootmenu add command -label [say "Print..."] -accelerator "$accelerator+P" - $rootmenu add separator - $rootmenu add command -label [say "Close"] -accelerator "$accelerator+W" - $rootmenu add command -label [say "Quit"] -accelerator "$accelerator+Q" \ + $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" + $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" + $mymenu add separator + $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" + $mymenu add command -label [say "Save As..."] -accelerator "Shift+$accelerator+S" + # $mymenu add command -label "Revert" + $mymenu add separator + $mymenu add command -label [say "Message"] -accelerator "$accelerator+M" + $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" + $mymenu add separator + $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" + $mymenu add command -label [say "Quit"] -accelerator "$accelerator+Q" \ -command "pdsend \"pd verifyquit ;\"" } # the "Edit", "Put", and "Find" menus do not have cross-platform differences -proc ::pd_menus::create_media_menu_x11 {rootmenu} { +proc ::pd_menus::create_media_menu_x11 {mymenu} { } -proc ::pd_menus::create_window_menu_x11 {rootmenu} { +proc ::pd_menus::create_window_menu_x11 {mymenu} { } # the "Help" does not have cross-platform differences @@ -101,29 +158,29 @@ # ------------------------------------------------------------------------------ # menu building functions for Windows/Win32 -proc ::pd_menus::create_file_menu_win32 {rootmenu} { +proc ::pd_menus::create_file_menu_win32 {mymenu} { variable accelerator - $rootmenu add command -label [say "new_file"] -accelerator "$accelerator+N" - $rootmenu add command -label [say "Open"] -accelerator "$accelerator+O" - $rootmenu add separator - $rootmenu add command -label [say "Save"] -accelerator "$accelerator+S" - $rootmenu add command -label [say "Save As..."] -accelerator "Shift+$accelerator+S" - # $rootmenu add command -label "Revert" - $rootmenu add separator - $rootmenu add command -label [say "Message"] -accelerator "$accelerator+M" - $rootmenu add command -label [say "Print..."] -accelerator "$accelerator+P" - $rootmenu add separator - $rootmenu add command -label [say "Close"] -accelerator "$accelerator+W" - $rootmenu add command -label [say "Quit"] -accelerator "$accelerator+Q"\ + $mymenu add command -label [say "new_file"] -accelerator "$accelerator+N" + $mymenu add command -label [say "Open"] -accelerator "$accelerator+O" + $mymenu add separator + $mymenu add command -label [say "Save"] -accelerator "$accelerator+S" + $mymenu add command -label [say "Save As..."] -accelerator "Shift+$accelerator+S" + # $mymenu add command -label "Revert" + $mymenu add separator + $mymenu add command -label [say "Message"] -accelerator "$accelerator+M" + $mymenu add command -label [say "Print..."] -accelerator "$accelerator+P" + $mymenu add separator + $mymenu add command -label [say "Close"] -accelerator "$accelerator+W" + $mymenu add command -label [say "Quit"] -accelerator "$accelerator+Q"\ -command "pdsend \"pd verifyquit ;\"" } # the "Edit", "Put", and "Find" menus do not have cross-platform differences -proc ::pd_menus::create_media_menu_win32 {rootmenu} { +proc ::pd_menus::create_media_menu_win32 {mymenu} { } -proc ::pd_menus::create_window_menu_win32 {rootmenu} { +proc ::pd_menus::create_window_menu_win32 {mymenu} { } # the "Help" does not have cross-platform differences @@ -131,214 +188,148 @@ # ------------------------------------------------------------------------------ # menu building functions -proc ::pd_menus::create_file_menu {rootmenu name} { - [format create_file_menu_%s [tk windowingsystem]] $rootmenu - $rootmenu entryconfigure [say "new_file"] -command "menu_new" - $rootmenu entryconfigure [say "Open"] -command "menu_open" - $rootmenu entryconfigure [say "Save"] -command "pdsend \"$name menusave ;\"" - $rootmenu entryconfigure [say "Save As..."] -command "pdsend \"$name menusaveas ;\"" - # $rootmenu entryconfigure "Revert*" -command "menu_revert $name" - $rootmenu entryconfigure [say "Close"] -command "pdsend \"$name menuclose 0 ;\"" - $rootmenu entryconfigure [say "Message"] -command "menu_send" - $rootmenu entryconfigure [say "Print..."] -command "menu_print $name" +proc ::pd_menus::create_file_menu {mymenu mytoplevel} { + [format create_file_menu_%s [tk windowingsystem]] $mymenu + $mymenu entryconfigure [say "new_file"] -command "menu_new" + $mymenu entryconfigure [say "Open"] -command "menu_open" + $mymenu entryconfigure [say "Save"] -command "pdsend \"$mytoplevel menusave ;\"" + $mymenu entryconfigure [say "Save As..."] -command "pdsend \"$mytoplevel menusaveas ;\"" + # $mymenu entryconfigure "Revert*" -command "menu_revert $mytoplevel" + $mymenu entryconfigure [say "Close"] -command "pdsend \"$mytoplevel menuclose 0 ;\"" + $mymenu entryconfigure [say "Message"] -command "menu_send" + $mymenu entryconfigure [say "Print..."] -command "menu_print $mytoplevel" } -proc ::pd_menus::create_edit_menu {rootmenu name} { +proc ::pd_menus::create_edit_menu {mymenu mytoplevel} { variable accelerator - $rootmenu add command -label [say "Undo"] -accelerator "$accelerator+Z" \ - -command "menu_undo $name" - $rootmenu add command -label [say "Redo"] -accelerator "Shift+$accelerator+Z" \ - -command "menu_redo $name" - $rootmenu add separator - $rootmenu add command -label [say "Cut"] -accelerator "$accelerator+X" \ - -command "pdsend \"$name cut ;\"" - $rootmenu add command -label [say "Copy"] -accelerator "$accelerator+C" \ - -command "pdsend \"$name copy ;\"" - $rootmenu add command -label [say "Paste"] -accelerator "$accelerator+V" \ - -command "pdsend \"$name paste ;\"" - $rootmenu add command -label [say "Duplicate"] -accelerator "$accelerator+D" \ - -command "pdsend \"$name duplicate ;\"" - $rootmenu add command -label [say "Select All"] -accelerator "$accelerator+A" \ - -command "pdsend \"$name selectall ;\"" - $rootmenu add separator + $mymenu add command -label [say "Undo"] -accelerator "$accelerator+Z" \ + -command "menu_undo $mytoplevel" + $mymenu add command -label [say "Redo"] -accelerator "Shift+$accelerator+Z" \ + -command "menu_redo $mytoplevel" + $mymenu add separator + $mymenu add command -label [say "Cut"] -accelerator "$accelerator+X" \ + -command "pdsend \"$mytoplevel cut ;\"" + $mymenu add command -label [say "Copy"] -accelerator "$accelerator+C" \ + -command "pdsend \"$mytoplevel copy ;\"" + $mymenu add command -label [say "Paste"] -accelerator "$accelerator+V" \ + -command "pdsend \"$mytoplevel paste ;\"" + $mymenu add command -label [say "Duplicate"] -accelerator "$accelerator+D" \ + -command "pdsend \"$mytoplevel duplicate ;\"" + $mymenu add command -label [say "Select All"] -accelerator "$accelerator+A" \ + -command "pdsend \"$mytoplevel selectall ;\"" + $mymenu add separator if {[tk windowingsystem] eq "aqua"} { - $rootmenu add command -label [say "Text Editor"] \ - -command "menu_texteditor $name" - $rootmenu add command -label [say "Font"] -accelerator "$accelerator+T" \ - -command "menu_font $name" + $mymenu add command -label [say "Text Editor"] \ + -command "menu_texteditor $mytoplevel" + $mymenu add command -label [say "Font"] -accelerator "$accelerator+T" \ + -command "menu_font $mytoplevel" } else { - $rootmenu add command -label [say "Text Editor"] -accelerator "$accelerator+T"\ - -command "menu_texteditor $name" - $rootmenu add command -label [say "Font"] \ - -command "menu_font $name" + $mymenu add command -label [say "Text Editor"] -accelerator "$accelerator+T"\ + -command "menu_texteditor $mytoplevel" + $mymenu add command -label [say "Font"] \ + -command "menu_font $mytoplevel" } - $rootmenu add command -label [say "Tidy Up"] \ - -command "pdsend \"$name tidy ;\"" - $rootmenu add command -label [say "Toggle Console"] -accelerator "Shift+$accelerator+R" \ + $mymenu add command -label [say "Tidy Up"] \ + -command "pdsend \"$mytoplevel tidy ;\"" + $mymenu add command -label [say "Toggle Console"] -accelerator "Shift+$accelerator+R" \ -command {.controls.switches.console invoke} - $rootmenu add command -label [say "Clear Console"] -accelerator "Shift+$accelerator+L" \ + $mymenu add command -label [say "Clear Console"] -accelerator "Shift+$accelerator+L" \ -command "menu_clear_console" - $rootmenu add separator - $rootmenu add radiobutton -label [say "Edit Mode"] -accelerator "$accelerator+E" \ + $mymenu add separator + $mymenu add radiobutton -label [say "Edit Mode"] -accelerator "$accelerator+E" \ -indicatoron true -selectcolor grey85 \ - -command "pdsend \"$name editmode ;\"" \ - + -command "pdsend \"$mytoplevel editmode 0 ;\"" # if { $editable == 0 } { - # $name.m.edit entryconfigure "Edit mode" -indicatoron false + # $mymenu entryconfigure "Edit Mode" -indicatoron false # } + if {[tk windowingsystem] ne "aqua"} { - $rootmenu add separator - $rootmenu add command -label [say "Preferences"] \ + $mymenu add separator + $mymenu add command -label [say "Preferences"] \ -command "menu_preferences" } } -proc ::pd_menus::create_put_menu {rootmenu name} { +proc ::pd_menus::create_put_menu {mymenu mytoplevel} { variable accelerator - $rootmenu add command -label [say "Object"] -accelerator "$accelerator+1" \ - -command "pdsend \"$name obj 0;\"" - $rootmenu add command -label [say "Message"] -accelerator "$accelerator+2" \ - -command "pdsend \"$name msg 0;\"" - $rootmenu add command -label [say "Number"] -accelerator "$accelerator+3" \ - -command "pdsend \"$name floatatom 0;\"" - $rootmenu add command -label [say "Symbol"] -accelerator "$accelerator+4" \ - -command "pdsend \"$name symbolatom 0;\"" - $rootmenu add command -label [say "Comment"] -accelerator "$accelerator+5" \ - -command "pdsend \"$name text 0;\"" - $rootmenu add separator - $rootmenu add command -label [say "Bang"] -accelerator "Shift+$accelerator+B" \ - -command "pdsend \"$name bng 0;\"" - $rootmenu add command -label [say "Toggle"] -accelerator "Shift+$accelerator+T" \ - -command "pdsend \"$name toggle 0;\"" - $rootmenu add command -label [say "Number2"] -accelerator "Shift+$accelerator+N" \ - -command "pdsend \"$name numbox 0;\"" - $rootmenu add command -label [say "Vslider"] -accelerator "Shift+$accelerator+V" \ - -command "pdsend \"$name vslider 0;\"" - $rootmenu add command -label [say "Hslider"] -accelerator "Shift+$accelerator+H" \ - -command "pdsend \"$name hslider 0;\"" - $rootmenu add command -label [say "Vradio"] -accelerator "Shift+$accelerator+D" \ - -command "pdsend \"$name vradio 0;\"" - $rootmenu add command -label [say "Hradio"] -accelerator "Shift+$accelerator+I" \ - -command "pdsend \"$name hradio 0;\"" - $rootmenu add command -label [say "VU Meter"] -accelerator "Shift+$accelerator+U"\ - -command "pdsend \"$name vumeter 0;\"" - $rootmenu add command -label [say "Canvas"] -accelerator "Shift+$accelerator+C" \ - -command "pdsend \"$name mycnv 0;\"" - $rootmenu add separator - $rootmenu add command -label Graph -command "pdsend \"$name graph ;\"" - $rootmenu add command -label Array -command "pdsend \"$name menuarray ;\"" + $mymenu add command -label [say "Object"] -accelerator "$accelerator+1" \ + -command "pdsend \"$mytoplevel obj 0;\"" + $mymenu add command -label [say "Message"] -accelerator "$accelerator+2" \ + -command "pdsend \"$mytoplevel msg 0;\"" + $mymenu add command -label [say "Number"] -accelerator "$accelerator+3" \ + -command "pdsend \"$mytoplevel floatatom 0;\"" + $mymenu add command -label [say "Symbol"] -accelerator "$accelerator+4" \ + -command "pdsend \"$mytoplevel symbolatom 0;\"" + $mymenu add command -label [say "Comment"] -accelerator "$accelerator+5" \ + -command "pdsend \"$mytoplevel text 0;\"" + $mymenu add separator + $mymenu add command -label [say "Bang"] -accelerator "Shift+$accelerator+B" \ + -command "pdsend \"$mytoplevel bng 0;\"" + $mymenu add command -label [say "Toggle"] -accelerator "Shift+$accelerator+T" \ + -command "pdsend \"$mytoplevel toggle 0;\"" + $mymenu add command -label [say "Number2"] -accelerator "Shift+$accelerator+N" \ + -command "pdsend \"$mytoplevel numbox 0;\"" + $mymenu add command -label [say "Vslider"] -accelerator "Shift+$accelerator+V" \ + -command "pdsend \"$mytoplevel vslider 0;\"" + $mymenu add command -label [say "Hslider"] -accelerator "Shift+$accelerator+H" \ + -command "pdsend \"$mytoplevel hslider 0;\"" + $mymenu add command -label [say "Vradio"] -accelerator "Shift+$accelerator+D" \ + -command "pdsend \"$mytoplevel vradio 0;\"" + $mymenu add command -label [say "Hradio"] -accelerator "Shift+$accelerator+I" \ + -command "pdsend \"$mytoplevel hradio 0;\"" + $mymenu add command -label [say "VU Meter"] -accelerator "Shift+$accelerator+U"\ + -command "pdsend \"$mytoplevel vumeter 0;\"" + $mymenu add command -label [say "Canvas"] -accelerator "Shift+$accelerator+C" \ + -command "pdsend \"$mytoplevel mycnv 0;\"" + $mymenu add separator + $mymenu add command -label Graph -command "pdsend \"$mytoplevel graph ;\"" + $mymenu add command -label Array -command "pdsend \"$mytoplevel menuarray ;\"" } -proc ::pd_menus::create_find_menu {rootmenu name} { +proc ::pd_menus::create_find_menu {mymenu mytoplevel} { variable accelerator - $rootmenu add command -label [say "Find..."] -accelerator "$accelerator+F" \ - -command "menu_findobject $name" - $rootmenu add command -label [say "Find Again"] -accelerator "$accelerator+G" \ - -command "pdsend \"$name findagain ;\"" - $rootmenu add command -label [say "Find last error"] \ - -command "pdsend \"$name finderror ;\"" + $mymenu add command -label [say "Find..."] -accelerator "$accelerator+F" \ + -command "menu_findobject $mytoplevel" + $mymenu add command -label [say "Find Again"] -accelerator "$accelerator+G" \ + -command "pdsend \"$mytoplevel findagain ;\"" + $mymenu add command -label [say "Find last error"] \ + -command "pdsend \"$mytoplevel finderror ;\"" } -proc ::pd_menus::create_media_menu {rootmenu name} { +proc ::pd_menus::create_media_menu {mymenu mytoplevel} { variable accelerator - $rootmenu add radiobutton -label [say "Compute Audio On"] -accelerator "$accelerator+/" \ + $mymenu add radiobutton -label [say "Compute Audio On"] -accelerator "$accelerator+/" \ -command "pdsend \"pd dsp 1 ;\"" - $rootmenu add radiobutton -label [say "Compute Audio Off"] -accelerator "$accelerator+." \ + $mymenu add radiobutton -label [say "Compute Audio Off"] -accelerator "$accelerator+." \ -command "pdsend \"pd dsp 0 ;\"" -indicatoron true - $rootmenu add separator - $rootmenu add command -label [say "Test Audio and MIDI"] \ + $mymenu add separator + $mymenu add command -label [say "Test Audio and MIDI"] \ -command "menu_doc_open doc/7.stuff/tools testtone.pd" - $rootmenu add command -label [say "Load Meter"] \ + $mymenu add command -label [say "Load Meter"] \ -command "menu_doc_open doc/7.stuff/tools load-meter.pd" } -proc ::pd_menus::create_window_menu {rootmenu name} { +proc ::pd_menus::create_window_menu {mymenu mytoplevel} { variable accelerator if {[tk windowingsystem] eq "aqua"} { - $rootmenu add command -label [say "Minimize"] -command "menu_minimize ." \ + $mymenu add command -label [say "Minimize"] -command "menu_minimize ." \ -accelerator "$accelerator+M" - $rootmenu add command -label [say "Zoom"] -command "menu_zoom ." - $rootmenu add separator + $mymenu add command -label [say "Zoom"] -command "menu_zoom ." + $mymenu add separator } - $rootmenu add command -label [say "Parent Window"] -state disabled - $rootmenu add command -label [say "Pd window"] -command "menu_raise_console" \ + $mymenu add command -label [say "Parent Window"] -state disabled + $mymenu add command -label [say "Pd window"] -command "menu_raise_console" \ -accelerator "$accelerator+R" -state disabled - $rootmenu add separator + $mymenu add separator } -proc ::pd_menus::create_help_menu {rootmenu name} { +proc ::pd_menus::create_help_menu {mymenu mytoplevel} { if {[tk windowingsystem] ne "aqua"} { - $rootmenu add command -label {About Pd} \ + $mymenu add command -label {About Pd} \ -command "placeholder menu_doc_open doc/1.manual 1.introduction.txt" } - $rootmenu add command -label {HTML ...} \ + $mymenu add command -label {HTML ...} \ -command "placeholder menu_doc_open doc/1.manual index.htm" - $rootmenu add command -label {Browser ...} \ + $mymenu add command -label {Browser ...} \ -command "placeholder menu_helpbrowser \$help_top_directory" } - - -# for the Apple application menu on Mac OS X -# proc ::tk::mac::ShowPreferences {} { -# puts stderr "apple prefs menu item callback" -# puts stderr "::tk::mac::ShowPreferences " -# menu_preferences -# } - -# for Mac OS X only -proc ::pd_menus::make_apple_menu {rootmenu} { - puts stderr CREATE_APPLE_MENU - # TODO this should open a Pd patch called about.pd - menu $rootmenu.apple - $rootmenu.apple add command -label [say "About Pd"] \ - -command "menu_doc_open doc/1.manual 1.introduction.txt" - $rootmenu add cascade -label "Apple" -menu $rootmenu.apple - # starting in 8.4.14, this is created automatically - if {[regsub -- {[0-9]\.[0-9]\.([0-9][0-9]*)} [info patchlevel] {\1}] < 14} { - $rootmenu.apple add separator - $rootmenu.apple add command -label [say "Preferences..."] \ - -command "menu_preferences" -accelerator "Cmd+," - } -} - -# for Windows only -proc ::pd_menus::make_system_menu {rootmenu} { - $rootmenu add cascade -menu [menu $rootmenu.system] - # TODO add Close, Minimize, etc and whatever else is on the little menu - # that is on the top left corner of the window frame -} - -proc ::pd_menus::create_menubar {rootmenu} { - menu $rootmenu - set menulist "file edit put find media window help" - if { [tk windowingsystem] eq "aqua" } {make_apple_menu $rootmenu} - if { [tk windowingsystem] eq "win32" } {make_system_menu $rootmenu} - foreach menuitem $menulist { - menu $rootmenu.$menuitem - $rootmenu add cascade -label [string totitle $menuitem] \ - -menu $rootmenu.$menuitem - [format create_%s_menu $menuitem] $rootmenu.$menuitem PLACEHOLDER - if {[tk windowingsystem] eq "win32"} { - # fix menu font size on Windows with tk scaling = 1 - $rootmenu.$menuitem configure -font menufont - } - } -} - -proc ::pd_menus::configure_pdwindow {menubar} { - # these are meaningless for the Pd window, so disable them - set file_items_to_disable {"Save" "Save As..." "Print..." "Close"} - foreach item $file_items_to_disable { - $menubar.file entryconfigure $item -state disabled - } - set edit_items_to_disable {"Undo" "Redo" "Duplicate" "Tidy Up" "Edit Mode"} - foreach item $edit_items_to_disable { - $menubar.edit entryconfigure $item -state disabled - } - # disable everything on the Put menu - for {set i 0} {$i <= [$menubar.put index end]} {incr i} { - # catch errors by trying to disable separators - catch {$menubar.put entryconfigure $i -state disabled } - } -} - Modified: branches/pd-devel/0.41.4/src/pdtk_canvas.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-01-13 17:13:31 UTC (rev 10532) +++ branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-01-13 17:57:25 UTC (rev 10533) @@ -6,14 +6,7 @@ namespace eval ::pdtk_canvas:: { } - -# get the name of the toplevel window for a canvas; this is also the name of -# the canvas object in Pd. It would probably make more sense if bind's %W returned the window name ($name) rather than the canvas name -proc to_top {canvasname} { - string range $canvasname 0 [expr [string length $canvasname] - 3] -} - -proc pdtk_canvas_checkgeometry {topname} { +proc pdtk_canvas_checkgeometry {mytoplevel} { # TODO check and relocate window accordingly } @@ -21,28 +14,32 @@ #------------------------------------------------------------------------------# # mouse usage -proc pdtk_canvas_motion {canvasname x y mods} { - pdsend "[to_top $canvasname] motion [$canvasname canvasx $x] [$canvasname canvasy $y] $mods;" +proc pdtk_canvas_motion {mycanvas x y mods} { + set mytoplevel [winfo toplevel $mycanvas] + pdsend "$mytoplevel motion [$mycanvas canvasx $x] [$mycanvas canvasy $y] $mods;" } -proc pdtk_canvas_mouse {canvasname x y b f} { +proc pdtk_canvas_mouse {mycanvas x y b f} { # TODO perhaps the Tcl/C function names should match "mouse" message # rather than "mousedown" function - pdsend "[to_top $canvasname] mouse [$canvasname canvasx $x] [$canvasname canvasy $y] $b $f;" + set mytoplevel [winfo toplevel $mycanvas] + pdsend "$mytoplevel mouse [$mycanvas canvasx $x] [$mycanvas canvasy $y] $b $f;" } -proc pdtk_canvas_mouseup {canvasname x y b} { - pdsend "[to_top $canvasname] mouseup [$canvasname canvasx $x] [$canvasname canvasy $y] $b;" +proc pdtk_canvas_mouseup {mycanvas x y b} { + set mytoplevel [winfo toplevel $mycanvas] + pdsend "$mytoplevel mouseup [$mycanvas canvasx $x] [$mycanvas canvasy $y] $b;" } -proc pdtk_canvas_rightclick {canvasname x y b} { - pdsend "[to_top $canvasname] mouse [$canvasname canvasx $x] [$canvasname canvasy $y] $b 8;" +proc pdtk_canvas_rightclick {mycanvas x y b} { + set mytoplevel [winfo toplevel $mycanvas] + pdsend "$mytoplevel mouse [$mycanvas canvasx $x] [$mycanvas canvasy $y] $b 8;" } -# on X11, button 2 "pastes" from the X windows clipboard -proc pdtk_canvas_clickpaste {canvasname x y b} { - pdtk_canvas_click $canvasname $x $y $b 0 - pdtk_canvas_mouseup $canvasname $x $y $b +# on X11, button 2 pastes from X11 clipboard, so simulate normal paste actions +proc pdtk_canvas_clickpaste {mycanvas x y b} { + pdtk_canvas_mouse $mycanvas $x $y $b 0 + pdtk_canvas_mouseup $mycanvas $x $y $b pdtk_pastetext } @@ -52,19 +49,19 @@ # "map" event tells us when the canvas becomes visible (arg is "0") or # invisible (arg is ""). Invisibility means the Window Manager has minimized # us. We don't get a final "unmap" event when we destroy the window. -proc pdtk_canvas_map {name} { - pdsend "$name map 1 ;" +proc pdtk_canvas_map {mytoplevel} { + pdsend "$mytoplevel map 1 ;" } -proc pdtk_canvas_unmap {name} { - pdsend "$name map 0 ;" +proc pdtk_canvas_unmap {mytoplevel} { + pdsend "$mytoplevel map 0 ;" } # check or uncheck the "edit" menu item -proc pdtk_canvas_editval {name value} { - $name.m.edit entryconfigure "Edit mode" -indicatoron $value +proc pdtk_canvas_editval {mytoplevel value} { + # TODO make this work } -proc pdtk_canvas_getscroll {name} { +proc pdtk_canvas_getscroll {mytoplevel} { # TODO make this work } Modified: branches/pd-devel/0.41.4/src/pdtk_text.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_text.tcl 2009-01-13 17:13:31 UTC (rev 10532) +++ branches/pd-devel/0.41.4/src/pdtk_text.tcl 2009-01-13 17:57:25 UTC (rev 10533) @@ -8,20 +8,19 @@ # TODO use a Tk 'font' as the main font ############ pdtk_text_new -- create a new text object #2########### -proc pdtk_text_new {canvasname itemname x y text font_size color} { - global font_family font_weight - $canvasname create text $x $y -font "$font_family $font_size $font_weight" \ - -tags $itemname -text $text -fill $color -anchor nw - $canvasname bind $itemname <Home> "$canvasname icursor $itemname 0" - $canvasname bind $itemname <End> "$canvasname icursor $itemname end" +proc pdtk_text_new {mycanvas canvasitem x y text font_size color} { + $mycanvas create text $x $y -tags $canvasitem -text $text -fill $color \ + -anchor nw -font "$::font_family $font_size $::font_weight" + $mycanvas bind $canvasitem <Home> "$mycanvas icursor $canvasitem 0" + $mycanvas bind $canvasitem <End> "$mycanvas icursor $canvasitem end" if {[tk windowingsystem] eq "aqua"} { # emacs bindings for Mac OS X - $canvasname bind $itemname <Control-a> "$canvasname icursor $itemname 0" - $canvasname bind $itemname <Control-e> "$canvasname icursor $itemname end" + $mycanvas bind $canvasitem <Control-a> "$mycanvas icursor $canvasitem 0" + $mycanvas bind $canvasitem <Control-e> "$mycanvas icursor $canvasitem end" } } ################ pdtk_text_set -- change the text ################## -proc pdtk_text_set {canvasname itemname text} { - $canvasname itemconfig $itemname -text $text +proc pdtk_text_set {mycanvas canvasitem text} { + $mycanvas itemconfig $canvasitem -text $text } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10532] trunk/externals/iem/iem_bin_ambi/src
by zmoelnig＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10532 http://pure-data.svn.sourceforge.net/pure-data/?rev=10532&view=rev Author: zmoelnig Date: 2009-01-13 17:13:31 +0000 (Tue, 13 Jan 2009) Log Message: ----------- start for 64bit; broken for now.. Modified Paths: -------------- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_calc_HRTF.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode2.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft2.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir.c trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir2.c trunk/externals/iem/iem_bin_ambi/src/iemlib.h Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_calc_HRTF.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_calc_HRTF.c 2009-01-13 17:03:08 UTC (rev 10531) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_calc_HRTF.c 2009-01-13 17:13:31 UTC (rev 10532) @@ -233,7 +233,7 @@ { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &fadevec)) + else if (!iemarray_getarray(a, &npoints, &fadevec)) error("%s: bad template for bin_ambi_calc_HRTF", x->x_s_fade_out_hrir->s_name); else if (npoints < x->x_fftsize) error("%s: bad array-size: %d", x->x_s_fade_out_hrir->s_name, npoints); @@ -301,19 +301,19 @@ if (!(a = (t_garray *)pd_findbyclass(hrtf_re, garray_class))) error("%s: no such array", hrtf_re->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_re)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_re)) error("%s: bad template for bin_ambi_calc_HRTF", hrtf_re->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_re->s_name, npoints); else if (!(a = (t_garray *)pd_findbyclass(hrtf_im, garray_class))) error("%s: no such array", hrtf_im->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_im)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_im)) error("%s: bad template for bin_ambi_calc_HRTF", hrtf_im->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_im->s_name, npoints); else if (!(a = (t_garray *)pd_findbyclass(hrir, garray_class))) error("%s: no such array", hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir)) error("%s: bad template for bin_ambi_calc_HRTF", hrir->s_name); else { Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode.c 2009-01-13 17:03:08 UTC (rev 10531) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode.c 2009-01-13 17:13:31 UTC (rev 10532) @@ -644,7 +644,7 @@ { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &fadevec)) + else if (!iemarray_getarray(a, &npoints, &fadevec)) error("%s: bad template for bin_ambi_reduced_decode", x->x_s_fade_out_hrir->s_name); else if (npoints < x->x_fftsize) error("%s: bad array-size: %d", x->x_s_fade_out_hrir->s_name, npoints); @@ -714,19 +714,19 @@ if (!(a = (t_garray *)pd_findbyclass(hrtf_re, garray_class))) error("%s: no such array", hrtf_re->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_re)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_re)) error("%s: bad template for bin_ambi_reduced_decode", hrtf_re->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_re->s_name, npoints); else if (!(a = (t_garray *)pd_findbyclass(hrtf_im, garray_class))) error("%s: no such array", hrtf_im->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_im)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_im)) error("%s: bad template for bin_ambi_reduced_decode", hrtf_im->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_im->s_name, npoints); else if (!(a = (t_garray *)pd_findbyclass(hrir, garray_class))) error("%s: no such array", hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir)) error("%s: bad template for bin_ambi_reduced_decode", hrir->s_name); else { Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode2.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode2.c 2009-01-13 17:03:08 UTC (rev 10531) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode2.c 2009-01-13 17:13:31 UTC (rev 10532) @@ -670,7 +670,7 @@ { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &fadevec)) + else if (!iemarray_getarray(a, &npoints, &fadevec)) error("%s: bad template for bin_ambi_reduced_decode2", x->x_s_fade_out_hrir->s_name); else if (npoints < x->x_fftsize) error("%s: bad array-size: %d", x->x_s_fade_out_hrir->s_name, npoints); @@ -739,7 +739,7 @@ hrir = x->x_s_hrir[index]; if (!(a = (t_garray *)pd_findbyclass(hrir, garray_class))) error("%s: no such array", hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir)) error("%s: bad template for bin_ambi_reduced_decode2", hrir->s_name); else { @@ -793,13 +793,13 @@ if (!(a = (t_garray *)pd_findbyclass(hrtf_re, garray_class))) error("%s: no such array", hrtf_re->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_re)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_re)) error("%s: bad template for bin_ambi_reduced_decode2", hrtf_re->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_re->s_name, npoints); else if (!(a = (t_garray *)pd_findbyclass(hrtf_im, garray_class))) error("%s: no such array", hrtf_im->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_im)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_im)) error("%s: bad template for bin_ambi_reduced_decode2", hrtf_im->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_im->s_name, npoints); Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft.c 2009-01-13 17:03:08 UTC (rev 10531) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft.c 2009-01-13 17:13:31 UTC (rev 10532) @@ -794,7 +794,7 @@ { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &fadevec)) + else if (!iemarray_getarray(a, &npoints, &fadevec)) error("%s: bad template for bin_ambi_reduced_decode_fft", x->x_s_fade_out_hrir->s_name); else if (npoints < x->x_fftsize) error("%s: bad array-size: %d", x->x_s_fade_out_hrir->s_name, npoints); @@ -864,7 +864,7 @@ hrir = x->x_s_hrir[index]; if (!(a = (t_garray *)pd_findbyclass(hrir, garray_class))) error("%s: no such array", hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir)) error("%s: bad template for bin_ambi_reduced_decode_fft", hrir->s_name); else { @@ -918,13 +918,13 @@ if (!(a = (t_garray *)pd_findbyclass(hrtf_re, garray_class))) error("%s: no such array", hrtf_re->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_re)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_re)) error("%s: bad template for bin_ambi_reduced_decode_fft", hrtf_re->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_re->s_name, npoints); else if (!(a = (t_garray *)pd_findbyclass(hrtf_im, garray_class))) error("%s: no such array", hrtf_im->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_im)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_im)) error("%s: bad template for bin_ambi_reduced_decode_fft", hrtf_im->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_im->s_name, npoints); Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft2.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft2.c 2009-01-13 17:03:08 UTC (rev 10531) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fft2.c 2009-01-13 17:13:31 UTC (rev 10532) @@ -654,7 +654,7 @@ { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &fadevec)) + else if (!iemarray_getarray(a, &npoints, &fadevec)) error("%s: bad template for bin_ambi_reduced_decode_fft2", x->x_s_fade_out_hrir->s_name); else if (npoints < x->x_fftsize) error("%s: bad array-size: %d", x->x_s_fade_out_hrir->s_name, npoints); @@ -756,7 +756,7 @@ hrir = x->x_s_hrir[index]; if (!(a = (t_garray *)pd_findbyclass(hrir, garray_class))) error("%s: no such array", hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir)) error("%s: bad template for bin_ambi_reduced_decode_fft2", hrir->s_name); else { @@ -810,13 +810,13 @@ if (!(a = (t_garray *)pd_findbyclass(hrtf_re, garray_class))) error("%s: no such array", hrtf_re->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_re)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_re)) error("%s: bad template for bin_ambi_reduced_decode_fft2", hrtf_re->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_re->s_name, npoints); else if (!(a = (t_garray *)pd_findbyclass(hrtf_im, garray_class))) error("%s: no such array", hrtf_im->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrtf_im)) + else if (!iemarray_getarray(a, &npoints, &vec_hrtf_im)) error("%s: bad template for bin_ambi_reduced_decode_fft2", hrtf_im->s_name); else if (npoints < fftsize) error("%s: bad array-size: %d", hrtf_im->s_name, npoints); Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir.c 2009-01-13 17:03:08 UTC (rev 10531) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir.c 2009-01-13 17:13:31 UTC (rev 10532) @@ -768,13 +768,13 @@ { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; if((int)(x->x_beg_fade_out_hrir) == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &fadevec)) + else if (!iemarray_getarray(a, &npoints, &fadevec)) error("%s: bad template for bin_ambi_reduced_decode_fir", x->x_s_fade_out_hrir->s_name); else if (npoints < x->x_firsize) error("%s: bad array-size: %d", x->x_s_fade_out_hrir->s_name, npoints); @@ -833,7 +833,8 @@ t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + iemarray_t *vec_hrir; + t_float *vec, *vec_fade_out_hrir; float decr, sum; if(index < 0) @@ -844,7 +845,7 @@ hrir = x->x_s_hrir[index]; if (!(a = (t_garray *)pd_findbyclass(hrir, garray_class))) error("%s: no such array", hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir)) error("%s: bad template for bin_ambi_reduced_decode_fir", hrir->s_name); else { @@ -885,7 +886,7 @@ t_garray *a; int npoints; int firsize = x->x_firsize; - t_float *vec_hrir_red; + iemarray_t *vec_hrir_red; t_symbol *hrir_red; if(index < 0) @@ -897,7 +898,7 @@ if (!(a = (t_garray *)pd_findbyclass(hrir_red, garray_class))) error("%s: no such array", hrir_red->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir_red)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir_red)) error("%s: bad template for bin_ambi_reduced_decode_fir", hrir_red->s_name); else if (npoints < firsize) error("%s: bad array-size: %d", hrir_red->s_name, npoints); Modified: trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir2.c =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir2.c 2009-01-13 17:03:08 UTC (rev 10531) +++ trunk/externals/iem/iem_bin_ambi/src/bin_ambi_reduced_decode_fir2.c 2009-01-13 17:13:31 UTC (rev 10532) @@ -633,7 +633,7 @@ { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &fadevec)) + else if (!iemarray_getarray(a, &npoints, &fadevec)) error("%s: bad template for bin_ambi_reduced_decode_fir2", x->x_s_fade_out_hrir->s_name); else if (npoints < x->x_firsize) error("%s: bad array-size: %d", x->x_s_fade_out_hrir->s_name, npoints); @@ -734,7 +734,7 @@ hrir = x->x_s_hrir[index]; if (!(a = (t_garray *)pd_findbyclass(hrir, garray_class))) error("%s: no such array", hrir->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir)) error("%s: bad template for bin_ambi_reduced_decode_fir2", hrir->s_name); else { @@ -787,7 +787,7 @@ if (!(a = (t_garray *)pd_findbyclass(hrir_red, garray_class))) error("%s: no such array", hrir_red->s_name); - else if (!garray_getfloatarray(a, &npoints, &vec_hrir_red)) + else if (!iemarray_getarray(a, &npoints, &vec_hrir_red)) error("%s: bad template for bin_ambi_reduced_decode_fir2", hrir_red->s_name); else if (npoints < firsize) error("%s: bad array-size: %d", hrir_red->s_name, npoints); Modified: trunk/externals/iem/iem_bin_ambi/src/iemlib.h =================================================================== --- trunk/externals/iem/iem_bin_ambi/src/iemlib.h 2009-01-13 17:03:08 UTC (rev 10531) +++ trunk/externals/iem/iem_bin_ambi/src/iemlib.h 2009-01-13 17:13:31 UTC (rev 10532) @@ -99,4 +99,16 @@ #endif + +/* on 64bit systems we cannot use garray_getfloatarray... */ +#if (defined __x86_64__) +# define iemarray_t t_word +# define iemarray_getarray garray_getfloatwords +# define iemarray_getfloat(pointer, index) (pointer[index].w_float) +#else +# define iemarray_t t_float +# define iemarray_getarray garray_getfloatarray +# define iemarray_getfloat(pointer, index) (pointer[index]) #endif + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10531] trunk/externals/iem/iem_spec2/src
by zmoelnig＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10531 http://pure-data.svn.sourceforge.net/pure-data/?rev=10531&view=rev Author: zmoelnig Date: 2009-01-13 17:03:08 +0000 (Tue, 13 Jan 2009) Log Message: ----------- really made array access 64bit able Modified Paths: -------------- trunk/externals/iem/iem_spec2/src/spec2_tab_conv~.c trunk/externals/iem/iem_spec2/src/spec2_tabreceive_enable~.c trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c Modified: trunk/externals/iem/iem_spec2/src/spec2_tab_conv~.c =================================================================== --- trunk/externals/iem/iem_spec2/src/spec2_tab_conv~.c 2009-01-13 16:50:33 UTC (rev 10530) +++ trunk/externals/iem/iem_spec2/src/spec2_tab_conv~.c 2009-01-13 17:03:08 UTC (rev 10531) @@ -39,7 +39,8 @@ t_float *out = (t_float *)(w[2]); t_spec2_tab_conv_tilde *x = (t_spec2_tab_conv_tilde *)(w[3]); t_float sum=0.0f; - t_float *vec1, *vec2, *vec3, *win; + t_float *vec1, *vec2, *vec3; + iemarray_t*win; int i, m, n = (int)(w[4])+1; int j, ws=x->x_winsize; @@ -61,7 +62,7 @@ { sum = 0.0f; for(j=0; j<ws; j++) - sum += win[j] * vec2[j]; + sum += iemarray_getfloat(win, j) * vec2[j]; out[i] = sum; vec2++; } @@ -125,7 +126,7 @@ argv++; x->x_winsize = (int)(atom_getint(argv)); x->x_spec = (t_float *)0; - x->x_beg_array = (t_float *)0; + x->x_beg_array = (iemarray_t *)0; x->x_blocksize = 0; x->x_has_changed = 1; outlet_new(&x->x_obj, &s_signal); Modified: trunk/externals/iem/iem_spec2/src/spec2_tabreceive_enable~.c =================================================================== --- trunk/externals/iem/iem_spec2/src/spec2_tabreceive_enable~.c 2009-01-13 16:50:33 UTC (rev 10530) +++ trunk/externals/iem/iem_spec2/src/spec2_tabreceive_enable~.c 2009-01-13 17:03:08 UTC (rev 10531) @@ -38,11 +38,13 @@ t_spec2_tabreceive_enable_tilde *x = (t_spec2_tabreceive_enable_tilde *)(w[1]); t_float *out = (t_float *)(w[2]); int n = w[3]+1; - t_float *vec = x->x_vec; + iemarray_t *vec = x->x_vec; if(vec && x->x_enable) - while(n--) - *out++ = *vec++; + while(n--) { + *out++ = iemarray_getfloat(vec, 0); + vec++; + } else while(n--) *out++ = 0.0f; @@ -54,34 +56,34 @@ t_spec2_tabreceive_enable_tilde *x = (t_spec2_tabreceive_enable_tilde *)(w[1]); t_float *out = (t_float *)(w[2]); int n = w[3]; - t_float *vec = x->x_vec; + iemarray_t *vec = x->x_vec; if(vec && x->x_enable) { while(n) { - out[0] = vec[0]; - out[1] = vec[1]; - out[2] = vec[2]; - out[3] = vec[3]; - out[4] = vec[4]; - out[5] = vec[5]; - out[6] = vec[6]; - out[7] = vec[7]; - out[8] = vec[8]; - out[9] = vec[9]; - out[10] = vec[10]; - out[11] = vec[11]; - out[12] = vec[12]; - out[13] = vec[13]; - out[14] = vec[14]; - out[15] = vec[15]; + out[0] = iemarray_getfloat(vec, 0); + out[1] = iemarray_getfloat(vec, 1); + out[2] = iemarray_getfloat(vec, 2); + out[3] = iemarray_getfloat(vec, 3); + out[4] = iemarray_getfloat(vec, 4); + out[5] = iemarray_getfloat(vec, 5); + out[6] = iemarray_getfloat(vec, 6); + out[7] = iemarray_getfloat(vec, 7); + out[8] = iemarray_getfloat(vec, 8); + out[9] = iemarray_getfloat(vec, 9); + out[10] = iemarray_getfloat(vec, 10); + out[11] = iemarray_getfloat(vec, 11); + out[12] = iemarray_getfloat(vec, 12); + out[13] = iemarray_getfloat(vec, 13); + out[14] = iemarray_getfloat(vec, 14); + out[15] = iemarray_getfloat(vec, 15); vec += 16; out += 16; n -= 16; } - out[0] = vec[0]; + out[0] = iemarray_getfloat(vec, 0); } else { Modified: trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c =================================================================== --- trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c 2009-01-13 16:50:33 UTC (rev 10530) +++ trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c 2009-01-13 17:03:08 UTC (rev 10531) @@ -28,14 +28,20 @@ t_float *out = (t_float *)(w[2]); int n = w[3]+1; iemarray_t *vec = x->x_vec; - if(vec) + while(n--) { +#ifdef __x86_64__ + t_word wp=*vec++; + *out++=wp.w_float; +#else + *out++ = *vec++; +#endif + } + else while(n--) - *out++ = *vec++; - else - while(n--) - *out++ = 0.0f; - return(w+4); + *out++ = 0.0f; + return(w+4); + } static t_int *spec2_tabreceive_tilde_perf16(t_int *w) @@ -49,28 +55,28 @@ { while(n) { - out[0] = vec[0]; - out[1] = vec[1]; - out[2] = vec[2]; - out[3] = vec[3]; - out[4] = vec[4]; - out[5] = vec[5]; - out[6] = vec[6]; - out[7] = vec[7]; - out[8] = vec[8]; - out[9] = vec[9]; - out[10] = vec[10]; - out[11] = vec[11]; - out[12] = vec[12]; - out[13] = vec[13]; - out[14] = vec[14]; - out[15] = vec[15]; - + out[0] = iemarray_getfloat(vec, 0); + out[1] = iemarray_getfloat(vec, 1); + out[2] = iemarray_getfloat(vec, 2); + out[3] = iemarray_getfloat(vec, 3); + out[4] = iemarray_getfloat(vec, 4); + out[5] = iemarray_getfloat(vec, 5); + out[6] = iemarray_getfloat(vec, 6); + out[7] = iemarray_getfloat(vec, 7); + out[8] = iemarray_getfloat(vec, 8); + out[9] = iemarray_getfloat(vec, 9); + out[10] = iemarray_getfloat(vec, 10); + out[11] = iemarray_getfloat(vec, 11); + out[12] = iemarray_getfloat(vec, 12); + out[13] = iemarray_getfloat(vec, 13); + out[14] = iemarray_getfloat(vec, 14); + out[15] = iemarray_getfloat(vec, 15); + vec += 16; out += 16; n -= 16; } - out[0] = vec[0]; + out[0] = iemarray_getfkiat(vec, 0); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10530] trunk/externals/iem/iem_spec2/src
by zmoelnig＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10530 http://pure-data.svn.sourceforge.net/pure-data/?rev=10530&view=rev Author: zmoelnig Date: 2009-01-13 16:50:33 +0000 (Tue, 13 Jan 2009) Log Message: ----------- make array access 64bit-able Modified Paths: -------------- trunk/externals/iem/iem_spec2/src/iemlib.h trunk/externals/iem/iem_spec2/src/spec2_tab_conv~.c trunk/externals/iem/iem_spec2/src/spec2_tabreceive_enable~.c trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c Modified: trunk/externals/iem/iem_spec2/src/iemlib.h =================================================================== --- trunk/externals/iem/iem_spec2/src/iemlib.h 2009-01-13 16:40:12 UTC (rev 10529) +++ trunk/externals/iem/iem_spec2/src/iemlib.h 2009-01-13 16:50:33 UTC (rev 10530) @@ -99,4 +99,16 @@ #endif +/* on 64bit systems we cannot use garray_getfloatarray... */ +#if (defined __x86_64__) +# define iemarray_t t_word +# define iemarray_getarray garray_getfloatwords +# define iemarray_getfloat(pointer, index) (pointer[index].w_float) +#else +# define iemarray_t t_float +# define iemarray_getarray garray_getfloatarray +# define iemarray_getfloat(pointer, index) (pointer[index]) #endif + + +#endif Modified: trunk/externals/iem/iem_spec2/src/spec2_tab_conv~.c =================================================================== --- trunk/externals/iem/iem_spec2/src/spec2_tab_conv~.c 2009-01-13 16:40:12 UTC (rev 10529) +++ trunk/externals/iem/iem_spec2/src/spec2_tab_conv~.c 2009-01-13 16:50:33 UTC (rev 10530) @@ -12,7 +12,7 @@ { t_object x_obj; t_float *x_spec; - t_float *x_beg_array; + iemarray_t *x_beg_array; int x_blocksize; int x_winsize; int x_has_changed; @@ -82,7 +82,7 @@ if(*x->x_sym_array->s_name) error("spec2_tab_conv~: %s: no such array", x->x_sym_array->s_name); } - else if(!garray_getfloatarray(a, &n_points, &x->x_beg_array)) + else if(!iemarray_getarray(a, &n_points, &x->x_beg_array)) error("%s: bad template for spec2_tab_conv~", x->x_sym_array->s_name); else { Modified: trunk/externals/iem/iem_spec2/src/spec2_tabreceive_enable~.c =================================================================== --- trunk/externals/iem/iem_spec2/src/spec2_tabreceive_enable~.c 2009-01-13 16:40:12 UTC (rev 10529) +++ trunk/externals/iem/iem_spec2/src/spec2_tabreceive_enable~.c 2009-01-13 16:50:33 UTC (rev 10530) @@ -13,7 +13,7 @@ typedef struct _spec2_tabreceive_enable_tilde { t_object x_obj; - t_float *x_vec; + iemarray_t *x_vec; t_symbol *x_arrayname; int x_enable; } t_spec2_tabreceive_enable_tilde; @@ -123,7 +123,7 @@ if(*x->x_arrayname->s_name) error("spec2_tabreceive_enable~: %s: no such array", x->x_arrayname->s_name); } - else if(!garray_getfloatarray(a, &vecsize, &x->x_vec)) + else if(!iemarray_getarray(a, &vecsize, &x->x_vec)) error("%s: bad template for spec2_tabreceive_enable~", x->x_arrayname->s_name); else { Modified: trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c =================================================================== --- trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c 2009-01-13 16:40:12 UTC (rev 10529) +++ trunk/externals/iem/iem_spec2/src/spec2_tabreceive~.c 2009-01-13 16:50:33 UTC (rev 10530) @@ -13,7 +13,7 @@ typedef struct _spec2_tabreceive_tilde { t_object x_obj; - t_float *x_vec; + iemarray_t*x_vec; t_symbol *x_arrayname; } t_spec2_tabreceive_tilde; @@ -27,7 +27,7 @@ t_spec2_tabreceive_tilde *x = (t_spec2_tabreceive_tilde *)(w[1]); t_float *out = (t_float *)(w[2]); int n = w[3]+1; - t_float *vec = x->x_vec; + iemarray_t *vec = x->x_vec; if(vec) while(n--) @@ -43,7 +43,7 @@ t_spec2_tabreceive_tilde *x = (t_spec2_tabreceive_tilde *)(w[1]); t_float *out = (t_float *)(w[2]); int n = w[3]; - t_float *vec = x->x_vec; + iemarray_t *vec = x->x_vec; if(vec) { @@ -112,7 +112,7 @@ if(*x->x_arrayname->s_name) error("spec2_tabreceive~: %s: no such array", x->x_arrayname->s_name); } - else if(!garray_getfloatarray(a, &vecsize, &x->x_vec)) + else if(!iemarray_getarray(a, &vecsize, &x->x_vec)) error("%s: bad template for spec2_tabreceive~", x->x_arrayname->s_name); else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10529] trunk/externals/zexy/src
by zmoelnig＠users.sourceforge.net 13 Jan '09

13 Jan '09

Revision: 10529 http://pure-data.svn.sourceforge.net/pure-data/?rev=10529&view=rev Author: zmoelnig Date: 2009-01-13 16:40:12 +0000 (Tue, 13 Jan 2009) Log Message: ----------- made array-access 64bit compatible Modified Paths: -------------- trunk/externals/zexy/src/tabdump.c trunk/externals/zexy/src/tabminmax.c trunk/externals/zexy/src/tabread4~~.c trunk/externals/zexy/src/tabset.c trunk/externals/zexy/src/zexy.h Modified: trunk/externals/zexy/src/tabdump.c =================================================================== --- trunk/externals/zexy/src/tabdump.c 2009-01-13 15:59:14 UTC (rev 10528) +++ trunk/externals/zexy/src/tabdump.c 2009-01-13 16:40:12 UTC (rev 10529) @@ -36,11 +36,11 @@ { t_garray *A; int npoints; - t_float *vec; + zarray_t *vec; if (!(A = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) error("%s: no such array", x->x_arrayname->s_name); - else if (!garray_getfloatarray(A, &npoints, &vec)) + else if (!zarray_getarray(A, &npoints, &vec)) error("%s: bad template for tabdump", x->x_arrayname->s_name); else { Modified: trunk/externals/zexy/src/tabminmax.c =================================================================== --- trunk/externals/zexy/src/tabminmax.c 2009-01-13 15:59:14 UTC (rev 10528) +++ trunk/externals/zexy/src/tabminmax.c 2009-01-13 16:40:12 UTC (rev 10529) @@ -35,11 +35,11 @@ { t_garray *A; int npoints; - t_float *vec; + zarray_t *vec; if (!(A = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) error("%s: no such array", x->x_arrayname->s_name); - else if (!garray_getfloatarray(A, &npoints, &vec)) + else if (!zarray_getarray(A, &npoints, &vec)) error("%s: bad template for tabminmax", x->x_arrayname->s_name); else { Modified: trunk/externals/zexy/src/tabread4~~.c =================================================================== --- trunk/externals/zexy/src/tabread4~~.c 2009-01-13 15:59:14 UTC (rev 10528) +++ trunk/externals/zexy/src/tabread4~~.c 2009-01-13 16:40:12 UTC (rev 10529) @@ -23,17 +23,6 @@ static t_class *tabread4_tilde_class; -#ifdef Z_USE_WORD_ARRAYS -# define zarray_t t_word -# define zarray_getarray garray_getfloatwords -# define zarray_getfloat(pointer, index) (pointer[index].w_float) -#else -# define zarray_t t_float -# define zarray_getarray garray_getfloatarray -# define zarray_getfloat(pointer, index) (pointer[index]) -#endif - - typedef struct _tabread4_tilde { t_object x_obj; Modified: trunk/externals/zexy/src/tabset.c =================================================================== --- trunk/externals/zexy/src/tabset.c 2009-01-13 15:59:14 UTC (rev 10528) +++ trunk/externals/zexy/src/tabset.c 2009-01-13 16:40:12 UTC (rev 10529) @@ -33,11 +33,11 @@ { t_garray *A; int npoints; - t_float *vec; + zarray_t *vec; if (!(A = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) error("%s: no such array", x->x_arrayname->s_name); - else if (!garray_getfloatarray(A, &npoints, &vec)) + else if (!zarray_getarray(A, &npoints, &vec)) error("%s: bad template for tabset", x->x_arrayname->s_name); else { while(npoints--)*vec++=f; @@ -49,12 +49,12 @@ { t_garray *A; int npoints; - t_float *vec; + zarray_t *vec; ZEXY_USEVAR(s); if (!(A = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) error("%s: no such array", x->x_arrayname->s_name); - else if (!garray_getfloatarray(A, &npoints, &vec)) + else if (!zarray_getarray(A, &npoints, &vec)) error("%s: bad template for tabset", x->x_arrayname->s_name); else { if (argc>=npoints) Modified: trunk/externals/zexy/src/zexy.h =================================================================== --- trunk/externals/zexy/src/zexy.h 2009-01-13 15:59:14 UTC (rev 10528) +++ trunk/externals/zexy/src/zexy.h 2009-01-13 16:40:12 UTC (rev 10529) @@ -140,5 +140,15 @@ # define z_verbose #endif +#if (defined __x86_64__) && (defined PD_MAJOR_VERSION && defined PD_MINOR_VERSION) && (PD_MAJOR_VERSION > 0 || PD_MINOR_VERSION > 41) +# define zarray_t t_word +# define zarray_getarray garray_getfloatwords +# define zarray_getfloat(pointer, index) (pointer[index].w_float) +#else +# define zarray_t t_float +# define zarray_getarray garray_getfloatarray +# define zarray_getfloat(pointer, index) (pointer[index]) +#endif + #endif /* INCLUDE_ZEXY_H__ */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
36
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 January 2009