Pd-cvs November 2007

pd-cvs@lists.iem.at

14 participants
212 discussions

pd/src g_text.c,1.15.6.3,1.15.6.4
by Hans-Christoph Steiner 10 Nov '07

10 Nov '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13812 Modified Files: Tag: branch-v0-40-extended g_text.c Log Message: to prevent the red error border from coming up during object creation, I removed what seems to me like an extraneous itemconfigure command. I couldn't find where it was needed, so I commented it out and the red border stuff works nicely Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.15.6.3 retrieving revision 1.15.6.4 diff -C2 -d -r1.15.6.3 -r1.15.6.4 *** g_text.c 9 Nov 2007 06:28:44 -0000 1.15.6.3 --- g_text.c 10 Nov 2007 19:42:33 -0000 1.15.6.4 *************** *** 1266,1271 **** glist_getcanvas(glist), tag, x1, y1, x2, y1, x2, y2, x1, y2, x1, y1); ! sys_vgui(".x%lx.c itemconfigure %sR -dash %s -outline %s\n", ! glist_getcanvas(glist), tag, pattern, outline); } } --- 1266,1272 ---- glist_getcanvas(glist), tag, x1, y1, x2, y1, x2, y2, x1, y2, x1, y1); ! /* this seems to be totally extraneous hans(a)at.or.at ! sys_vgui(".x%lx.c itemconfigure %sR -dash %s -outline %s\n", ! glist_getcanvas(glist), tag, pattern, outline); */ } }

1 0

externals/zexy/src zexy.h,1.28,1.29
by IOhannes m zmölnig 10 Nov '07

10 Nov '07

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9744/zexy/src Modified Files: zexy.h Log Message: disabled warnings for functions deprecated in M$ studio 2005 Index: zexy.h =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** zexy.h 31 Oct 2007 10:46:46 -0000 1.28 --- zexy.h 10 Nov 2007 18:01:10 -0000 1.29 *************** *** 67,70 **** --- 67,71 ---- # pragma warning( disable : 4244 ) # pragma warning( disable : 4305 ) + # pragma warning( disable : 4996) /* deprecated functions */ #endif *************** *** 72,77 **** # define HEARTSYMBOL 3 # define STATIC_INLINE ! # define sqrtf sqrt ! # define fabsf fabs #else # define HEARTSYMBOL 169 --- 73,84 ---- # define HEARTSYMBOL 3 # define STATIC_INLINE ! ! # ifndef sqrtf ! # define sqrtf sqrt ! # endif /* sqrtf */ ! # ifndef fabsf ! # define fabsf fabs ! # endif /* fabsf */ ! #else # define HEARTSYMBOL 169

1 0

externals/zexy/src winNT_portio.c,1.5,1.6
by IOhannes m zmölnig 10 Nov '07

