Pd-cvs January 2009

pd-cvs@lists.iem.at

23 participants
357 discussions

SF.net SVN: pure-data:[10627] trunk/externals/pdvjtools/pix_preview/ pix_preview.cc
by lluisbigorda＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10627 http://pure-data.svn.sourceforge.net/pure-data/?rev=10627&view=rev Author: lluisbigorda Date: 2009-01-25 01:14:06 +0000 (Sun, 25 Jan 2009) Log Message: ----------- new tlc-sockets procedure to get frame data and paint into the canvas Modified Paths: -------------- trunk/externals/pdvjtools/pix_preview/pix_preview.cc Modified: trunk/externals/pdvjtools/pix_preview/pix_preview.cc =================================================================== --- trunk/externals/pdvjtools/pix_preview/pix_preview.cc 2009-01-25 01:12:52 UTC (rev 10626) +++ trunk/externals/pdvjtools/pix_preview/pix_preview.cc 2009-01-25 01:14:06 UTC (rev 10627) @@ -1,27 +1,10 @@ -//////////////////////////////////////////////////////// -// -// GEM - Graphics Environment for Multimedia -// -// zmoelnig(a)iem.kug.ac.at -// -// Implementation file -// -// Copyright (c) 1997-1998 Mark Danks. -// Copyright (c) G\xFCnther Geiger. -// Copyright (c) 2001-2002 IOhannes m zmoelnig. forum::f\xFCr::uml\xE4ute. IEM -// Copyright (c) 2002 James Tittle & Chris Clepper -// For information on usage and redistribution, and for a DISCLAIMER OF ALL -// WARRANTIES, see the file, "GEM.LICENSE.TERMS" in this distribution. -// -///////////////////////////////////////////////////////// ///////////////////////////////////////////////////////// // // pix_preview // -// 0409:forum::f\xFCr::uml\xE4ute:2000 -// IOhannes m zmoelnig -// mailto:zmoelnig@iem.kug.ac.at +// Lluis Gomez i Bigorda +// mailto:lluis@artefacte.org // ///////////////////////////////////////////////////////// @@ -30,8 +13,13 @@ #include <sstream> using namespace std; #include "stdio.h" +#include <sys/types.h> +#include <netinet/in.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#include <netdb.h> +#include <errno.h> - #include "m_pd.h" #include "m_imp.h" #include "g_canvas.h" @@ -39,46 +27,15 @@ #include "pix_preview.h" -int guidebug=0; +#define initialport 1234 -#define COLORGRID_SYS_VGUI2(a,b) if (guidebug) \ - post(a,b);\ - sys_vgui(a,b) +int guidebug=1; -#define COLORGRID_SYS_VGUI3(a,b,c) if (guidebug) \ - post(a,b,c);\ - sys_vgui(a,b,c) +char *fdata="R0lGODlhHAAcAIABAAAAAP///ywAAAAAHAAcAAACGoSPqcvtD6OctNqLs968+w+G4kiW5omm6ooUADs="; -#define COLORGRID_SYS_VGUI4(a,b,c,d) if (guidebug) \ - post(a,b,c,d);\ - sys_vgui(a,b,c,d) +int pix_preview::counter; -#define COLORGRID_SYS_VGUI5(a,b,c,d,e) if (guidebug) \ - post(a,b,c,d,e);\ - sys_vgui(a,b,c,d,e) - -#define COLORGRID_SYS_VGUI6(a,b,c,d,e,f) if (guidebug) \ - post(a,b,c,d,e,f);\ - sys_vgui(a,b,c,d,e,f) - -#define COLORGRID_SYS_VGUI7(a,b,c,d,e,f,g) if (guidebug) \ - post(a,b,c,d,e,f,g );\ - sys_vgui(a,b,c,d,e,f,g) - -#define COLORGRID_SYS_VGUI8(a,b,c,d,e,f,g,h) if (guidebug) \ - post(a,b,c,d,e,f,g,h );\ - sys_vgui(a,b,c,d,e,f,g,h) - -#define COLORGRID_SYS_VGUI9(a,b,c,d,e,f,g,h,i) if (guidebug) \ - post(a,b,c,d,e,f,g,h,i );\ - sys_vgui(a,b,c,d,e,f,g,h,i) - - - char *fdata="R0lGODlhHAAcAIABAAAAAP///ywAAAAAHAAcAAACGoSPqcvtD6OctNqLs968+w+G4kiW5omm6ooUADs="; - - /* base64 conversion*/ - static const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" @@ -128,19 +85,6 @@ } - - - - - - - - - - - - - CPPEXTERN_NEW_WITH_TWO_ARGS(pix_preview, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT) @@ -153,8 +97,11 @@ // ///////////////////////////////////////////////////////// pix_preview :: pix_preview(t_floatarg fx, t_floatarg fy) -{ +{ + counter++; + whoami = counter; #include "pix_preview.tk2c" + sys_vgui("Echo_Server%d %d\n",whoami, 1233+whoami); xsize = (int)fx; ysize = (int)fy; m_csize = 3; @@ -190,7 +137,28 @@ m_buffer = new t_atom[m_bufsize]; + widgetwidth = 0; + widgetheight = 0; + //m_dataOut = outlet_new(this->x_obj, &s_list); + + // Try to connect (not working now , using connectMes) + memset(&hints, 0, sizeof hints); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + + std::ostringstream ostr; + ostr << 1233+whoami; + std::string str; + str = ostr.str(); + + getaddrinfo("localhost", reinterpret_cast<const char*>(str.c_str()), &hints, &res); + + fprintf(stderr,"trying to connect...\n"); + s = socket(res->ai_family, res->ai_socktype, 0); + connect(s, res->ai_addr, res->ai_addrlen); + + //fprintf(stderr,"We have %d pixpreviews\n",counter); } ///////////////////////////////////////////////////////// @@ -205,6 +173,24 @@ // processImage // ///////////////////////////////////////////////////////// +void pix_preview :: connectMess() +{ + memset(&hints, 0, sizeof hints); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + + std::ostringstream ostr; + ostr << 1233+whoami; + std::string str; + str = ostr.str(); + + getaddrinfo("localhost", reinterpret_cast<const char*>(str.c_str()), &hints, &res); + + fprintf(stderr,"trying to connect...\n"); + s = socket(res->ai_family, res->ai_socktype, 0); + connect(s, res->ai_addr, res->ai_addrlen); +} + void pix_preview :: processImage(imageStruct &image) { int x = m_xsize, y = m_ysize, c = m_csize; @@ -272,6 +258,7 @@ void pix_preview :: trigger() { if (!m_data) return; + int n = m_ysize, m = 0; int i = 0; @@ -279,7 +266,7 @@ unsigned char *data, *line; stringstream sx,sy; - fprintf (stderr,"%d %d %d %d %d %d \n",xsize, ysize,m_xsize, m_ysize,oldimagex,oldimagey); + //fprintf (stderr,"%d %d %d %d %d %d \n",xsize, ysize,m_xsize, m_ysize,oldimagex,oldimagey); std::string pnm; std::string pnm64; @@ -291,54 +278,20 @@ pnm += sy.str(); pnm += "\n255\n"; - //fprintf (stderr,"%s",pnm.c_str()); - - /*/escriu el contingut de data a un arxiu.*/ - char* ig_path = "/tmp/pixdump01.pnm"; - FILE * fp = fopen(ig_path, "w"); - fprintf (fp, "P6\n%d %d\n255\n", m_xsize, m_ysize); data = line = m_data; switch(m_csize){ case 4: -/* while (n > 0) { while (m < m_xsize) { int r, g, b, a; r = (int)data[chRed]; - fprintf (fp, "%c", (char)r); - i++; - g = (int)data[chGreen]; - fprintf (fp, "%c", (char)g); - i++; - b = (int)data[chBlue]; - fprintf (fp, "%c", (char)b); - i++; - a = (int)data[chAlpha]; - i++; - m++; - data = line + (int)(m_xstep * (float)m); - } - m = 0; - n--; - line = m_data + (int)(m_ystep*n); - data = line; - } - fclose (fp); -*/ - while (n > 0) { - while (m < m_xsize) { - int r, g, b, a; - r = (int)data[chRed]; pnm += (char)r; - fprintf (fp, "%c", (char)r); i++; g = (int)data[chGreen]; pnm += (char)g; - fprintf (fp, "%c", (char)g); i++; b = (int)data[chBlue]; pnm += (char)b; - fprintf (fp, "%c", (char)b); i++; a = (int)data[chAlpha]; i++; @@ -350,26 +303,22 @@ line = m_data + (int)(m_ystep*n); data = line; } - fclose (fp); //std::cout << "NOT encoded: " << pnm << std::endl; pnm64 = base64_encode(reinterpret_cast<const unsigned char*>(pnm.c_str()), pnm.length()); - //std::cout << "encoded: " << pnm64 << std::endl; + + pnm64 += "\n"; - + send(s, reinterpret_cast<const unsigned char*>(pnm64.c_str()), pnm64.length(), 0); - m_glist = (t_glist *) canvas_getcurrent(); - + //m_glist = (t_glist *) canvas_getcurrent(); - sys_vgui("img%x configure -data {%s}\n", this->x_obj, reinterpret_cast<const unsigned char*>(pnm64.c_str()) ); -// image_drawme((pix_preview *)this->x_obj, (t_glist *) this->getCanvas(), 0, m_xsize, m_ysize); sys_vgui(".x%x.c coords %xS %d %d\n", this->getCanvas(), this->x_obj, text_xpix(this->x_obj, (t_glist *)this->getCanvas()) + (m_xsize/2), text_ypix(this->x_obj, (t_glist *)this->getCanvas()) + (m_ysize/2)); - //fprintf (stderr, "%x %x - %d %d\n",x,(t_object*)x, text_xpix((t_object*)x, glist), text_ypix((t_object*)x, glist)); break; case 2: @@ -417,6 +366,7 @@ void pix_preview :: obj_setupCallback(t_class *classPtr) { class_addbang(classPtr, (t_method)&pix_preview::triggerMessCallback); + class_addmethod(classPtr, (t_method)&pix_preview::connectMessCallback, gensym("connect"), A_NULL); } void pix_preview :: triggerMessCallback(void *data) @@ -424,37 +374,22 @@ GetMyClass(data)->trigger(); } +void pix_preview :: connectMessCallback(void *data) +{ + GetMyClass(data)->connectMess(); +} -/* widget helper functions */ - - - +/* widget helper functions */ void pix_preview :: image_drawme(pix_preview *x, t_glist *glist, int firsttime, int m_xsize, int m_ysize) { - char* ig_path = "/tmp/pixdump01.pnm"; if (firsttime) { - - sys_vgui("image create photo img%x -data {%s}\n",x,fdata); - sys_vgui(".x%x.c create image %d %d -image img%x -tags %xS\n", - glist_getcanvas(glist),text_xpix((t_object*)x, glist)+14, text_ypix((t_object*)x, glist)+14,x,x); - //fprintf (stderr, "%x %x - %d %d \n",x,(t_object*)x, text_xpix((t_object*)x, glist), text_ypix((t_object*)x, glist)); + sys_vgui("image create photo imgPREVIEW%d -data {%s}\n",x->counter,fdata); + fprintf(stderr,"image create photo imgPREVIEW%d -data {%s}\n",x->counter,fdata); + sys_vgui(".x%x.c create image %d %d -image imgPREVIEW%d -tags %xS\n", glist_getcanvas(glist),text_xpix((t_object*)x, glist)+14, text_ypix((t_object*)x, glist)+14,x->counter,x); } - else { - sys_vgui(".x%x.c delete %xS\n", glist_getcanvas(glist), x); - sys_vgui(".x%x.c delete img%x\n", glist_getcanvas(glist), x); - sys_vgui("image create photo img%x -file %s\n",x,ig_path); - sys_vgui(".x%x.c create image %d %d -image img%x -tags %xS\n", - glist_getcanvas(glist),text_xpix((t_object*)x, glist)+(m_xsize/2), text_ypix((t_object*)x, glist)+(m_ysize/2),x,x); - //sys_vgui(".x%x.c coords %xS \ -%d %d\n", - // glist_getcanvas(glist), x, - // text_xpix((t_object*)x, glist), text_ypix((t_object*)x, glist)); - //fprintf (stderr, "%x %x - %d %d\n",x,(t_object*)x, text_xpix((t_object*)x, glist), text_ypix((t_object*)x, glist)); - } - } void pix_preview :: image_erase(pix_preview* x,t_glist* glist) @@ -462,7 +397,6 @@ int n; sys_vgui(".x%x.c delete %xS\n", glist_getcanvas(glist), x); - } @@ -473,15 +407,13 @@ int *xp1, int *yp1, int *xp2, int *yp2) { int width, height; - pix_preview* x = (pix_preview*)z; + pix_preview *x = (pix_preview *)z; - width = 250; - height = 50; *xp1 = text_xpix((t_object*)x, glist); *yp1 = text_ypix((t_object*)x, glist); - *xp2 = text_xpix((t_object*)x, glist) + width; - *yp2 = text_ypix((t_object*)x, glist) + height; + *xp2 = text_xpix((t_object*)x, glist) + x->widgetwidth; + *yp2 = text_ypix((t_object*)x, glist) + x->widgetheight; } void pix_preview :: image_displace(t_gobj *z, t_glist *glist, @@ -500,7 +432,9 @@ } void pix_preview :: image_select(t_gobj *z, t_glist *glist, int state) -{ t_object *x = (t_object *)z; + { + t_object *x = (t_object *)z; + pix_preview *s = (pix_preview *)z; if (state) { sys_vgui(".x%x.c create rectangle \ %d %d %d %d -tags %xSEL -outline blue\n", @@ -508,10 +442,14 @@ text_xpix(x, glist), text_ypix(x, glist), text_xpix(x, glist) + 25, text_ypix(x, glist) + 25, x); + s->widgetwidth = 28; + s->widgetheight = 28; } else { sys_vgui(".x%x.c delete %xSEL\n", glist_getcanvas(glist), x); + s->widgetwidth = 0; + s->widgetheight = 0; } } @@ -535,5 +473,6 @@ pix_preview* s = (pix_preview*)z; if (vis) image_drawme(s, glist, 1, 28, 28); + } 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:[10626] trunk/externals/pdvjtools/pix_preview
by lluisbigorda＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10626 http://pure-data.svn.sourceforge.net/pure-data/?rev=10626&view=rev Author: lluisbigorda Date: 2009-01-25 01:12:52 +0000 (Sun, 25 Jan 2009) Log Message: ----------- removed wrong help file Modified Paths: -------------- trunk/externals/pdvjtools/pix_preview/pix_preview-help.pd Removed Paths: ------------- trunk/externals/pdvjtools/pix_preview/help-pix_preview2.pd Deleted: trunk/externals/pdvjtools/pix_preview/help-pix_preview2.pd =================================================================== --- trunk/externals/pdvjtools/pix_preview/help-pix_preview2.pd 2009-01-25 01:01:30 UTC (rev 10625) +++ trunk/externals/pdvjtools/pix_preview/help-pix_preview2.pd 2009-01-25 01:12:52 UTC (rev 10626) @@ -1,163 +0,0 @@ -#N canvas 0 25 1247 665 10; -#X obj 256 -305 cnv 15 250 350 empty empty empty 20 12 0 14 -228992 --66577 0; -#X text 260 -322 Example:; -#X obj 401 -22 cnv 15 100 60 empty empty empty 20 12 0 14 -195568 -66577 -0; -#N canvas 0 0 450 300 gemwin 0; -#X obj 132 136 gemwin; -#X obj 67 89 outlet; -#X obj 67 10 inlet; -#X msg 67 70 set destroy; -#X msg 132 112 create \, 1; -#X msg 198 112 destroy; -#X msg 156 71 set create; -#X obj 67 41 route create; -#X connect 2 0 7 0; -#X connect 3 0 1 0; -#X connect 4 0 0 0; -#X connect 5 0 0 0; -#X connect 6 0 1 0; -#X connect 7 0 3 0; -#X connect 7 0 4 0; -#X connect 7 1 6 0; -#X connect 7 1 5 0; -#X restore 406 17 pd gemwin; -#X msg 406 -2 destroy; -#X text 402 -23 Create window:; -#X obj 258 -274 cnv 15 155 250 empty empty empty 20 12 0 14 -24198 --66577 0; -#X obj 258 -299 gemhead; -#X obj 258 -2 pix_texture; -#X obj 270 -269 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 --1 -1; -#X text 312 -305 open a supported; -#X text 313 -294 movie-clip; -#X obj 283 -75 unpack 0 0 0; -#X floatatom 273 -52 5 0 0 3 length - -; -#X floatatom 322 -52 5 0 0 3 width - -; -#X floatatom 372 -52 5 0 0 3 height - -; -#X obj 327 -94 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 --1 -1; -#X floatatom 309 -129 5 0 10000 1 frame# - -; -#X obj 270 -240 openpanel; -#X msg 270 -220 open \$1; -#X obj 258 20 rectangle 4 3; -#X obj 258 -111 pix_film; -#X msg 276 -177 auto \$1; -#X obj 276 -195 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 -1; -#X msg 287 -153 colorspace Grey; -#X obj 191 200 pix_preview; -#X obj 357 -180 loadbang; -#X obj 114 104 metro 140; -#X obj 109 75 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 -1; -#X obj 191 70 pix_resize 128 128; -#X obj 583 -294 cnv 15 250 350 empty empty empty 20 12 0 14 -228992 --66577 0; -#X obj 728 -11 cnv 15 100 60 empty empty empty 20 12 0 14 -195568 -66577 -0; -#N canvas 0 0 450 300 gemwin 0; -#X obj 132 136 gemwin; -#X obj 67 89 outlet; -#X obj 67 10 inlet; -#X msg 67 70 set destroy; -#X msg 132 112 create \, 1; -#X msg 198 112 destroy; -#X msg 156 71 set create; -#X obj 67 41 route create; -#X connect 2 0 7 0; -#X connect 3 0 1 0; -#X connect 4 0 0 0; -#X connect 5 0 0 0; -#X connect 6 0 1 0; -#X connect 7 0 3 0; -#X connect 7 0 4 0; -#X connect 7 1 6 0; -#X connect 7 1 5 0; -#X restore 733 28 pd gemwin; -#X msg 733 9 destroy; -#X text 729 -12 Create window:; -#X obj 585 -263 cnv 15 155 250 empty empty empty 20 12 0 14 -24198 --66577 0; -#X obj 585 -288 gemhead; -#X obj 585 9 pix_texture; -#X obj 597 -258 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 --1 -1; -#X text 639 -294 open a supported; -#X text 640 -283 movie-clip; -#X obj 610 -64 unpack 0 0 0; -#X floatatom 600 -41 5 0 0 3 length - -; -#X floatatom 649 -41 5 0 0 3 width - -; -#X floatatom 699 -41 5 0 0 3 height - -; -#X obj 654 -83 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 --1 -1; -#X floatatom 636 -118 5 0 10000 1 frame# - -; -#X obj 597 -229 openpanel; -#X msg 597 -209 open \$1; -#X obj 585 31 rectangle 4 3; -#X obj 585 -100 pix_film; -#X msg 603 -166 auto \$1; -#X obj 603 -184 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 -1; -#X msg 614 -142 colorspace Grey; -#X obj 518 211 pix_preview; -#X obj 684 -169 loadbang; -#X obj 439 134 metro 140; -#X obj 434 105 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 -1; -#X obj 518 132 pix_resize 128 128; -#X msg 663 69 -1 -2 -1 -2 8 -2 1 -2 1; -#X obj 522 106 pix_convolve 3 3; -#X msg 676 96 0.125 0.125 0.125 0.125 0.125 0.125 0.125 0.125 0.125 -; -#X connect 3 0 4 0; -#X connect 4 0 3 0; -#X connect 7 0 21 0; -#X connect 8 0 20 0; -#X connect 9 0 18 0; -#X connect 12 0 13 0; -#X connect 12 1 14 0; -#X connect 12 2 15 0; -#X connect 16 0 17 0; -#X connect 17 0 21 1; -#X connect 18 0 19 0; -#X connect 19 0 21 0; -#X connect 21 0 8 0; -#X connect 21 0 29 0; -#X connect 21 1 12 0; -#X connect 21 2 16 0; -#X connect 22 0 21 0; -#X connect 23 0 22 0; -#X connect 24 0 21 0; -#X connect 26 0 23 0; -#X connect 27 0 25 0; -#X connect 28 0 27 0; -#X connect 29 0 25 0; -#X connect 32 0 33 0; -#X connect 33 0 32 0; -#X connect 36 0 50 0; -#X connect 37 0 49 0; -#X connect 38 0 47 0; -#X connect 41 0 42 0; -#X connect 41 1 43 0; -#X connect 41 2 44 0; -#X connect 45 0 46 0; -#X connect 46 0 50 1; -#X connect 47 0 48 0; -#X connect 48 0 50 0; -#X connect 50 0 37 0; -#X connect 50 0 60 0; -#X connect 50 1 41 0; -#X connect 50 2 45 0; -#X connect 51 0 50 0; -#X connect 52 0 51 0; -#X connect 53 0 50 0; -#X connect 55 0 52 0; -#X connect 56 0 54 0; -#X connect 57 0 56 0; -#X connect 58 0 54 0; -#X connect 59 0 60 2; -#X connect 60 0 58 0; -#X connect 61 0 60 2; Modified: trunk/externals/pdvjtools/pix_preview/pix_preview-help.pd =================================================================== --- trunk/externals/pdvjtools/pix_preview/pix_preview-help.pd 2009-01-25 01:01:30 UTC (rev 10625) +++ trunk/externals/pdvjtools/pix_preview/pix_preview-help.pd 2009-01-25 01:12:52 UTC (rev 10626) @@ -1,9 +1,4 @@ -#N canvas 0 25 1247 665 10; -#X obj 419 -161 cnv 15 250 350 empty empty empty 20 12 0 14 -228992 --66577 0; -#X text 423 -178 Example:; -#X obj 564 122 cnv 15 100 60 empty empty empty 20 12 0 14 -195568 -66577 -0; +#N canvas 33 25 727 665 10; #N canvas 0 0 450 300 gemwin 0; #X obj 132 136 gemwin; #X obj 67 89 outlet; @@ -22,56 +17,65 @@ #X connect 7 0 4 0; #X connect 7 1 6 0; #X connect 7 1 5 0; -#X restore 569 161 pd gemwin; -#X msg 569 142 destroy; -#X text 565 121 Create window:; -#X obj 421 -130 cnv 15 155 250 empty empty empty 20 12 0 14 -24198 --66577 0; -#X obj 421 -155 gemhead; -#X obj 421 142 pix_texture; -#X obj 433 -125 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 +#X restore 186 -300 pd gemwin; +#X msg 186 -319 create; +#X obj 126 -262 gemhead; +#X obj 22 -61 pix_texture; +#X obj 224 -264 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#X text 475 -161 open a supported; -#X text 476 -150 movie-clip; -#X obj 446 69 unpack 0 0 0; -#X floatatom 436 92 5 0 0 3 length - -; -#X floatatom 485 92 5 0 0 3 width - -; -#X floatatom 535 92 5 0 0 3 height - -; -#X obj 490 50 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 +#X obj 195 -122 bng 15 250 50 0 empty empty empty 20 7 0 10 -262144 -1 -1; -#X floatatom 472 15 5 0 10000 1 frame# - -; -#X obj 433 -96 openpanel; -#X msg 433 -76 open \$1; -#X obj 421 164 rectangle 4 3; -#X obj 421 33 pix_film; -#X msg 439 -33 auto \$1; -#X obj 439 -51 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 -1; -#X msg 450 -9 colorspace Grey; -#X obj 121 101 pix_preview; -#X obj 520 -36 loadbang; -#X obj 50 -136 metro 140; -#X obj 45 -165 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 -1; -#X connect 3 0 4 0; -#X connect 4 0 3 0; -#X connect 7 0 21 0; -#X connect 8 0 20 0; -#X connect 9 0 18 0; -#X connect 12 0 13 0; -#X connect 12 1 14 0; -#X connect 12 2 15 0; -#X connect 16 0 17 0; -#X connect 17 0 21 1; -#X connect 18 0 19 0; -#X connect 19 0 21 0; -#X connect 21 0 8 0; -#X connect 21 0 25 0; -#X connect 21 1 12 0; -#X connect 21 2 16 0; -#X connect 22 0 21 0; -#X connect 23 0 22 0; -#X connect 24 0 21 0; -#X connect 26 0 23 0; -#X connect 27 0 25 0; -#X connect 28 0 27 0; +#X floatatom 187 -142 5 0 10000 1 - - -; +#X obj 181 -235 openpanel; +#X msg 181 -215 open \$1; +#X obj 22 -39 rectangle 4 3; +#X obj 126 -139 pix_film; +#X obj 126 126 pix_preview; +#X obj 175 -185 loadbang; +#X obj 213 2 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 +; +#X msg 215 87 connect; +#X obj 126 -63 pix_resize 168 128; +#X obj 213 23 metro 80; +#X floatatom 234 3 5 0 0 0 - - -; +#X obj 126 -91 pix_separator; +#X obj 22 -89 pix_separator; +#X text 233 -15 fps; +#X obj 170 -24 loadbang; +#X obj 215 54 del 250; +#X msg 175 -165 auto 1; +#X text 252 -321 <<<---- 1 :: First of all create the Gem window; +#X text 344 -305 pix_preview doues not work if Gem is not rendering +; +#X text 256 -259 <<<---- 2 :: Load a video file; +#X text 355 -48 big previews are too much CPU expensives; +#X text 278 2 <<<---- :: You can change the framerate of the preview +; +#X text 270 -62 <<<---- :: Resize your pix to a preview size; +#X text 357 16 hi framerates are too much CPU expensives; +#X text 276 87 <<<---- 3 :: You must connect to tcl with a socket. +; +#X connect 0 0 1 0; +#X connect 1 0 0 0; +#X connect 2 0 10 0; +#X connect 3 0 9 0; +#X connect 4 0 7 0; +#X connect 5 0 6 0; +#X connect 6 0 10 1; +#X connect 7 0 8 0; +#X connect 8 0 10 0; +#X connect 10 0 18 0; +#X connect 10 0 19 0; +#X connect 10 2 5 0; +#X connect 12 0 23 0; +#X connect 13 0 16 0; +#X connect 14 0 11 0; +#X connect 15 0 11 0; +#X connect 16 0 11 0; +#X connect 17 0 16 1; +#X connect 18 0 15 0; +#X connect 19 0 3 0; +#X connect 21 0 13 0; +#X connect 21 0 22 0; +#X connect 22 0 14 0; +#X connect 23 0 10 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:[10625] trunk/externals/pdvjtools/pix_preview
by lluisbigorda＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10625 http://pure-data.svn.sourceforge.net/pure-data/?rev=10625&view=rev Author: lluisbigorda Date: 2009-01-25 01:01:30 +0000 (Sun, 25 Jan 2009) Log Message: ----------- makefile works on pd-svn tree Modified Paths: -------------- trunk/externals/pdvjtools/pix_preview/Makefile trunk/externals/pdvjtools/pix_preview/pix_preview.cc Modified: trunk/externals/pdvjtools/pix_preview/Makefile =================================================================== --- trunk/externals/pdvjtools/pix_preview/Makefile 2009-01-25 00:48:32 UTC (rev 10624) +++ trunk/externals/pdvjtools/pix_preview/Makefile 2009-01-25 01:01:30 UTC (rev 10625) @@ -1,5 +1,5 @@ -PD_DIR = /usr/src/pd-0.40-2 -GEM_DIR = /usr/src/Gem +PD_DIR = ../../../pd +GEM_DIR = ../../../Gem LIBS = -lm GEM2PNM_VERSION = 0.6 Modified: trunk/externals/pdvjtools/pix_preview/pix_preview.cc =================================================================== --- trunk/externals/pdvjtools/pix_preview/pix_preview.cc 2009-01-25 00:48:32 UTC (rev 10624) +++ trunk/externals/pdvjtools/pix_preview/pix_preview.cc 2009-01-25 01:01:30 UTC (rev 10625) @@ -355,19 +355,20 @@ //std::cout << "NOT encoded: " << pnm << std::endl; - //pnm64 = base64_encode(reinterpret_cast<const unsigned char*>(pnm.c_str()), pnm.length()); + pnm64 = base64_encode(reinterpret_cast<const unsigned char*>(pnm.c_str()), pnm.length()); + //std::cout << "encoded: " << pnm64 << std::endl; - //m_glist = (t_glist *) canvas_getcurrent(); + m_glist = (t_glist *) canvas_getcurrent(); - //sys_vgui("img%x put {%s}\n", this->x_obj, reinterpret_cast<const unsigned char*>(pnm64.c_str()) ); - image_drawme((pix_preview *)this->x_obj, (t_glist *) this->getCanvas(), 0, m_xsize, m_ysize); -// sys_vgui(".x%x.c coords %xS %d %d\n", -// this->getCanvas(), this->x_obj, -// text_xpix(this->x_obj, (t_glist *)this->getCanvas()) + (m_xsize/2), text_ypix(this->x_obj, (t_glist *)this->getCanvas()) + (m_ysize/2)); + sys_vgui("img%x configure -data {%s}\n", this->x_obj, reinterpret_cast<const unsigned char*>(pnm64.c_str()) ); +// image_drawme((pix_preview *)this->x_obj, (t_glist *) this->getCanvas(), 0, m_xsize, m_ysize); + sys_vgui(".x%x.c coords %xS %d %d\n", + this->getCanvas(), this->x_obj, + text_xpix(this->x_obj, (t_glist *)this->getCanvas()) + (m_xsize/2), text_ypix(this->x_obj, (t_glist *)this->getCanvas()) + (m_ysize/2)); //fprintf (stderr, "%x %x - %d %d\n",x,(t_object*)x, text_xpix((t_object*)x, glist), text_ypix((t_object*)x, glist)); break; 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:[10624] trunk/externals/pdvjtools/videogrid/videogrid .cc
by sergi_ll＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10624 http://pure-data.svn.sourceforge.net/pure-data/?rev=10624&view=rev Author: sergi_ll Date: 2009-01-25 00:48:32 +0000 (Sun, 25 Jan 2009) Log Message: ----------- litle changes Modified Paths: -------------- trunk/externals/pdvjtools/videogrid/videogrid.cc Modified: trunk/externals/pdvjtools/videogrid/videogrid.cc =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid.cc 2009-01-25 00:39:26 UTC (rev 10623) +++ trunk/externals/pdvjtools/videogrid/videogrid.cc 2009-01-25 00:48:32 UTC (rev 10624) @@ -2,7 +2,7 @@ extern "C" { /* -videogrid external for Puredatai +videogrid external for Puredata Lluis Gomez i Bigorda :: lluis-at-hangar.org Sergi Lario Loyo :: slario-at-gmail.com @@ -27,26 +27,31 @@ #include <unistd.h> #include <math.h> -/* incloure les definicions de variables i - prototipus de dades i de funcions de puredata */ +/* + * incloure les definicions de variables i prototipus de dades i de funcions de puredata +*/ #include "m_pd.h" -/* incloure estructures de dades i capceleres de funcions gàfiques bàsiques de pd */ +/* + * incloure estructures de dades i capceleres de funcions gàfiques bàsiques de pd +*/ #include "g_canvas.h" -/* incloure estructures de dades i capceleres de funcions per traballar amb threads */ +/* + * incloure estructures de dades i capceleres de funcions per traballar amb threads +*/ #include "pthread.h" -/*some linux distros need this to compile ffmpeg correctly as cpp*/ +/* some linux distros need this to compile ffmpeg correctly as cpp */ #define __STDC_CONSTANT_MACROS 1 -/*ffmpeg includes*/ +/* ffmpeg includes */ #include <ffmpeg/avcodec.h> #include <ffmpeg/avformat.h> #include <ffmpeg/avutil.h> #include <ffmpeg/swscale.h> -/*libquicktime includes*/ -//#include <quicktime/lqt.h> -//#include <quicktime/colormodels.h> +/* libquicktime includes */ +// #include <quicktime/lqt.h> +// #include <quicktime/colormodels.h> #include <lqt/lqt.h> #include <lqt/colormodels.h> @@ -64,7 +69,6 @@ #define BYTESNOMFITXER 512 /* 8bits clamp rgb values */ - #define CLAMP8(x) (((x)<0) ? 0 : ((x>255)? 255 : (x))) #define BYTESNOMFITXERIMATGE 512 @@ -86,15 +90,13 @@ char szFilename[32]; int nN = posi; - /*int cont=0;*/ - - char nNstr[BYTES_NUM_TEMP]; - pathimage ig_path = PATH_TEMPORAL; + char nNstr[BYTES_NUM_TEMP]; + pathimage ig_path = PATH_TEMPORAL; - sprintf(nNstr, "%d", nN); - strcat(ig_path,nNstr); - strcat(ig_path,"."); - strcat(ig_path,FORMAT_MINIATURA); + sprintf(nNstr, "%d", nN); + strcat(ig_path,nNstr); + strcat(ig_path,"."); + strcat(ig_path,FORMAT_MINIATURA); // Open file sprintf(szFilename, ig_path); @@ -105,26 +107,25 @@ // Write header fprintf(pFile, "P6\n%d %d\n255\n", W, H); + int w = width; + int h = height; + float k = (width/W); + float l = (height/H); + int i,j,y,x,realx; - int w = width; - int h = height; - float k = (width/W); - float l = (height/H); - int i,j,y,x,realx; - // Write pixel data for(y=0; y<H; y=y++) { for(x=0; x<W; x=x++) { - realx = ((x*k)+(3-((int)(x*k)%3)))*3; - fwrite((pFrame->data[0]+(int)(y*l)*pFrame->linesize[0])+realx, 1, 3, pFile); + realx = ((x*k)+(3-((int)(x*k)%3)))*3; + fwrite((pFrame->data[0]+(int)(y*l)*pFrame->linesize[0])+realx, 1, 3, pFile); } } - // for (i=0;i<(l*H);i=i+l) { - // for (j=0;j<(k*W);j=j+k) { - // fwrite(pFrame->data[0]+(i*pFrame->linesize[0]+j), 1, 3, pFile); - // } - // } + // for (i=0;i<(l*H);i=i+l) { + // for (j=0;j<(k*W);j=j+k) { + // fwrite(pFrame->data[0]+(i*pFrame->linesize[0]+j), 1, 3, pFile); + // } + // } // Close file fclose(pFile); @@ -313,7 +314,6 @@ int nN = posi; int x_vwidth = 0; int x_vheight = 0; - /* convertir(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); */ qt = quicktime_open(pathFitxer, 1, 0); if (!(qt)){ @@ -337,8 +337,7 @@ qt_cmodel = BC_YUV420P; x_vwidth = quicktime_video_width(qt,0); x_vheight = quicktime_video_height(qt,0); - - + free(qt_frame); qt_frame = (unsigned char*)malloc(x_vwidth*x_vheight*4); @@ -356,19 +355,17 @@ switch(qt_cmodel){ case BC_YUV420P: - printf(" "); + /* printf(" "); */ /* post("videogrid: qt colormodel : BC_YUV420P"); */ - /* per a fer la miniatura - cada k colomnes pillem una - cada l files pillem una */ + /* per a fer la miniatura + cada k colomnes pillem una + cada l files pillem una */ int w = x_vwidth; int h = x_vheight; int k = (w/W); int l = (h/H); - /*int cont=0;*/ - char nNstr[BYTES_NUM_TEMP]; pathimage ig_path = PATH_TEMPORAL; @@ -376,8 +373,8 @@ strcat(ig_path,nNstr); strcat(ig_path,"."); strcat(ig_path,FORMAT_MINIATURA); - /* printf("Creacio de la imatge %s ...",ig_path); */ - /* escriu el contingut de data a un arxiu. */ + /* printf("Creacio de la imatge %s ...",ig_path); */ + /* escriu el contingut de data a un arxiu. */ FILE *fp = fopen(ig_path, "w"); fprintf (fp, "P6\n%d %d\n255\n", W, H); @@ -395,7 +392,7 @@ } } - /* escriu el contingut de data a un arxiu.*/ + /* escriu el contingut de data a un arxiu.*/ fclose (fp); } return 0; @@ -494,7 +491,7 @@ void eliminarCua(Cua *cua) { while (!cuaBuida(cua)) desencuar(cua); - printf("Cua eliminada\n"); + /* printf("Cua eliminada\n"); */ } /* funció que retorna el nombre de nodes de la cua */ @@ -511,23 +508,23 @@ return (contador); } -/* funció que escriu la cua de nodes per la sortida estàndard */ +/* funció que escriu la cua de nodes */ void escriuCua(Cua *cua) { if(!cuaBuida(cua)) { Node *actual; actual=cua->davanter; - printf("CUA DE NODES\n["); + post("THUMBS INSIDE\n["); do{ - printf("#%s#",actual->pathFitxer); + post("#%s#",actual->pathFitxer); actual = actual->seguent; }while(actual); - printf("]\n"); + post("]\n"); } else - printf("Cua buida\n"); + post("EMPTY: NO THUMBS INSIDE\n"); } @@ -741,6 +738,7 @@ int format_adequat_v(path nomF){ int retorn = 0; + /* path ig_path = ""; strcat(ig_path,nomF); char *t1; @@ -749,7 +747,6 @@ t1 != NULL; t1 = strtok(NULL,".") ) strcpy(extensio,t1); - /* if(strcmp(extensio,"mov")==0) retorn = 1; if(strcmp(extensio,"eps")==0) retorn = 1; if(strcmp(extensio,"gif")==0) retorn = 1; @@ -760,7 +757,6 @@ if(strcmp(extensio,"tif")==0) retorn = 1; if(strcmp(extensio,"tiff")==0) retorn = 1; */ - return (retorn); } @@ -770,70 +766,59 @@ int maxim; char nNstr[BYTES_NUM_TEMP]; int pos = 0; - /* escriu l'argument entrat */ - /* post("Afegint la imatge %s ...",entrada); */ - maxim = x->x_num_fil * x->x_num_col; - path ig_path = PATH_TEMPORAL; + maxim = x->x_num_fil * x->x_num_col; + path ig_path = PATH_TEMPORAL; - /* si hi ha tants nodes a la cua com el maxim */ - if((numNodes(&x->x_cua)) >= maxim){ - /* desencua */ - int extret; - extret = desencuar(&x->x_cua); - /* obtenir la posició en la cua del nou node */ - if(x->x_ultima_img == maxim-1) { - pos = 0; - }else{ - pos = x->x_ultima_img+1; - } - sys_vgui(".x%x.c delete %xS%d\n", glist_getcanvas(x->x_glist), x, pos); + /* si hi ha tants nodes a la cua com el maxim */ + if((numNodes(&x->x_cua)) >= maxim){ + /* desencua */ + int extret; + extret = desencuar(&x->x_cua); + /* obtenir la posició en la cua del nou node */ + if(x->x_ultima_img == maxim - 1) { + pos = 0; + }else{ + pos = x->x_ultima_img + 1; } + sys_vgui(".x%x.c delete %xS%d\n", glist_getcanvas(x->x_glist), x, x->x_ultima_img); + } - - /* - Quicktime per les conversions + /* FFMPEG o Quicktime per les conversions */ + int fferror=0; + int nN = x->x_ultima_img; + if (format_adequat_v(entrada) == 1) { + /* ara no entra: format_adequat_v = 0 sempre */ + convertir_img(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); + } else { + fferror=convertir_img_ff(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); + } + /* post ("%d",fferror); */ + if (fferror>=0) { + /* encua el nou node */ + encuar(&x->x_cua, entrada); + /* si no és el primer element a encuar incrementem la posicio de la última imatge insertada */ + if(numNodes(&x->x_cua) != 0) x->x_ultima_img ++; + /* + * si assoleix el maxim torna a començar, + * inicialitzant la posició en el tauler de la última imatge insertada */ - int fferror=0; - int nN = x->x_ultima_img; - if (format_adequat_v(entrada) == 1) { - convertir_img(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); - } else { - fferror=convertir_img_ff(entrada,FORMAT_MINIATURA, W_CELL, H_CELL, nN); - } - post ("%d",fferror); - if (fferror>=0) { - - /* encua el nou node */ - encuar(&x->x_cua, entrada); - /* si no és el primer element a encuar incrementem la posicio de la última imatge insertada */ - if(numNodes(&x->x_cua) != 1) x->x_ultima_img ++; - /* si assoleix el maxim torna a començar, inicialitzant la posició en el tauler de la última imatge insertada */ - if(x->x_ultima_img == maxim) x->x_ultima_img = 0; + if(x->x_ultima_img == maxim) x->x_ultima_img = 0; - sprintf(nNstr, "%d", nN); - strcat(ig_path,nNstr); - strcat(ig_path,"."); - strcat(ig_path,FORMAT_MINIATURA); - /*printf("Creacio de la imatge %s ...",ig_path);*/ - sys_vgui("image create photo img%x%d -file %s\n",x,nN,ig_path); - /* printf("1. Creacio de la imatge %s ...",ig_path); */ - sys_vgui(".x%x.c create image %d %d -image img%x%d -tags %xS%d\n", - glist_getcanvas(x->x_glist), - text_xpix(&x->x_obj, x->x_glist) + getX(x,nN) + (W_CELL/2), - text_ypix(&x->x_obj, x->x_glist) + getY(x,nN) + (H_CELL/2), - x,nN,x,nN); - /* printf("2. Creacio de la imatge %s ...",ig_path); */ - if(nN == 0){ - x->x_tauler_primer = x->x_cua.final; - /* post("Ara el primer del tauler es %s\n",x->x_tauler_primer->pathFitxer); */ - } - /* printf("SURT de la creacio de la imatge %s ...",ig_path); */ - /* - sys_vgui("image create photo img%x -file %s\n",x,entrada); - sys_vgui(".x%x.c create image %d %d -image img%x -tags %xS\n", - glist_getcanvas(glist),text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),x,x); - */ + sprintf(nNstr, "%d", nN); + strcat(ig_path,nNstr); + strcat(ig_path,"."); + strcat(ig_path,FORMAT_MINIATURA); + + sys_vgui("image create photo img%x%d -file %s\n",x,nN,ig_path); + sys_vgui(".x%x.c create image %d %d -image img%x%d -tags %xS%d\n", + glist_getcanvas(x->x_glist), + text_xpix(&x->x_obj, x->x_glist) + getX(x,nN) + (W_CELL/2), + text_ypix(&x->x_obj, x->x_glist) + getY(x,nN) + (H_CELL/2), + x,nN,x,nN); + if(nN == 0){ + x->x_tauler_primer = x->x_cua.final; } + } } /* dibuixa videogrid */ @@ -866,7 +851,7 @@ strcat(ig_path,FORMAT_MINIATURA); /* post("reestablint la imatge %s", actual->pathFitxer); */ // videogrid_afegir_imatge(x,actual->pathFitxer); - convertir_img(actual->pathFitxer,FORMAT_MINIATURA, W_CELL, H_CELL, nN); + convertir_img_ff(actual->pathFitxer,FORMAT_MINIATURA, W_CELL, H_CELL, nN); sys_vgui("image create photo img%x%d -file %s\n",x,nN,ig_path); sys_vgui(".x%x.c create image %d %d -image img%x%d -tags %xS%d\n", glist_getcanvas(x->x_glist),text_xpix(&x->x_obj, x->x_glist) + getX(x,nN) + (W_CELL/2), text_ypix(&x->x_obj, x->x_glist) + getY(x,nN) + (H_CELL/2),x,nN,x,nN); @@ -973,18 +958,13 @@ FILE *fitxer; path e; strcpy(e,entrada->s_name); - /* post("putvideo de %s\n", e); */ - fitxer = fopen(e,"r"); if (!fitxer) { post("Videogrid: Problem opening file %s.\n",e); } else { - /* post("s'encua la imatge %s\n", e); */ videogrid_afegir_imatge(x,e); - /*outlet_symbol(x->x_sortida, entrada);*/ } - /* post("putvideo amb img = %s\n", e); */ } /* mètode de la classe que es dispara al rebre una entrada de missatge amb [putvideodir +string( com a paràmetre */ @@ -1003,7 +983,10 @@ maxim = x->x_num_fil * x->x_num_col; strcpy(directoriAnterior, x->x_dir_actual); strcpy(x->x_dir_actual, x->x_dir_canvi); - /* si es el mateix directori entrat l'ultim busca la ultima imatge afegida per a seguir a encuant a partir d'ella en endavant */ + /* + * si es el mateix directori entrat l'ultim busca la ultima imatge afegida + * per a seguir a encuant a partir d'ella en endavant + */ if(strcmp(directoriAnterior, x->x_dir_actual) == 0){ /* post("Videogrid: Repeteix directori %s\n", x->x_dir_actual); */ while ( (direntp = readdir( dirp )) != NULL ){ @@ -1187,7 +1170,7 @@ *yp1 = text_ypix(&x->x_obj, glist); *xp2 = text_xpix(&x->x_obj, glist) + (cols*W_CELL) + ((cols + 1) * GRUIX); *yp2 = text_ypix(&x->x_obj, glist) + (fils*H_CELL) + ((fils + 1) * GRUIX); - /* post("Esta amb el ratoli en el punt %d %d %d %d o son els vetexs de la caixa... es/bd", xp1, yp1, xp2, yp2); */ + /* post("Esta amb el ratoli en el punt %d %d %d %d o son els vetexs de la caixa... es/bd", xp1, yp1, xp2, yp2); */ } static void videogrid_displace(t_gobj *z, t_glist *glist,int dx, int dy) @@ -1378,7 +1361,7 @@ x->x_num_fil = nfil; x->x_num_col = ncol; }else{ - post("Videogrid: The number of rows and columns is less than the minimum allowed: 1 cell.\n",maxdigit); + post("Videogrid: The number of rows and columns is less than the minimum allowed: 1 cell.\n"); } }else{ post("Videogrid: The number of rows and columns exceeds the maximum allowed: a total of %d cells.\n",maxdigit); @@ -1503,7 +1486,7 @@ token = strtok(cadenaPaths,"|"); while(token){ tt = gensym(token); - printf("AFEGINT CARREGANT %s\n",tt->s_name); + // printf("AFEGINT CARREGANT %s\n",tt->s_name); imagegrid_putimg(x,tt); token = strtok(NULL,"|"); } @@ -1524,14 +1507,16 @@ x->x_color_grasp = gensym("#F1882B"); break; } - /* printf("S'ha instanciat un videogrid anomenat %s amb les caracteristiques seguents:",x->x_name->s_name); - printf("Nombre de files %d - Nombre de columnes: %d", x->x_num_fil, x->x_num_col); */ +/* + * printf("S'ha instanciat un videogrid anomenat %s amb les caracteristiques seguents:",x->x_name->s_name); + * printf("Nombre de files %d - Nombre de columnes: %d", x->x_num_fil, x->x_num_col); +*/ return (x); } static void videogrid_destroy(t_videogrid *x){ - /* elimina el contingut de la cua */ +/* elimina el contingut de la cua */ eliminarCua(&x->x_cua); post("Videogrid destroyed.\n"); } @@ -1543,64 +1528,52 @@ void videogrid_setup(void) { load_tk_procs(); - post("videogrid: version 0.2, written by Sergi Lario (slario(a)gmail.com) & Lluis Gomez i Bigorda (lluis(a)artefacte.org)"); + post("videogrid: version 0.2"); + post("written by Sergi Lario (slario(a)gmail.com) & Lluis Gomez i Bigorda (lluis(a)artefacte.org)"); - /* - sense pas d'arguments videogrid_class = class_new(gensym("videogrid"), (t_newmethod)videogrid_new, - (t_method)videogrid_destroy, - sizeof(t_videogrid), - CLASS_DEFAULT, - A_DEFSYM, - 0); - amb pas d'arguments: - */ - videogrid_class = class_new(gensym("videogrid"), - (t_newmethod)videogrid_new, (t_method)videogrid_destroy, sizeof(t_videogrid), CLASS_DEFAULT, A_GIMME, 0); - /* class_new crea la nova classe retornant un punter al seu prototipus, - el primer argument es el nom simbolic de la classe, - el segon i tercer corresponen al constructor i destructor de la classe respectivament, - (el constructor instancia un objecte i inicialitza les seves dades cada cop que es crea un objecte - el destructor allibera la memoria reservada al destruid l'objecte per qualsevol causa) - el quart correspon a la mida de l'estructura de dades, per tal de poder reservar la memoria necessària, - el cinquè influeix en el mòde de representació gràfica del objectes. Per defecte CLASS_DEFAULT o ``0', - la resta d'arguments defineixen els arguments de l'objecte i el seu tipus, la llista acaba amb 0 - */ - /* afegeix el mètode helloworld_bang a la classe helloworld_class */ +/* + * class_new crea la nova classe retornant un punter al seu prototipus, + * el primer argument es el nom simbolic de la classe, + * el segon i tercer corresponen al constructor i destructor de la classe respectivament, + * (el constructor instancia un objecte i inicialitza les seves dades cada cop que es crea un objecte + * el destructor allibera la memoria reservada al destruir l'objecte per qualsevol causa) + * el quart correspon a la mida de l'estructura de dades, per tal de poder reservar la memoria necessària, + * el cinquè influeix en el mòde de representació gràfica del objectes. Per defecte CLASS_DEFAULT o '0', + * la resta d'arguments defineixen els arguments de l'objecte i el seu tipus, la llista acaba amb 0 +*/ + class_addbang(videogrid_class, videogrid_bang); - /* afegeix el mètode videogrid_putvideo a la classe videogrid per a entrades de missatge - que inicien amb putvideo i una cadena string com a argument */ - class_addmethod(videogrid_class,(t_method)videogrid_putvideo,gensym("putvideo"), A_DEFSYMBOL, 0); + class_addmethod(videogrid_class, (t_method)videogrid_putvideo,gensym("putvideo"), A_DEFSYMBOL, 0); - /* afegeix el mètode videogrid_putvideodir a la classe videogrid per a entrades de missatge - que inicien amb putvideodir i una cadena string com a argument */ - class_addmethod(videogrid_class,(t_method)videogrid_putvideodir,gensym("putvideodir"), A_DEFSYMBOL, 0); - /* afegeix un metode per a modificar el valor de les propietats de l'objecte */ + class_addmethod(videogrid_class, (t_method)videogrid_putvideodir,gensym("putvideodir"), A_DEFSYMBOL, 0); + class_addmethod(videogrid_class, (t_method)videogrid_dialog, gensym("dialog"), A_GIMME, 0); - /* afegeix un metode per l'obtencio de la posicio del clic del ratolí */ + class_addmethod(videogrid_class, (t_method)videogrid_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); - /* v 0.2 -- afegeix un metode netejar el contigut del tauler */ + class_addmethod(videogrid_class, (t_method)videogrid_clear, gensym("clear"), A_GIMME, 0); - /* v 0.2 -- afegeix un metode seek #num per disparar */ + class_addmethod(videogrid_class, (t_method)videogrid_seek, gensym("seek"), A_FLOAT, 0); - /* inicia el comportament de videogrid */ + +/* inicia el comportament de videogrid */ + videogrid_setwidget(); #if PD_MINOR_VERSION >= 37 - class_setsavefn(videogrid_class,&videogrid_save); + class_setsavefn(videogrid_class, &videogrid_save); class_setpropertiesfn(videogrid_class, videogrid_properties); #endif - /* afegeix el mètode videogrid_widgetbehavior al la classe videogrid per a la creació de l'element visual */ - class_setwidget(videogrid_class,&videogrid_widgetbehavior); + class_setwidget(videogrid_class, &videogrid_widgetbehavior); class_sethelpsymbol(videogrid_class, gensym("videogrid.pd")); } } 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:[10623] branches/pd-devel/0.41.4/src/configure.in
by eighthave＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10623 http://pure-data.svn.sourceforge.net/pure-data/?rev=10623&view=rev Author: eighthave Date: 2009-01-25 00:39:26 +0000 (Sun, 25 Jan 2009) Log Message: ----------- checked in support_new_jackosx-0.41.2.patch so that I can make a pd-devel nightly build for Mac OS X Modified Paths: -------------- branches/pd-devel/0.41.4/src/configure.in Modified: branches/pd-devel/0.41.4/src/configure.in =================================================================== --- branches/pd-devel/0.41.4/src/configure.in 2009-01-25 00:37:29 UTC (rev 10622) +++ branches/pd-devel/0.41.4/src/configure.in 2009-01-25 00:39:26 UTC (rev 10623) @@ -246,11 +246,11 @@ OSNUMBER=2 if test x$jack = "xyes"; then - LDFLAGS=$LDFLAGS" -weak_framework Jack" + LDFLAGS=$LDFLAGS" -weak_framework Jackmp" fi if test x$jack = "xrun"; then - LDFLAGS=$LDFLAGS" -weak_framework Jack" + LDFLAGS=$LDFLAGS" -weak_framework Jackmp" fi fi 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:[10622] trunk/externals/pdp_opencv
by lluisbigorda＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10622 http://pure-data.svn.sourceforge.net/pure-data/?rev=10622&view=rev Author: lluisbigorda Date: 2009-01-25 00:37:29 +0000 (Sun, 25 Jan 2009) Log Message: ----------- deleted wrong help file Modified Paths: -------------- trunk/externals/pdp_opencv/pdp_opencv_bgsubstract.c trunk/externals/pdp_opencv/pdp_opencv_haarcascade.c Added Paths: ----------- trunk/externals/pdp_opencv/COPYING Removed Paths: ------------- trunk/externals/pdp_opencv/README trunk/externals/pdp_opencv/pdp_opencv_contours_composition-help.pd Added: trunk/externals/pdp_opencv/COPYING =================================================================== --- trunk/externals/pdp_opencv/COPYING (rev 0) +++ trunk/externals/pdp_opencv/COPYING 2009-01-25 00:37:29 UTC (rev 10622) @@ -0,0 +1,36 @@ +IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. + +By downloading, copying, installing or using the software you agree to this license. +If you do not agree to this license, do not download, install, +copy or use the software. + + + Intel License Agreement + For Open Source Computer Vision Library + +Copyright (C) 2000, 2001, Intel Corporation, all rights reserved. +Third party copyrights are property of their respective owners. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistribution's of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistribution's in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * The name of Intel Corporation may not be used to endorse or promote products + derived from this software without specific prior written permission. + +This software is provided by the copyright holders and contributors "as is" and +any express or implied warranties, including, but not limited to, the implied +warranties of merchantability and fitness for a particular purpose are disclaimed. +In no event shall the Intel Corporation or contributors be liable for any direct, +indirect, incidental, special, exemplary, or consequential damages +(including, but not limited to, procurement of substitute goods or services; +loss of use, data, or profits; or business interruption) however caused +and on any theory of liability, whether in contract, strict liability, +or tort (including negligence or otherwise) arising in any way out of +the use of this software, even if advised of the possibility of such damage. Deleted: trunk/externals/pdp_opencv/README =================================================================== --- trunk/externals/pdp_opencv/README 2009-01-25 00:33:06 UTC (rev 10621) +++ trunk/externals/pdp_opencv/README 2009-01-25 00:37:29 UTC (rev 10622) @@ -1 +0,0 @@ -See docs/index.htm Modified: trunk/externals/pdp_opencv/pdp_opencv_bgsubstract.c =================================================================== --- trunk/externals/pdp_opencv/pdp_opencv_bgsubstract.c 2009-01-25 00:33:06 UTC (rev 10621) +++ trunk/externals/pdp_opencv/pdp_opencv_bgsubstract.c 2009-01-25 00:37:29 UTC (rev 10622) @@ -52,7 +52,7 @@ int x_set; int x_threshold; - IplImage *image, *prev_gray, *gray, *grayLow, *grayUp, *diff_8U; + IplImage *image, *prev_image, *gray, *grayLow, *grayUp, *diff_8U; } t_pdp_opencv_bgsubstract; @@ -79,7 +79,7 @@ cvReleaseImage(&x->gray); cvReleaseImage(&x->grayLow); cvReleaseImage(&x->grayUp); - cvReleaseImage(&x->prev_gray); + cvReleaseImage(&x->prev_image); cvReleaseImage(&x->diff_8U); //create the orig image with new size @@ -88,7 +88,7 @@ x->gray = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1); x->grayLow = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1); x->grayUp = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1); - x->prev_gray = cvCreateImage( cvSize(x->image->width,x->image->height), 8, 1 ); + x->prev_image = cvCreateImage( cvSize(x->image->width,x->image->height), 8, 3 ); x->diff_8U = cvCreateImage( cvSize(x->image->width,x->image->height), 8, 1 ); } @@ -101,21 +101,49 @@ // FEM UNA COPIA DEL PACKET A image->imageData ... http://www.cs.iit.edu/~agam/cs512/lect-notes/opencv-intro/opencv-intro.html aqui veiem la estructura de IplImage memcpy( x->image->imageData, data, x->x_size*3 ); - cvCvtColor( x->image, x->gray, CV_BGR2GRAY ); + //cvCvtColor( x->image, x->gray, CV_BGR2GRAY ); if (x->x_set) { - memcpy( x->prev_gray->imageData, x->gray->imageData, x->x_size ); + memcpy( x->prev_image->imageData, data, x->x_size*3 ); x->x_set=0; } - cvSubS (x->prev_gray,cvScalar(x->x_threshold,x->x_threshold,x->x_threshold,x->x_threshold),x->grayLow,NULL); - cvAddS (x->prev_gray,cvScalar(x->x_threshold,x->x_threshold,x->x_threshold,x->x_threshold),x->grayUp,NULL); - cvInRange (x->gray, x->grayLow, x->grayUp, x->diff_8U); + //cvSubS (x->prev_image,cvScalar(x->x_threshold,x->x_threshold,x->x_threshold,x->x_threshold),x->grayLow,NULL); + //cvAddS (x->prev_image,cvScalar(x->x_threshold,x->x_threshold,x->x_threshold,x->x_threshold),x->grayUp,NULL); + //cvInRange (x->gray, x->grayLow, x->grayUp, x->diff_8U); - cvNot (x->diff_8U,x->diff_8U); + //cvNot (x->diff_8U,x->diff_8U); - cvCvtColor(x->diff_8U,x->image,CV_GRAY2BGR); + //cvCvtColor(x->diff_8U,x->image,CV_GRAY2BGR); + + int h,w,hlength, chRed, chGreen, chBlue; + long src,pixsize; + + chRed =0; + chGreen =1; + chBlue =2; + src = 0; + + + for (h=0; h<x->image->height; h++){ + for(w=0; w<x->image->width; w++){ + if (((x->image->imageData[src+chRed ] > x->prev_image->imageData[src+chRed ] - x->x_threshold)&& + (x->image->imageData[src+chRed ] < x->prev_image->imageData[src+chRed ] + x->x_threshold))&& + ((x->image->imageData[src+chGreen] > x->prev_image->imageData[src+chGreen] - x->x_threshold)&& + (x->image->imageData[src+chGreen] < x->prev_image->imageData[src+chGreen] + x->x_threshold))&& + ((x->image->imageData[src+chBlue ] > x->prev_image->imageData[src+chBlue ] - x->x_threshold)&& + (x->image->imageData[src+chBlue ] < x->prev_image->imageData[src+chBlue ] + x->x_threshold))) + { + x->image->imageData[src+chRed] = 0; + x->image->imageData[src+chGreen] = 0; + x->image->imageData[src+chBlue] = 0; + } + src+=3; + } + } + + memcpy( newdata, x->image->imageData, x->x_size*3 ); return; @@ -201,7 +229,7 @@ cvReleaseImage(&x->gray); cvReleaseImage(&x->grayLow); cvReleaseImage(&x->grayUp); - cvReleaseImage(&x->prev_gray); + cvReleaseImage(&x->prev_image); cvReleaseImage(&x->diff_8U); } @@ -233,7 +261,7 @@ x->gray = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1); x->grayLow = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1); x->grayUp = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1); - x->prev_gray = cvCreateImage( cvSize(x->image->width,x->image->height), 8, 1 ); + x->prev_image = cvCreateImage( cvSize(x->image->width,x->image->height), 8, 3 ); x->diff_8U = cvCreateImage( cvSize(x->image->width,x->image->height), 8, 1 ); return (void *)x; Deleted: trunk/externals/pdp_opencv/pdp_opencv_contours_composition-help.pd =================================================================== --- trunk/externals/pdp_opencv/pdp_opencv_contours_composition-help.pd 2009-01-25 00:33:06 UTC (rev 10621) +++ trunk/externals/pdp_opencv/pdp_opencv_contours_composition-help.pd 2009-01-25 00:37:29 UTC (rev 10622) @@ -1,49 +0,0 @@ -#N canvas 0 51 521 599 10; -#X obj 101 158 pdp_xv; -#X msg 101 -138 open /dev/video0; -#X obj 101 -90 pdp_v4l2; -#X text 310 99 threshold value; -#X obj 373 365 pdp_opencv_contours; -#X obj 200 256 pdp_xv; -#X obj 375 397 pdp_xv; -#X obj 334 165 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 -1; -#X msg 243 165 mode \$1; -#X text 353 165 switch open/close and erode/dilate modes; -#X floatatom 363 212 5 0 0 0 - - -; -#X floatatom 520 365 5 0 0 0 - - -; -#X floatatom 271 101 5 0 0 0 - - -; -#X obj 458 335 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 -1; -#X obj 204 210 pdp_opencv_morphology; -#X obj 337 325 pdp_xv; -#X obj 471 234 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 -1; -#X msg 380 234 mode \$1; -#X text 490 234 switch open/close and erode/dilate modes; -#X floatatom 500 281 5 0 0 0 - - -; -#X obj 341 279 pdp_opencv_morphology; -#X obj 22 81 pdp_xv; -#X text 231 22 threshold value; -#X msg 128 -17 set; -#X obj 22 22 pdp_opencv_bgsubstract; -#X floatatom 192 24 5 0 0 0 - - -; -#X obj 101 99 pdp_opencv_threshold; -#X connect 1 0 2 0; -#X connect 2 0 24 0; -#X connect 4 0 6 0; -#X connect 7 0 8 0; -#X connect 8 0 14 0; -#X connect 12 0 26 2; -#X connect 13 0 4 1; -#X connect 14 0 5 0; -#X connect 14 0 20 0; -#X connect 16 0 17 0; -#X connect 17 0 20 0; -#X connect 20 0 15 0; -#X connect 23 0 24 0; -#X connect 24 0 21 0; -#X connect 24 0 26 0; -#X connect 25 0 24 1; -#X connect 26 0 0 0; -#X connect 26 0 14 0; Modified: trunk/externals/pdp_opencv/pdp_opencv_haarcascade.c =================================================================== --- trunk/externals/pdp_opencv/pdp_opencv_haarcascade.c 2009-01-25 00:33:06 UTC (rev 10621) +++ trunk/externals/pdp_opencv/pdp_opencv_haarcascade.c 2009-01-25 00:37:29 UTC (rev 10622) @@ -47,6 +47,7 @@ t_float x_f; t_outlet *x_outlet0; + t_outlet *x_outlet1; t_outlet *x_dataout; int x_packet0; int x_packet1; @@ -149,6 +150,7 @@ x->scale_factor, x->min_neighbors, x->mode, cvSize(x->min_size, x->min_size) ); //t = (double)cvGetTickCount() - t; //printf( "detection time = %gms\n", t/((double)cvGetTickFrequency()*1000.) ); + outlet_float(x->x_outlet1, (float)faces->total); for( i = 0; i < (faces ? faces->total : 0); i++ ) { CvRect* r = (CvRect*)cvGetSeqElem( faces, i ); @@ -293,6 +295,7 @@ t_pdp_opencv_haarcascade *x = (t_pdp_opencv_haarcascade *)pd_new(pdp_opencv_haarcascade_class); x->x_outlet0 = outlet_new(&x->x_obj, &s_anything); + x->x_outlet1 = outlet_new(&x->x_obj, &s_anything); x->x_dataout = outlet_new(&x->x_obj, &s_anything); x->x_packet0 = -1; 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:[10621] trunk/externals/pdvjtools/pdp_freeframe/ Makefile.config
by lluisbigorda＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10621 http://pure-data.svn.sourceforge.net/pure-data/?rev=10621&view=rev Author: lluisbigorda Date: 2009-01-25 00:33:06 +0000 (Sun, 25 Jan 2009) Log Message: ----------- makefile works on pd-svn tree Modified Paths: -------------- trunk/externals/pdvjtools/pdp_freeframe/Makefile.config Modified: trunk/externals/pdvjtools/pdp_freeframe/Makefile.config =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/Makefile.config 2009-01-25 00:30:34 UTC (rev 10620) +++ trunk/externals/pdvjtools/pdp_freeframe/Makefile.config 2009-01-25 00:33:06 UTC (rev 10621) @@ -2,7 +2,7 @@ # specify pd's include path here and ignore the warning # FF_PLUGIN_DIR=/usr/lib/FreeFrame -PD_CPPFLAGS=-I../../../pd +PD_CPPFLAGS=-I../../../pd/src PDP_CFLAGS=-I../../pdp/include -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -O2 -funroll-loops -fomit-frame-pointer -ffast-math -freg-struct-return -DLINUX prefix=/usr/local 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:[10620] trunk/externals/pdvjtools/pdp_freeframe/ Makefile.config
by lluisbigorda＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10620 http://pure-data.svn.sourceforge.net/pure-data/?rev=10620&view=rev Author: lluisbigorda Date: 2009-01-25 00:30:34 +0000 (Sun, 25 Jan 2009) Log Message: ----------- makefile works on pd-svn tree Modified Paths: -------------- trunk/externals/pdvjtools/pdp_freeframe/Makefile.config Modified: trunk/externals/pdvjtools/pdp_freeframe/Makefile.config =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/Makefile.config 2009-01-25 00:24:58 UTC (rev 10619) +++ trunk/externals/pdvjtools/pdp_freeframe/Makefile.config 2009-01-25 00:30:34 UTC (rev 10620) @@ -2,7 +2,7 @@ # specify pd's include path here and ignore the warning # FF_PLUGIN_DIR=/usr/lib/FreeFrame -PD_CPPFLAGS=-I../../../src +PD_CPPFLAGS=-I../../../pd PDP_CFLAGS=-I../../pdp/include -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -O2 -funroll-loops -fomit-frame-pointer -ffast-math -freg-struct-return -DLINUX prefix=/usr/local 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:[10619] trunk/externals/pdvjtools/pdp_frei0r/Makefile .config
by lluisbigorda＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10619 http://pure-data.svn.sourceforge.net/pure-data/?rev=10619&view=rev Author: lluisbigorda Date: 2009-01-25 00:24:58 +0000 (Sun, 25 Jan 2009) Log Message: ----------- makefile works on pd-svn tree Modified Paths: -------------- trunk/externals/pdvjtools/pdp_frei0r/Makefile.config Modified: trunk/externals/pdvjtools/pdp_frei0r/Makefile.config =================================================================== --- trunk/externals/pdvjtools/pdp_frei0r/Makefile.config 2009-01-25 00:22:35 UTC (rev 10618) +++ trunk/externals/pdvjtools/pdp_frei0r/Makefile.config 2009-01-25 00:24:58 UTC (rev 10619) @@ -2,17 +2,17 @@ # specify pd's include path here and ignore the warning # FR_PLUGIN_DIR=/usr/local/lib/frei0r-1/ -PD_CPPFLAGS=-I/usr/local/pd/src -PDP_CFLAGS=-I/usr/local/pd/pdp/include -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -O2 -funroll-loops -fomit-frame-pointer -ffast-math -freg-struct-return -DLINUX +PD_CPPFLAGS=-I../../../pd/src +PDP_CFLAGS=-I../../pdp/include -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -O2 -funroll-loops -fomit-frame-pointer -ffast-math -freg-struct-return -DLINUX prefix=/usr/local PDPF_VERSION = 0.1 PDPF_TARGET = linux PDPF_LIBRARY_NAME = pdp_frei0r.pd_linux -PDP_CPPFLAGS = -I. -I/usr/X11R6/include -I../include -I../../include $(PD_CPPFLAGS) +PDP_CPPFLAGS = -fPIC -I. -I/usr/X11R6/include -I/usr/include $(PD_CPPFLAGS) $(PDP_CFLAGS) -PDP_CFLAGS += -DPDPF_VERSION=\"$(PDPF_VERSION)\" -DFR_PLUGIN_DIR=\"$(FR_PLUGIN_DIR)\" +PDP_CFLAGS += -fPIC -DPDPF_VERSION=\"$(PDPF_VERSION)\" -DFR_PLUGIN_DIR=\"$(FR_PLUGIN_DIR)\" CC = gcc 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:[10618] trunk/externals/pdvjtools/pdp_freeframe/ Makefile.config
by lluisbigorda＠users.sourceforge.net 25 Jan '09