10 Nov '07

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3824 Modified Files: winNT_portio.c Log Message: dos2unix Index: winNT_portio.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/winNT_portio.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** winNT_portio.c 25 Jan 2006 16:27:08 -0000 1.5 --- winNT_portio.c 10 Nov 2007 17:45:38 -0000 1.6 *************** *** 1,127 **** ! /* ! * this is a wrapper for the cor port i/o functions for WinNT/2000/XP. ! * this is to be replaced by some functions that are platform/interface ! * specific to access the data lines. ! * for now, this is only for parport access, but in future there will be a way ! * to plug this on the usb bus. ! * if the interface changes, only this file has to be adopted for the target system ! */ ! #if defined __WIN32__ && defined Z_WANT_LPT ! ! #include <stdio.h> ! #include <windows.h> ! ! int read_parport(int port); ! void write_parport(int port, int value); ! int open_port(int port); ! ! static BOOL bPrivException = FALSE; ! ! int read_parport(int port) ! { ! // byte = _inp((unsigned short)port); ! unsigned char value; ! #ifdef _MSC_VER ! __asm mov edx,port ! __asm in al,dx ! __asm mov value,al ! #else ! // hmm, i should read some documentation about inline assembler ! post("lpt: cannot read from parport (recompile!)"); ! return 0; ! #endif ! return (int)value; ! } ! ! void write_parport(int port, int invalue) ! { ! // _outp((unsigned short)port, value); ! BYTE value = (BYTE)invalue; ! #ifdef _MSC_VER ! __asm mov edx,port ! __asm mov al,value ! __asm out dx,al ! #else ! // hmm, i should read some documentation about inline assembler ! // and probably about assembler in general... ! post("lpt: cannot write to parport (recompile!)"); ! /* ! asm( ! "mov %%edx,%0\n" ! "mov %%al,%1\n" ! "out %%dx,%%al\n" ! : ! : "a"(port),"b"(value) ! ); ! */ ! #endif ! } ! ! static LONG WINAPI HandlerExceptionFilter ( EXCEPTION_POINTERS *pExPtrs ) ! { ! ! if (pExPtrs->ExceptionRecord->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION) ! { ! pExPtrs->ContextRecord->Eip ++; // Skip the OUT or IN instruction that caused the exception ! bPrivException = TRUE; ! return EXCEPTION_CONTINUE_EXECUTION; ! } ! else ! return EXCEPTION_CONTINUE_SEARCH; ! } ! ! static BOOL StartUpIoPorts(UINT PortToAccess, BOOL bShowMessageBox, HWND hParentWnd) ! { ! HANDLE hUserPort; ! ! hUserPort = CreateFile("\\\\.\\UserPort", GENERIC_READ, 0, NULL,OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ! CloseHandle(hUserPort); // Activate the driver ! Sleep(100); // We must make a process switch ! ! SetUnhandledExceptionFilter(HandlerExceptionFilter); ! ! bPrivException = FALSE; ! read_parport(PortToAccess); // Try to access the given port address ! ! if (bPrivException) ! { ! if (bShowMessageBox) ! { ! #if 0 ! MessageBox(hParentWnd,"Privileged instruction exception has occured!\r\n\r\n" ! "To use this external under Windows NT, 2000 or XP\r\n" ! "you need to install the driver 'UserPort.sys' and grant\r\n" ! "access to the ports used by this program.\r\n\r\n" ! "See the file README for further information!\r\n", NULL, MB_OK); ! #endif ! } ! return FALSE; ! } ! return TRUE; ! } ! /* check if we are running NT/2k/XP */ ! static int IsWinNT(void) ! { ! OSVERSIONINFO OSVersionInfo; ! OSVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); ! ! GetVersionEx(&OSVersionInfo); ! ! return OSVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT; ! } ! ! /* open parport */ ! int open_port(int port) ! { ! if(IsWinNT()) /* we are under NT and need kernel driver */ ! { ! if(StartUpIoPorts(port, 1, 0)) ! return(0); ! return(-1); ! } ! else /* no need to use kernel driver */ ! { ! return(0); ! } ! } ! #endif /* __WIN32__ & Z_WANT_LPT */ --- 1,127 ---- ! /* ! * this is a wrapper for the cor port i/o functions for WinNT/2000/XP. ! * this is to be replaced by some functions that are platform/interface ! * specific to access the data lines. ! * for now, this is only for parport access, but in future there will be a way ! * to plug this on the usb bus. ! * if the interface changes, only this file has to be adopted for the target system ! */ ! #if defined __WIN32__ && defined Z_WANT_LPT ! ! #include <stdio.h> ! #include <windows.h> ! ! int read_parport(int port); ! void write_parport(int port, int value); ! int open_port(int port); ! ! static BOOL bPrivException = FALSE; ! ! int read_parport(int port) ! { ! // byte = _inp((unsigned short)port); ! unsigned char value; ! #ifdef _MSC_VER ! __asm mov edx,port ! __asm in al,dx ! __asm mov value,al ! #else ! // hmm, i should read some documentation about inline assembler ! post("lpt: cannot read from parport (recompile!)"); ! return 0; ! #endif ! return (int)value; ! } ! ! void write_parport(int port, int invalue) ! { ! // _outp((unsigned short)port, value); ! BYTE value = (BYTE)invalue; ! #ifdef _MSC_VER ! __asm mov edx,port ! __asm mov al,value ! __asm out dx,al ! #else ! // hmm, i should read some documentation about inline assembler ! // and probably about assembler in general... ! post("lpt: cannot write to parport (recompile!)"); ! /* ! asm( ! "mov %%edx,%0\n" ! "mov %%al,%1\n" ! "out %%dx,%%al\n" ! : ! : "a"(port),"b"(value) ! ); ! */ ! #endif ! } ! ! static LONG WINAPI HandlerExceptionFilter ( EXCEPTION_POINTERS *pExPtrs ) ! { ! ! if (pExPtrs->ExceptionRecord->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION) ! { ! pExPtrs->ContextRecord->Eip ++; // Skip the OUT or IN instruction that caused the exception ! bPrivException = TRUE; ! return EXCEPTION_CONTINUE_EXECUTION; ! } ! else ! return EXCEPTION_CONTINUE_SEARCH; ! } ! ! static BOOL StartUpIoPorts(UINT PortToAccess, BOOL bShowMessageBox, HWND hParentWnd) ! { ! HANDLE hUserPort; ! ! hUserPort = CreateFile("\\\\.\\UserPort", GENERIC_READ, 0, NULL,OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ! CloseHandle(hUserPort); // Activate the driver ! Sleep(100); // We must make a process switch ! ! SetUnhandledExceptionFilter(HandlerExceptionFilter); ! ! bPrivException = FALSE; ! read_parport(PortToAccess); // Try to access the given port address ! ! if (bPrivException) ! { ! if (bShowMessageBox) ! { ! #if 0 ! MessageBox(hParentWnd,"Privileged instruction exception has occured!\r\n\r\n" ! "To use this external under Windows NT, 2000 or XP\r\n" ! "you need to install the driver 'UserPort.sys' and grant\r\n" ! "access to the ports used by this program.\r\n\r\n" ! "See the file README for further information!\r\n", NULL, MB_OK); ! #endif ! } ! return FALSE; ! } ! return TRUE; ! } ! /* check if we are running NT/2k/XP */ ! static int IsWinNT(void) ! { ! OSVERSIONINFO OSVersionInfo; ! OSVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); ! ! GetVersionEx(&OSVersionInfo); ! ! return OSVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT; ! } ! ! /* open parport */ ! int open_port(int port) ! { ! if(IsWinNT()) /* we are under NT and need kernel driver */ ! { ! if(StartUpIoPorts(port, 1, 0)) ! return(0); ! return(-1); ! } ! else /* no need to use kernel driver */ ! { ! return(0); ! } ! } ! #endif /* __WIN32__ & Z_WANT_LPT */

1 0

pd/src g_canvas.c,1.18.6.2,1.18.6.3
by Hans-Christoph Steiner 10 Nov '07

10 Nov '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15413 Modified Files: Tag: branch-v0-40-extended g_canvas.c Log Message: found the source of the 2px growing bug, basically, Tk was automatically drawing a 2px "highlightborder" around the canvas, and would return that value sometimes, I don't really know the details. But by setting "-highlightborder 0" and then removing the 2px adjustment code, it fixes the bug on my computer. Now it's time to try it on GNU/Linux, then make a patch. Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.18.6.2 retrieving revision 1.18.6.3 diff -C2 -d -r1.18.6.2 -r1.18.6.3 *** g_canvas.c 9 Nov 2007 06:28:44 -0000 1.18.6.2 --- g_canvas.c 10 Nov 2007 04:50:17 -0000 1.18.6.3 *************** *** 1093,1109 **** } - /* When you ask a canvas its size the result is 2 pixels more than what - you gave it to open it; perhaps there's a 1-pixel border all around it - or something. Anyway, we just add the 2 pixels back here; seems we - have to do this for linux but not MSW; not sure about MacOS. */ - - #ifdef MSW - #define HORIZBORDER 0 - #define VERTBORDER 0 - #else - #define HORIZBORDER 2 - #define VERTBORDER 2 - #endif - static void canvas_relocate(t_canvas *x, t_symbol *canvasgeom, t_symbol *topgeom) --- 1093,1096 ---- *************** *** 1118,1122 **** if (cw > 5 && ch > 5) canvas_setbounds(x, txpix, typix, ! txpix + cw - HORIZBORDER, typix + ch - VERTBORDER); } --- 1105,1109 ---- if (cw > 5 && ch > 5) canvas_setbounds(x, txpix, typix, ! txpix + cw, typix + ch); }