25 Jan '09

Revision: 10618 http://pure-data.svn.sourceforge.net/pure-data/?rev=10618&view=rev Author: lluisbigorda Date: 2009-01-25 00:22:35 +0000 (Sun, 25 Jan 2009) Log Message: ----------- makefile works on pd-svn tree Modified Paths: -------------- trunk/externals/pdvjtools/pdp_freeframe/Makefile.config Modified: trunk/externals/pdvjtools/pdp_freeframe/Makefile.config =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/Makefile.config 2009-01-24 22:43:09 UTC (rev 10617) +++ trunk/externals/pdvjtools/pdp_freeframe/Makefile.config 2009-01-25 00:22:35 UTC (rev 10618) @@ -2,18 +2,18 @@ # specify pd's include path here and ignore the warning # FF_PLUGIN_DIR=/usr/lib/FreeFrame -PD_CPPFLAGS=-I/usr/src/pd-0.40-2/src -PDP_CFLAGS=-I/usr/src/pdp-0.12.5-test-7/include -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -O2 -funroll-loops -fomit-frame-pointer -ffast-math -freg-struct-return -DLINUX +PD_CPPFLAGS=-I../../../src +PDP_CFLAGS=-I../../pdp/include -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -O2 -funroll-loops -fomit-frame-pointer -ffast-math -freg-struct-return -DLINUX prefix=/usr/local PDP_VERSION = 0.0.1 PDP_TARGET = linux PDP_LIBRARY_NAME = pdp_freeframe.pd_linux -PDP_CPPFLAGS = -I. -I/usr/X11R6/include -I../include -I../../include $(PD_CPPFLAGS) +PDP_CPPFLAGS = -fPIC -I. -I/usr/X11R6/include -I/usr/include $(PD_CPPFLAGS) $(PDP_CFLAGS) #--gstabs -PDP_CFLAGS += -DPDP_VERSION=\"$(PDP_VERSION)\" -DFF_PLUGIN_DIR=\"$(FF_PLUGIN_DIR)\" +PDP_CFLAGS += -fPIC -DPDP_VERSION=\"$(PDP_VERSION)\" -DFF_PLUGIN_DIR=\"$(FF_PLUGIN_DIR)\" CC = gcc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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