1 0

externals/hcs tcl_version.pd, NONE, 1.1 tcl_version-help.pd, NONE, 1.1
by Hans-Christoph Steiner 09 Nov '07

09 Nov '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24499 Added Files: tcl_version.pd tcl_version-help.pd Log Message: created object based on tot to get Tcl/Tk version --- NEW FILE: tcl_version.pd --- #N canvas 512 371 345 212 10; #X msg 96 69 query concat [info patchlevel]; #X obj 96 103 toxy/tot .; #X obj 96 126 zexy/symbol2list .; #X obj 96 151 outlet; #X obj 96 42 bang; #X obj 96 16 inlet; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 4 0 0 0; #X connect 5 0 4 0; --- NEW FILE: tcl_version-help.pd --- #N canvas 951 522 454 304 10; #X obj 127 117 tcl_version; #X msg 127 70 bang; #X obj 127 157 unpack float float float; #X floatatom 126 186 5 0 0 3 major - -; #X floatatom 195 185 5 0 0 3 minor - -; #X floatatom 267 186 5 0 0 3 bugfix - -; #X text 53 21 get the current Tcl/Tk version:; #X connect 0 0 2 0; #X connect 1 0 0 0; #X connect 2 0 3 0; #X connect 2 1 4 0; #X connect 2 2 5 0;

1 0

externals/hcs canvas_name.c,NONE,1.1
by Hans-Christoph Steiner 09 Nov '07

09 Nov '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15173 Added Files: canvas_name.c Log Message: added quick hack to get the Tk canvas name in Pd space --- NEW FILE: canvas_name.c --- #include <stdio.h> #include <string.h> #include <m_pd.h> #include <g_canvas.h> #define DEBUG(x) static t_class *canvas_name_class; typedef struct _canvas_name { t_object x_obj; t_symbol *x_canvas_name; } t_canvas_name; static void canvas_name_bang(t_canvas_name *x) { outlet_symbol(x->x_obj.ob_outlet,x->x_canvas_name); } static void *canvas_name_new(void) { t_canvas_name *x = (t_canvas_name *)pd_new(canvas_name_class); char buf[MAXPDSTRING]; snprintf(buf,MAXPDSTRING,".x%lx.c",(long unsigned int)canvas_getcurrent()); x->x_canvas_name = gensym(buf); outlet_new(&x->x_obj, &s_symbol); return(x); } void canvas_name_setup(void) { canvas_name_class = class_new(gensym("canvas_name"), (t_newmethod)canvas_name_new, NULL, sizeof(t_canvas_name), 0, 0); class_addbang(canvas_name_class, (t_method)canvas_name_bang); }

1 0

externals/hcs window_name-help.pd,1.1,1.2
by Hans-Christoph Steiner 09 Nov '07

09 Nov '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9333 Modified Files: window_name-help.pd Log Message: added example to turn off window resizing Index: window_name-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/window_name-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** window_name-help.pd 8 Nov 2007 03:24:16 -0000 1.1 --- window_name-help.pd 9 Nov 2007 19:29:21 -0000 1.2 *************** *** 1,15 **** ! #N canvas 431 431 476 365 10; ! #X obj 175 202 sys_gui; ! #X symbolatom 290 96 0 0 0 0 - - -; ! #X obj 274 27 loadbang; ! #X obj 175 143 pack float symbol; ! #X obj 110 83 hsl 128 15 0.1 1 1 1 empty empty window_alpha -2 -8 0 10 -204800 -1 -1 12700 1; ! #X floatatom 107 118 5 0 0 0 - - -; ! #X msg 175 172 wm attributes \$2 -alpha \$1; ! #X text 43 256 for more options:; ! #X obj 62 279 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/wm.htm; ! #X text 164 229 alpha does not work with X11 :(; ! #X obj 274 64 window_name; #X connect 2 0 10 0; #X connect 3 0 6 0; --- 1,23 ---- ! #N canvas 246 251 576 362 10; ! #X obj 124 207 sys_gui; ! #X symbolatom 239 101 0 0 0 0 - - -; ! #X obj 223 32 loadbang; ! #X obj 124 148 pack float symbol; ! #X obj 59 88 hsl 128 15 0.1 1 1 1 empty empty window_alpha -2 -8 0 10 -204800 -1 -1 12700 1; ! #X floatatom 56 123 5 0 0 0 - - -; ! #X msg 124 177 wm attributes \$2 -alpha \$1; ! #X text 141 279 for more options:; ! #X obj 172 297 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/wm.htm ! ; ! #X text 113 234 alpha does not work with X11 :(; ! #X obj 223 69 window_name; ! #X obj 383 207 sys_gui; ! #X obj 383 148 window_name; ! #X obj 383 114 bng 25 250 50 0 empty empty empty 17 7 0 10 -204786 ! -1 -1; ! #X msg 383 177 wm resizable \$1 0 0; ! #X text 352 84 turn off resizing of this window:; ! #X text 13 37 change alpha of this window:; #X connect 2 0 10 0; #X connect 3 0 6 0; *************** *** 19,20 **** --- 27,31 ---- #X connect 10 0 3 1; #X connect 10 0 1 0; + #X connect 12 0 14 0; + #X connect 13 0 12 0; + #X connect 14 0 11 0;

1 0

pd/src u_main.tk,1.25.6.6,1.25.6.7
by Hans-Christoph Steiner 09 Nov '07

09 Nov '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31694 Modified Files: Tag: branch-v0-40-extended u_main.tk Log Message: added key shortcut to toggle open state of console Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.25.6.6 retrieving revision 1.25.6.7 diff -C2 -d -r1.25.6.6 -r1.25.6.7 *** u_main.tk 8 Nov 2007 02:49:55 -0000 1.25.6.6 --- u_main.tk 9 Nov 2007 19:02:03 -0000 1.25.6.7 *************** *** 223,232 **** -command {pd [concat pd meters $ctrls_meter_on \;]} ! checkbutton .controls.switches.textwindow -text {text window} \ ! -variable show_text_window \ ! -command {showhide_printouttext $show_text_window} pack .controls.switches.audiobutton .controls.switches.meterbutton \ ! .controls.switches.textwindow -side top -anchor w frame .controls.inout --- 223,232 ---- -command {pd [concat pd meters $ctrls_meter_on \;]} ! checkbutton .controls.switches.console -text "console" \ ! -variable show_console \ ! -command {showhide_printouttext $show_console} pack .controls.switches.audiobutton .controls.switches.meterbutton \ ! .controls.switches.console -side top -anchor w frame .controls.inout *************** *** 445,450 **** } ! ################## the "Clear Pd window" menu command ######################### ! proc menu_clear_pd_window {} {.printout.text delete 0.0 end} ################## the "Quit" menu command ######################### --- 445,452 ---- } ! ################## menu commands for console ######################### ! proc menu_clear_console {} {.printout.text delete 0.0 end} ! ! proc menu_toggle_console {} {.controls.switches.console invoke} ################## the "Quit" menu command ######################### *************** *** 732,737 **** .mbar.edit add command -label Font -state disabled .mbar.edit add command -label {Tidy Up} -state disabled ! .mbar.edit add command -label {Clear Pd window} \ ! -accelerator [accel_munge "Ctrl+r"] -command menu_clear_pd_window .mbar.edit add separator # this should apply to .printout.text --- 734,741 ---- .mbar.edit add command -label Font -state disabled .mbar.edit add command -label {Tidy Up} -state disabled ! .mbar.edit add command -label "Toggle console" -accelerator [accel_munge "Ctrl+l"]\ ! -command menu_toggle_console ! .mbar.edit add command -label "Clear console" \ ! -accelerator [accel_munge "Ctrl+r"] -command menu_clear_console .mbar.edit add separator # this should apply to .printout.text *************** *** 1166,1172 **** -command [concat menu_tidyup $name] ! $name.m.edit add command -label {Clear Pd window} \ -accelerator [accel_munge "Ctrl+r"] \ ! -command [concat menu_clear_pd_window] $name.m.edit add separator --- 1170,1180 ---- -command [concat menu_tidyup $name] ! $name.m.edit add command -label "Toggle console" \ ! -accelerator [accel_munge "Ctrl+l"] \ ! -command [concat .controls.switches.console invoke] ! ! $name.m.edit add command -label "Clear console" \ -accelerator [accel_munge "Ctrl+r"] \ ! -command [concat menu_clear_console] $name.m.edit add separator *************** *** 1844,1848 **** if {$key == "w" || $key == "W"} {menu_close $topname} if {$key == "p" || $key == "P"} {menu_print $topname} ! if {$key == "r" || $key == "R"} {menu_clear_pd_window} if {$key == "x" || $key == "X"} {menu_cut $topname} if {$key == "c" || $key == "C"} {menu_copy $topname} --- 1852,1857 ---- if {$key == "w" || $key == "W"} {menu_close $topname} if {$key == "p" || $key == "P"} {menu_print $topname} ! if {$key == "l" || $key == "L"} {menu_toggle_console} ! if {$key == "r" || $key == "R"} {menu_clear_console} if {$key == "x" || $key == "X"} {menu_cut $topname} if {$key == "c" || $key == "C"} {menu_copy $topname}

1 0

externals/iem/iemgui/src iem_vu.c,1.4,1.5
by musil 09 Nov '07

09 Nov '07

Update of /cvsroot/pure-data/externals/iem/iemgui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8481 Modified Files: iem_vu.c Log Message: new set method Index: iem_vu.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemgui/src/iem_vu.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** iem_vu.c 31 Oct 2007 11:37:45 -0000 1.4 --- iem_vu.c 9 Nov 2007 14:59:59 -0000 1.5 *************** *** 608,611 **** --- 608,656 ---- } + static void iem_vu_set(t_iem_vu *x, t_symbol *s, int ac, t_atom *av) + { + t_float rms=-100.0f, peak=-100.0f; + int i; + + if( (ac >= 2) && IS_A_FLOAT(av,0) && IS_A_FLOAT(av,1) ) + { + rms = (t_float)atom_getfloatarg(0, ac, av); + peak = (t_float)atom_getfloatarg(1, ac, av); + } + else if( (ac == 1) && IS_A_FLOAT(av,0) ) + { + rms = (t_float)atom_getfloatarg(0, ac, av); + peak = rms; + } + if(rms <= IEM_VU_MINDB) + x->x_rms = 0; + else if(rms >= IEM_VU_MAXDB) + x->x_rms = IEM_VU_STEPS; + else + { + int i = (int)(2.0*(rms + IEM_VU_OFFSET)); + x->x_rms = iem_vu_db2i[i]; + } + i = (int)(100.0*rms + 10000.5); + rms = 0.01*(t_float)(i - 10000); + x->x_fr = rms; + + if(peak <= IEM_VU_MINDB) + x->x_peak = 0; + else if(peak >= IEM_VU_MAXDB) + x->x_peak = IEM_VU_STEPS; + else + { + int i = (int)(2.0*(peak + IEM_VU_OFFSET)); + x->x_peak = iem_vu_db2i[i]; + } + i = (int)(100.0*peak + 10000.5); + peak = 0.01*(t_float)(i - 10000); + x->x_fp = peak; + + iem_vu_update_rms(x, x->x_gui.x_glist); + iem_vu_update_peak(x, x->x_gui.x_glist); + } + static void iem_vu_bang(t_iem_vu *x) { *************** *** 814,819 **** class_addfloat(iem_vu_class, iem_vu_float); class_addmethod(iem_vu_class, (t_method)iem_vu_ft1, gensym("ft1"), A_FLOAT, 0); ! class_addmethod(iem_vu_class, (t_method)iem_vu_dialog, gensym("dialog"), ! A_GIMME, 0); class_addmethod(iem_vu_class, (t_method)iem_vu_size, gensym("size"), A_GIMME, 0); class_addmethod(iem_vu_class, (t_method)iem_vu_scale, gensym("scale"), A_DEFFLOAT, 0); --- 859,864 ---- class_addfloat(iem_vu_class, iem_vu_float); class_addmethod(iem_vu_class, (t_method)iem_vu_ft1, gensym("ft1"), A_FLOAT, 0); ! class_addmethod(iem_vu_class, (t_method)iem_vu_set, gensym("set"), A_GIMME, 0); ! class_addmethod(iem_vu_class, (t_method)iem_vu_dialog, gensym("dialog"), A_GIMME, 0); class_addmethod(iem_vu_class, (t_method)iem_vu_size, gensym("size"), A_GIMME, 0); class_addmethod(iem_vu_class, (t_method)iem_vu_scale, gensym("scale"), A_DEFFLOAT, 0);

1 0

pd/src g_canvas.c, 1.18.6.1, 1.18.6.2 g_editor.c, 1.20.6.2, 1.20.6.3 g_text.c, 1.15.6.2, 1.15.6.3
by Hans-Christoph Steiner 09 Nov '07

09 Nov '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19812 Modified Files: Tag: branch-v0-40-extended g_canvas.c g_editor.c g_text.c Log Message: in order to make sure that the cords are always on top, tag them all, and send a raise whenever a box is created Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.15.6.2 retrieving revision 1.15.6.3 diff -C2 -d -r1.15.6.2 -r1.15.6.3 *** g_text.c 6 Nov 2007 02:28:12 -0000 1.15.6.2 --- g_text.c 9 Nov 2007 06:28:44 -0000 1.15.6.3 *************** *** 1253,1256 **** --- 1253,1257 ---- } if (firsttime) + { sys_vgui(".x%lx.c create polygon %d %d %d %d %d %d %d %d %d %d \ -dash %s -outline %s -fill $obj_box_fill -tags %sR\n", *************** *** 1258,1261 **** --- 1259,1264 ---- x1, y1, x2, y1, x2, y2, x1, y2, x1, y1, pattern, outline, tag); + sys_vgui(".x%lx.c raise all_cords\n", glist_getcanvas(glist)); + } else { Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.20.6.2 retrieving revision 1.20.6.3 diff -C2 -d -r1.20.6.2 -r1.20.6.3 *** g_editor.c 6 Nov 2007 02:28:12 -0000 1.20.6.2 --- g_editor.c 9 Nov 2007 06:28:44 -0000 1.20.6.3 *************** *** 1342,1346 **** + IOMIDDLE; ly2 = y21; ! sys_vgui(".x%lx.c create line %d %d %d %d -fill %s -width %d -tags l%lx\n", glist_getcanvas(x), lx1, ly1, lx2, ly2, --- 1342,1346 ---- + IOMIDDLE; ly2 = y21; ! sys_vgui(".x%lx.c create line %d %d %d %d -fill %s -width %d -tags {l%lx all_cords}\n", glist_getcanvas(x), lx1, ly1, lx2, ly2, Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.18.6.1 retrieving revision 1.18.6.2 diff -C2 -d -r1.18.6.1 -r1.18.6.2 *** g_canvas.c 4 Nov 2007 18:00:20 -0000 1.18.6.1 --- g_canvas.c 9 Nov 2007 06:28:44 -0000 1.18.6.2 *************** *** 905,912 **** { issignal = (outlet_getsymbol(t.tr_outlet) == &s_signal ? 1 : 0); ! sys_vgui(".x%lx.c create line %d %d %d %d -width %d -fill %s -tags l%lx\n", glist_getcanvas(x), t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2, (issignal ? 2:1), (issignal ? "$signal_cord" : "$msg_cord"), ! oc); } } --- 905,913 ---- { issignal = (outlet_getsymbol(t.tr_outlet) == &s_signal ? 1 : 0); ! sys_vgui(".x%lx.c create line %d %d %d %d -width %d -fill %s \ ! -tags {l%lx all_cords}\n", glist_getcanvas(x), t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2, (issignal ? 2:1), (issignal ? "$signal_cord" : "$msg_cord"), ! oc); } }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
22
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 November 2007