Pd-cvs August 2005

pd-cvs@lists.iem.at

8 participants
108 discussions

externals/OSCx/src dumpOSC.c, 1.4, 1.5 htmsocket.c, 1.4, 1.5 OSC.c, 1.5, 1.6 OSC-common.h, 1.3, 1.4 OSC.dsp, 1.2, 1.3 OSCroute.c, 1.5, 1.6 OSC-system-dependent.c, 1.1, 1.2 sendOSC.c, 1.4, 1.5 VERSION, 1.2, 1.3
by Georg Holzmann 30 Aug '05

30 Aug '05

Update of /cvsroot/pure-data/externals/OSCx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21615 Modified Files: dumpOSC.c htmsocket.c OSC.c OSC-common.h OSC.dsp OSCroute.c OSC-system-dependent.c sendOSC.c VERSION Log Message: changes by piotr majdak Index: OSC.dsp =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSC.dsp 10 Mar 2004 00:01:56 -0000 1.2 --- OSC.dsp 30 Aug 2005 20:54:05 -0000 1.3 *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RAFOSC_EXPORTS" /YX /FD /c ! # ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../pd/src" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSC_EXPORTS" /D "NT" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RAFOSC_EXPORTS" /YX /FD /c ! # ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\pd\src" /I "LIBOSC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSC_EXPORTS" /D "NT" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 54,58 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 pd.lib libc.lib kernel32.lib wsock32.lib LIBOSC.lib /nologo /dll /machine:I386 /nodefaultlib /out:"../../../pd/extra/OSC.dll" /libpath:"../../../pd/lib" /libpath:"../../../pd/bin" # SUBTRACT LINK32 /pdb:none --- 54,58 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 c:\pd\bin\pd.lib libc.lib kernel32.lib wsock32.lib LIBOSC/Release/LIBOSC.lib /nologo /dll /machine:I386 /nodefaultlib /libpath:"../../../pd/lib" /libpath:"../../../pd/bin" # SUBTRACT LINK32 /pdb:none *************** *** 71,75 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RAFOSC_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSC_EXPORTS" /D "NT" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 71,75 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RAFOSC_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "c:\pd\src" /I "LIBOSC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSC_EXPORTS" /D "NT" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 81,85 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 pd.lib libc.lib kernel32.lib wsock32.lib LIBOSC.lib /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept !ENDIF --- 81,85 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 c:\pd\bin\pd.lib libc.lib kernel32.lib wsock32.lib LIBOSC/Release/LIBOSC.lib /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept /libpath:"c:\pd\src" !ENDIF *************** *** 106,114 **** # Begin Source File SOURCE=.\OSC.c # End Source File # Begin Source File ! SOURCE=.\routeOSC.c # End Source File # Begin Source File --- 106,118 ---- # Begin Source File + SOURCE=".\OSC-system-dependent.c" + # End Source File + # Begin Source File + SOURCE=.\OSC.c # End Source File # Begin Source File ! SOURCE=.\OSCroute.c # End Source File # Begin Source File Index: OSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OSC.c 19 Aug 2004 22:01:38 -0000 1.5 --- OSC.c 30 Aug 2005 20:54:05 -0000 1.6 *************** *** 6,9 **** --- 6,10 ---- -- smoothed out build, clean up for Darwin <hans(a)at.or.at> 2004.04.04 -- shoutz: miller and the others + -- Windows-ification by Piotr Majdak <piotr(a)majdak.com> 30.08.2005 */ *************** *** 15,19 **** #include "OSC-common.h" ! #define VERSION "0.2" #ifndef OSC_API --- 16,20 ---- #include "OSC-common.h" ! #define VERSION "0.3" #ifndef OSC_API *************** *** 29,37 **** OSC_API void OSC_setup(void); OSC_API void OSC_version(t_OSC*); ! /* OSC_API void sendOSC_setup(void); OSC_API void dumpOSC_setup(void); OSC_API void OSCroute_setup(void); ! */ static t_class* OSC_class; --- 30,38 ---- OSC_API void OSC_setup(void); OSC_API void OSC_version(t_OSC*); ! OSC_API void sendOSC_setup(void); OSC_API void dumpOSC_setup(void); OSC_API void OSCroute_setup(void); ! static t_class* OSC_class; *************** *** 46,55 **** OSC_API void OSC_version (t_OSC *x) { ! // EnterCallback(); ! post("OSC4PD Version " VERSION ! "\n ¯\\ original code by matt wright. pd-fication jdl(a)xdv.org\n" ! " · Win32-port raf(a)interaccess.com unified versions hans(a)at.or.at\n" ! " \\_ Compiled " __TIME__ " " __DATE__); ! // ExitCallback(); } --- 47,55 ---- OSC_API void OSC_version (t_OSC *x) { ! post("OSC4PD Version " VERSION "\n" ! " Original code by matt wright. pd-fication jdl(a)xdv.org\n" ! " Win32-port raf(a)interaccess.com unified versions hans(a)at.or.at\n" ! " Adaptations for Windows: piotr(a)majdak.com\n" ! " Compiled: "__DATE__); } *************** *** 65,68 **** post("O : Open Sound Control 4 PD, http://www.cnmat.berkeley.edu/OSC"); post(" S : original code by matt wright, pd hakcs cxc, Win32-port raf(a)interaccess.com"); ! post(" C: ver: "VERSION ", compiled: "__DATE__); } --- 65,68 ---- post("O : Open Sound Control 4 PD, http://www.cnmat.berkeley.edu/OSC"); post(" S : original code by matt wright, pd hakcs cxc, Win32-port raf(a)interaccess.com"); ! post(" C: ver: "VERSION ", compiled: "__DATE__ " -- adapted by piotr(a)majdak.com"); } Index: OSC-common.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC-common.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSC-common.h 7 Apr 2004 04:15:06 -0000 1.3 --- OSC-common.h 30 Aug 2005 20:54:05 -0000 1.4 *************** *** 42,46 **** #define FALSE 0 #endif ! /* Fixed byte width types */ --- 42,60 ---- #define FALSE 0 #endif ! ! ! #ifdef WIN32 ! #include <stdio.h> ! #ifdef OSC_EXPORTS ! #define OSC_API __declspec(dllexport) ! #else ! #define OSC_API __declspec(dllimport) ! #endif ! #ifdef _DEBUG ! #define DEBUG ! #endif ! #endif ! ! //#define int32_t t_int /* Fixed byte width types */ *************** *** 58,60 **** void OSCWarning(char *s, ...); - --- 72,73 ---- Index: VERSION =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/VERSION,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VERSION 10 Mar 2004 00:01:56 -0000 1.2 --- VERSION 30 Aug 2005 20:54:05 -0000 1.3 *************** *** 1 **** ! 0.2 --- 1 ---- ! 0.3 Index: htmsocket.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/htmsocket.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** htmsocket.c 19 Aug 2004 22:01:38 -0000 1.4 --- htmsocket.c 30 Aug 2005 20:54:05 -0000 1.5 *************** *** 55,58 **** --- 55,59 ---- #include <stdlib.h> #include "OSC-common.h" + #include <stdio.h> #else #include <stdio.h> *************** *** 114,122 **** #endif desc *o; o = malloc(sizeof(*o)); if(!o) return 0; - int oval = 1; #ifndef WIN32 --- 115,124 ---- #endif + char oval = 1; + desc *o; o = malloc(sizeof(*o)); if(!o) return 0; #ifndef WIN32 Index: dumpOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/dumpOSC.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dumpOSC.c 19 Aug 2004 22:01:38 -0000 1.4 --- dumpOSC.c 30 Aug 2005 20:54:05 -0000 1.5 *************** *** 78,82 **** // typedef void (*t_fdpollfn)(void *ptr, int fd); ! void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr); --- 78,82 ---- // typedef void (*t_fdpollfn)(void *ptr, int fd); ! //void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr); *************** *** 93,96 **** --- 93,97 ---- #include <ctype.h> #include <signal.h> + #include <stdio.h> #else #include <stdio.h> *************** *** 135,139 **** } *ClientAddr; ! typedef unsigned long long osc_time_t; Boolean ShowBytes = FALSE; --- 136,140 ---- } *ClientAddr; ! Boolean ShowBytes = FALSE; *************** *** 145,148 **** --- 146,157 ---- #endif + #ifdef WIN32 + typedef unsigned __int64 osc_time_t; + #else + typedef unsigned long long osc_time_t; + #endif + + + static int initudp(int chan); static void closeudp(int sockfd); *************** *** 157,160 **** --- 166,170 ---- Boolean IsNiceString(char *string, char *boundary) ; void complain(char *s, ...); + osc_time_t ReadTime(const char* src); #define MAXMESG 32768 *************** *** 226,230 **** #endif ! if(!dumpOSC_SendReply(mbuf, n, &x->x_server, clilen, sockfd)) { dumpOSC_ParsePacket(x, mbuf, n, ra); --- 236,240 ---- #endif ! //if(!dumpOSC_SendReply(mbuf, n, &x->x_server, clilen, sockfd)) { dumpOSC_ParsePacket(x, mbuf, n, ra); *************** *** 507,511 **** //******************* ! void WriteTime(char* dst, osc_time_t osctime) { *(int32_t*)dst = htonl((int32_t)(osctime >> 32)); --- 517,521 ---- //******************* ! /*void WriteTime(char* dst, osc_time_t osctime) { *(int32_t*)dst = htonl((int32_t)(osctime >> 32)); *************** *** 526,530 **** double TimeToSeconds(osc_time_t osctime) { ! return (double)osctime * 2.3283064365386962890625e-10 /* 1/2^32 */; } --- 536,541 ---- double TimeToSeconds(osc_time_t osctime) { ! return (double)osctime * 2.3283064365386962890625e-10 // 1/2^32 ; ! // ^^^^^^^^^^^^^^^ isn't working on WIN32 (and on other machines: doesn't make sense!) } *************** *** 533,536 **** --- 544,548 ---- return x >= 0.0 ? x+0.5 : x-0.5; } + */ /* void WriteLogicalTime(char* dst) *************** *** 552,559 **** */ ! void WriteLogicalTime(char* dst) { double sTime = clock_gettimesince(19230720) / 1000.0; ! double tau = sTime - timeRound(sTime); //fprintf(stderr, "sSec = %f tau = %f\n", sTime, tau); --- 564,571 ---- */ ! /*void WriteLogicalTime(char* dst) { double sTime = clock_gettimesince(19230720) / 1000.0; ! double tau = sTime - (double)timeRound(sTime); //fprintf(stderr, "sSec = %f tau = %f\n", sTime, tau); *************** *** 563,567 **** } ! Boolean dumpOSC_SendReply(char *buf, int n, void *clientDesc, int clientDescLenght, int fd) { if((n == 24) && (strcmp(buf, "#time") == 0)) --- 575,579 ---- } ! int dumpOSC_SendReply(char *buf, int n, void *clientDesc, int clientDescLenght, int fd) { if((n == 24) && (strcmp(buf, "#time") == 0)) *************** *** 588,592 **** return FALSE; } ! } //********************** --- 600,604 ---- return FALSE; } ! }*/ //********************** Index: OSC-system-dependent.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC-system-dependent.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OSC-system-dependent.c 7 Apr 2004 04:15:06 -0000 1.1 --- OSC-system-dependent.c 30 Aug 2005 20:54:05 -0000 1.2 *************** *** 51,55 **** #include <stdarg.h> ! #include <stdio.h> void fatal_error(char *s, ...) { --- 51,58 ---- #include <stdarg.h> ! #include <stdio.h> ! #ifdef WIN32 ! #include <stdlib.h> ! #endif void fatal_error(char *s, ...) { Index: OSCroute.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSCroute.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OSCroute.c 28 Jun 2005 18:37:59 -0000 1.5 --- OSCroute.c 30 Aug 2005 20:54:05 -0000 1.6 *************** *** 57,60 **** --- 57,61 ---- #include <stdlib.h> #include <string.h> + #include <stdio.h> #endif #ifdef __APPLE__ *************** *** 66,70 **** /* structure definition of your object */ ! #define MAX_NUM 20 #define OSC_ROUTE_VERSION "1.05" /* Version 1.04: Allows #1 thru #9 as typed-in arguments --- 67,71 ---- /* structure definition of your object */ ! #define MAX_NUM 128 #define OSC_ROUTE_VERSION "1.05" /* Version 1.04: Allows #1 thru #9 as typed-in arguments *************** *** 126,130 **** // setup #ifdef WIN32 ! OSC_API void OSCroute_setup(void) { #else void OSCroute_setup(void) { --- 127,131 ---- // setup #ifdef WIN32 ! OSC_API void OSCroute_setup(void) { #else void OSCroute_setup(void) { *************** *** 150,154 **** post("OSCroute object version " OSC_ROUTE_VERSION " by Matt Wright. pd: jdl Win32 raf."); ! post("OSCroute Copyright © 1999 Regents of the University of California. All Rights Reserved."); } --- 151,155 ---- post("OSCroute object version " OSC_ROUTE_VERSION " by Matt Wright. pd: jdl Win32 raf."); ! post("OSCroute Copyright © 1999 Regents of the Univ. of California. All Rights Reserved."); } Index: sendOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/sendOSC.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sendOSC.c 19 Aug 2004 22:01:38 -0000 1.4 --- sendOSC.c 30 Aug 2005 20:54:05 -0000 1.5 *************** *** 219,223 **** } ! void sendOSC_senduntyped(t_sendOSC *x, t_symbol *s, int argc, t_atom *argv) { char* targv[MAXPDARG]; --- 219,223 ---- } ! /*void sendOSC_senduntyped(t_sendOSC *x, t_symbol *s, int argc, t_atom *argv) { char* targv[MAXPDARG]; *************** *** 248,252 **** // exit(3); } ! } ////////////////////////////////////////////////////////////////////// --- 248,252 ---- // exit(3); } ! }*/ ////////////////////////////////////////////////////////////////////// *************** *** 268,282 **** messageName = ""; - #ifdef DEBUG - post ("sendOSC: messageName: %s", messageName); - #endif - for (c=0;c<argc;c++) { ! atom_string(argv+c,tmp, 80); #ifdef DEBUG ! // post ("sendOSC: %d, %s",c, tmp); #endif --- 268,280 ---- messageName = ""; + if(argc>MAX_ARGS) + { post ("sendOSC: too many arguments! (max: %d)", MAX_ARGS); return; } for (c=0;c<argc;c++) { ! atom_string(argv+c,tmp, MAXPDSTRING); #ifdef DEBUG ! post ("sendOSC: %d, %s",c, tmp); #endif *************** *** 285,289 **** #ifdef DEBUG ! // post ("sendOSC: %d, %s",c, targv[c]); #endif } --- 283,287 ---- #ifdef DEBUG ! post ("sendOSC: %d, %s",c, targv[c]); #endif } *************** *** 299,331 **** j = 1; for (i = j; i < argc; i++) { ! token = strtok(targv[i],","); ! args[i-j] = ParseToken(token); #ifdef DEBUG ! printf("cell-cont: %s\n", targv[i]); ! printf(" type-id: %d\n", args[i-j]); #endif ! numArgs = i; } if(WriteMessage(x->x_oscbuf, messageName, numArgs, args)) { ! post("sendOSC: usage error, write-msg failed: %s", OSC_errorMessage); ! return; } if(!x->x_bundle) { ! /* // post("sendOSC: accumulating bundle, not sending things ..."); */ ! /* } else { */ ! // post("sendOSC: yeah and OUT!"); ! SendBuffer(x->x_htmsocket, x->x_oscbuf); ! OSC_initBuffer(x->x_oscbuf, SC_BUFFER_SIZE, bufferForOSCbuf); } - //CommandLineMode(argc, targv, x->x_htmsocket); - //useTypeTags = 0; } else { post("sendOSC: not connected"); - // exit(3); } } --- 297,323 ---- j = 1; for (i = j; i < argc; i++) { ! token = strtok(targv[i],","); ! args[i-j] = ParseToken(token); #ifdef DEBUG ! printf("cell-cont: %s\n", targv[i]); ! printf(" type-id: %d\n", args[i-j]); #endif ! numArgs = i; } if(WriteMessage(x->x_oscbuf, messageName, numArgs, args)) { ! post("sendOSC: usage error, write-msg failed: %s", OSC_errorMessage); ! return; } if(!x->x_bundle) { ! SendBuffer(x->x_htmsocket, x->x_oscbuf); ! OSC_initBuffer(x->x_oscbuf, SC_BUFFER_SIZE, bufferForOSCbuf); } } else { post("sendOSC: not connected"); } } *************** *** 352,356 **** #ifdef WIN32 ! OSC_API void sendOSC_setup(void) { #else void sendOSC_setup(void) { --- 344,348 ---- #ifdef WIN32 ! void sendOSC_setup(void) { #else void sendOSC_setup(void) {

1 0

externals/OSCx/libOSC LIBOSC.DSP, 1.1.1.1, 1.2 LIBOSC.PLG, 1.1.1.1, 1.2
by Georg Holzmann 30 Aug '05

30 Aug '05

Update of /cvsroot/pure-data/externals/OSCx/libOSC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21430 Modified Files: LIBOSC.DSP LIBOSC.PLG Log Message: changes by piotr majdak Index: LIBOSC.DSP =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/LIBOSC.DSP,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** LIBOSC.DSP 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- LIBOSC.DSP 30 Aug 2005 20:52:59 -0000 1.2 *************** *** 50,54 **** LIB32=link.exe -lib # ADD BASE LIB32 /nologo ! # ADD LIB32 /nologo /out:"..\..\..\pd\lib\LIBOSC.lib" !ELSEIF "$(CFG)" == "LIBOSC - Win32 Debug" --- 50,54 ---- LIB32=link.exe -lib # ADD BASE LIB32 /nologo ! # ADD LIB32 /nologo !ELSEIF "$(CFG)" == "LIBOSC - Win32 Debug" Index: LIBOSC.PLG =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/LIBOSC.PLG,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** LIBOSC.PLG 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- LIBOSC.PLG 30 Aug 2005 20:52:59 -0000 1.2 *************** *** 7,22 **** </h3> <h3>Command Lines</h3> ! Creating temporary file "C:\DOCUME~1\gustav\LOCALS~1\Temp\RSPB.tmp" with contents ! [ ! /nologo /ML /W3 /GX /O2 /I "../../pd/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"Release/LIBOSC.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c ! "D:\pd\OSC\LIBOSC\OSC-client.c" ! "D:\pd\OSC\LIBOSC\OSC-timetag.c" ! ] ! Creating command line "cl.exe @C:\DOCUME~1\gustav\LOCALS~1\Temp\RSPB.tmp" ! Creating command line "link.exe -lib /nologo /out:"..\..\..\pd\lib\LIBOSC.lib" ".\Release\OSC-client.obj" ".\Release\OSC-timetag.obj" " <h3>Output Window</h3> - Compiling... - OSC-client.c - OSC-timetag.c Creating library... --- 7,12 ---- </h3> <h3>Command Lines</h3> ! Creating command line "link.exe -lib /nologo /out:"Release\LIBOSC.lib" ".\Release\OSC-client.obj" ".\Release\OSC-timetag.obj" " <h3>Output Window</h3> Creating library...

1 0

externals/OSCx README.txt,1.6,1.7
by Georg Holzmann 30 Aug '05

30 Aug '05

Update of /cvsroot/pure-data/externals/OSCx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21213 Modified Files: README.txt Log Message: changes by piotr majdak Index: README.txt =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/README.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** README.txt 10 Mar 2004 17:45:05 -0000 1.6 --- README.txt 30 Aug 2005 20:51:49 -0000 1.7 *************** *** 18,23 **** windows: use extra/OSC.dll ! .dsw and .dsp files are also included. ! i m not sure how compilation would work on windows. if you manage to build the current stuff on win let me know then i can include these instead of the outdated OSC.dll files: --- 18,23 ---- windows: use extra/OSC.dll ! .dsw and .dsp files are also included. You'll want to adapt include and link paths for pd and LIBOSC. ! files: *************** *** 34,37 **** --- 34,44 ---- log: + 20050830: v0.3: (piotr(a)majdak.com) + adapted to compile on Windows2000 + dumpOSC routes up to 128 branches (tested with 24) + sendOSC doesn't crash on longer messages (tested with one argument of 120 characters) + sendOSC # of arguments limited by the length of the message (tested with 110 messages) + tested on Windows 2000 ONLY! + 20040409: changed build setup to suit externals build system single object objects, no lib

1 0

externals/grill/flext/source flsupport.h,1.95,1.96
by Thomas Grill 30 Aug '05

30 Aug '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7025/source Modified Files: flsupport.h Log Message: don't use explicit so that STL can be used small fixes for tutorial examples added typed flext::NewAligned Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** flsupport.h 9 Aug 2005 11:02:16 -0000 1.95 --- flsupport.h 30 Aug 2005 10:54:36 -0000 1.96 *************** *** 77,80 **** --- 77,83 ---- //! Get an aligned memory block static void *NewAligned(size_t bytes,int bitalign = 128); + // same with templated type + template<typename T> + static T *NewAligned(size_t times,int bitalign = 128) { return static_cast<T *>(NewAligned(times*sizeof(T),bitalign)); } //! Free an aligned memory block static void FreeAligned(void *blk);

1 0

externals/grill/flext/tutorial/stk1 main.cpp,1.2,1.3
by Thomas Grill 30 Aug '05

30 Aug '05

Update of /cvsroot/pure-data/externals/grill/flext/tutorial/stk1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7025/tutorial/stk1 Modified Files: main.cpp Log Message: don't use explicit so that STL can be used small fixes for tutorial examples added typed flext::NewAligned Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/tutorial/stk1/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.cpp 2 Jan 2003 04:32:07 -0000 1.2 --- main.cpp 30 Aug 2005 10:54:36 -0000 1.3 *************** *** 45,49 **** private: Noise *inst; - static void Setup(t_class *c); }; --- 45,48 ----

1 0

externals/grill/flext/tutorial/sndobj1 main.cpp,1.3,1.4
by Thomas Grill 30 Aug '05

30 Aug '05

Update of /cvsroot/pure-data/externals/grill/flext/tutorial/sndobj1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7025/tutorial/sndobj1 Modified Files: main.cpp Log Message: don't use explicit so that STL can be used small fixes for tutorial examples added typed flext::NewAligned Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/tutorial/sndobj1/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.cpp 2 Jan 2003 04:32:07 -0000 1.3 --- main.cpp 30 Aug 2005 10:54:36 -0000 1.4 *************** *** 45,49 **** private: ! static void Setup(t_class *c); FLEXT_ATTRVAR_F(sh1) --- 45,49 ---- private: ! static void Setup(t_classid c); FLEXT_ATTRVAR_F(sh1) *************** *** 62,66 **** } ! void sndobj1::Setup(t_class *c) { FLEXT_CADDATTR_VAR1(c,"shL",sh1); --- 62,66 ---- } ! void sndobj1::Setup(t_classid c) { FLEXT_CADDATTR_VAR1(c,"shL",sh1);

1 0

externals/grill/flext/tutorial/stk2 main.cpp,1.3,1.4
by Thomas Grill 30 Aug '05

30 Aug '05

Update of /cvsroot/pure-data/externals/grill/flext/tutorial/stk2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7025/tutorial/stk2 Modified Files: main.cpp Log Message: don't use explicit so that STL can be used small fixes for tutorial examples added typed flext::NewAligned Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/tutorial/stk2/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.cpp 30 Jun 2003 02:33:10 -0000 1.3 --- main.cpp 30 Aug 2005 10:54:36 -0000 1.4 *************** *** 49,53 **** private: ! static void Setup(t_class *c); FLEXT_CALLBACK_F(m_sh1) --- 49,53 ---- private: ! static void Setup(t_classid c); FLEXT_CALLBACK_F(m_sh1) *************** *** 66,70 **** } ! void stk2::Setup(t_class *c) { FLEXT_CADDMETHOD_F(c,0,"shL",m_sh1); --- 66,70 ---- } ! void stk2::Setup(t_classid c) { FLEXT_CADDMETHOD_F(c,0,"shL",m_sh1);

1 0

pd/src desire.tk,1.1.2.16,1.1.2.17
by chunlee 30 Aug '05

30 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25535 Modified Files: Tag: devel_0_39 desire.tk Log Message: can load simple file, only canvas and obj, no sub-patch next: need to make sure the related variables also gets updated too Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** desire.tk 29 Aug 2005 18:40:43 -0000 1.1.2.16 --- desire.tk 30 Aug 2005 09:33:47 -0000 1.1.2.17 *************** *** 331,334 **** --- 331,335 ---- global pd_opendir offset_canvas_file offset_wire_file offset_obj_file _ font + global wire_from wire_to set directory [string range $filename 0 [expr [string last / $filename] - 1]] *************** *** 336,339 **** --- 337,341 ---- set basename [string range $filename [expr [string last / $filename] + 1] end] if {[string last .pd $filename] >= 0} { + #pd "pd open [pdtk_enquote $basename] [pdtk_enquote $directory] ;" set fl [open $filename r] *************** *** 348,351 **** --- 350,354 ---- set canvas 0 + set obj_list {} *************** *** 371,374 **** --- 374,379 ---- set canvas $canvas_id set offset_canvas_file [expr $offset_canvas_file + 1] + + set _($canvas_id:obj_list) {} puts "new canvas id -> $canvas_id" *************** *** 389,393 **** set object_id [format %x [expr 0x1111111 + $offset_obj_file]] set offset_obj_file [expr $offset_obj_file + 1] ! puts "create obj" set obj_name [lrange $line 4 end] --- 394,400 ---- set object_id [format %x [expr 0x1111111 + $offset_obj_file]] set offset_obj_file [expr $offset_obj_file + 1] ! lappend _($canvas:obj_list) $object_id ! ! puts "obj_list ::: $_($canvas:obj_list)" puts "create obj" set obj_name [lrange $line 4 end] *************** *** 422,425 **** --- 429,469 ---- puts "create wires" + + #X connect 0 0 1 0; + puts "from obj [lindex $line 2] outlet [lindex $line 3]" + puts "to obj [lindex $line 4] inlet [lindex $line 5]" + + set wire_id [format %x [expr 0x2222222 + $offset_wire_file]]; + set wire_id l$wire_id + set offset_wire_file [expr $offset_wire_file + 1] + + #d = 81168af 0 81168ae 0 0 + + #set d {} + #lappend d [lindex $line 2] + #lappend d [lindex $line 3] + + set d [lrange $line 2 end] + set lsize [expr [llength $line] - 1] + set last_str [string trimright [lindex $line $lsize] ";"] + set d [lreplace $d end end] + set d [lappend d $last_str] + set d [lappend d 0] + set d [lreplace $d 0 0 [lindex $_($canvas:obj_list) [lindex $line 2]]] + set d [lreplace $d 2 2 [lindex $_($canvas:obj_list) [lindex $line 4]]] + + #set from [lindex $wire_from 0] + #set outlet_number [lindex $wire_from 1] + #set to [lindex $wire_to 0] + #set inlet_number [lindex $wire_to 1] + #set inlet_flag 0 + #set outlet_flag 1 + + set wire_from [list [lindex $_($canvas:obj_list) [lindex $line 2]] [lindex $line 3]]] + set wire_to [list [lindex $_($canvas:obj_list) [lindex $line 4]] [lindex $line 5]]] + + puts "d = $d" + wire_update $wire_id $d; + wire_draw2 $wire_id $canvas.c; } *************** *** 429,439 **** } - #foreach item [lindex $lines 0] { - # - # puts "$item" - # - #} } } --- 473,481 ---- } } + + #puts "$canvas.obj" + } *************** *** 2240,2243 **** --- 2282,2287 ---- lappend d 0 + + #my wire code #$_($id:outlets) -> number of outlets an object has

1 0

pd/src desire.tk,1.1.2.15,1.1.2.16
by chunlee 29 Aug '05

29 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9282 Modified Files: Tag: devel_0_39 desire.tk Log Message: still working on loading simple file, can load canvas and objects now Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** desire.tk 28 Aug 2005 03:40:36 -0000 1.1.2.15 --- desire.tk 29 Aug 2005 18:40:43 -0000 1.1.2.16 *************** *** 3,30 **** #thanks for taking time looking at this code:) # ! #few notes: ! # ! #1. "wish +++++.tk" to run it ! #2. use Ctrl+1 to add object, use BackSpace to delete it ! #3. other keybindings are not working yet, so there will be error ! #4. only 1 canvas for now ! #5. wire drawing functions are not there yet, so don't try to connect:) ! #6. type any name in the object box, all object for now have 3 outlets and 1 inlet ! #7. the foo button is for testing and debug, it does nothing ! #8. close this code from the foo buttn window ! # ! #things to look at: ! # ! #1. when creating/editing text object, the tmp text input field is not handled in tk ! #2. all the mouse position stuff (selection, hilight...) are now also done in tk ! #3. text object creation/edit/delet is not done in tk ! # ! #i think that's it ! # ! #oh, these codes are not clean, i mean, there are codes that are left over from before, sorry:/ ! ! #26072005, chun(a)goto10.org #-----------------------------------------------------------------------------------# set pd_nt 0 --- 3,21 ---- #thanks for taking time looking at this code:) # ! #this is desiredata ! #this code is still in early development #-----------------------------------------------------------------------------------# + #some variables i created, some are tmp only. + + set canvas .x80f2b50 + set offset 0 + set offset_wire 0 + set offset_canvas 0 + set offset_canvas_file 0 + set offset_wire_file 0 + set offset_obj_file 0 + + #-----------------------------------------------------------------------------------# set pd_nt 0 *************** *** 292,296 **** } ! set offset_canvas 0 proc menu_new {} { --- 283,287 ---- } ! proc menu_new {} { *************** *** 339,343 **** puts "open_file $filename" ! global pd_opendir set directory [string range $filename 0 [expr [string last / $filename] - 1]] set pd_opendir $directory --- 330,335 ---- puts "open_file $filename" ! global pd_opendir offset_canvas_file offset_wire_file offset_obj_file _ font ! set directory [string range $filename 0 [expr [string last / $filename] - 1]] set pd_opendir $directory *************** *** 355,361 **** --- 347,359 ---- puts "read $no_lines lines" + set canvas 0 + foreach line $lines { + #set offset_canvas_file 0 + #set offset_wire_file 0 + #set offset_obj_file 0 + #puts "[lindex $line 0]" *************** *** 365,368 **** --- 363,381 ---- puts "creates canvas" + puts "XY offset: [lindex $line 2] : [lindex $line 3]" + puts "canvas size: [lindex $line 4] : [lindex $line 5]" + + + set canvas_id [format %x [expr 0x0000000 + $offset_canvas_file]] + set canvas_id .x$canvas_id + set canvas $canvas_id + set offset_canvas_file [expr $offset_canvas_file + 1] + + puts "new canvas id -> $canvas_id" + + + pdtk_canvas_new $canvas_id [lindex $line 4] [lindex $line 5] \ + +[lindex $line 2]+[lindex $line 3] 1 + } else { *************** *** 372,381 **** set ow [lindex $line 1] ! ! if {$ow != "connect"} { puts "create obj" ! } else { puts "create wires" --- 385,423 ---- set ow [lindex $line 1] ! ! if {$ow == "obj"} { ! set object_id [format %x [expr 0x1111111 + $offset_obj_file]] ! set offset_obj_file [expr $offset_obj_file + 1] puts "create obj" + set obj_name [lrange $line 4 end] + set lsize [expr [llength $line] - 1] + set last_str [string trimright [lindex $line $lsize] ";"] + set obj_name [lreplace $obj_name end end] + set obj_name [lappend obj_name $last_str] + set _($object_id:name_len) [string length $obj_name] + + puts "obj x: [lindex $line 2] y: [lindex $line 3]" + + set _($object_id:cx) [lindex $line 2] + set _($object_id:cy) [lindex $line 3] + + #puts "last in the list :: [lindex $line $lsize]" + #puts "trimed :: $last_str" + puts "obj_name :: $obj_name" + + objectbox_draw $object_id $canvas.c \ + [expr ($_($object_id:name_len)*$font(width)) + $font(padx)] \ + [expr $font(height) + $font(pady)] 1 3 + + pdtk_text_new \ + $canvas.c ${object_id}TEXT [expr $_($object_id:cx)+2] [expr $_($object_id:cy)+2] \ + $obj_name $font(size) #000000 + + ! } ! ! if {$ow == "connect"} { puts "create wires" *************** *** 502,508 **** ! set canvas .x80f2b50 ! set offset 0 ! set offset_wire 0 set font(size) 12 --- 544,549 ---- ! ! set font(size) 12 *************** *** 1139,1143 **** #-----------------------------------------------------------------------------------# proc objectbox_draw {self canvas xs ys ins outs} { ! puts "objectbox_draw" global _ look --- 1180,1184 ---- #-----------------------------------------------------------------------------------# proc objectbox_draw {self canvas xs ys ins outs} { ! puts "objectbox_draw ::: $self $canvas $xs $ys $ins $outs" global _ look

1 0

pd/src desire.tk,1.1.2.14,1.1.2.15
by chunlee 28 Aug '05

28 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24936 Modified Files: Tag: devel_0_39 desire.tk Log Message: start to work on loading file, for debuging purpose only Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** desire.tk 26 Aug 2005 04:46:41 -0000 1.1.2.14 --- desire.tk 28 Aug 2005 03:40:36 -0000 1.1.2.15 *************** *** 337,341 **** proc open_file {filename} { ! puts "open_file $filename"" global pd_opendir --- 337,341 ---- proc open_file {filename} { ! puts "open_file $filename" global pd_opendir *************** *** 344,348 **** set basename [string range $filename [expr [string last / $filename] + 1] end] if {[string last .pd $filename] >= 0} { ! pd "pd open [pdtk_enquote $basename] [pdtk_enquote $directory] ;" } } --- 344,396 ---- set basename [string range $filename [expr [string last / $filename] + 1] end] if {[string last .pd $filename] >= 0} { ! #pd "pd open [pdtk_enquote $basename] [pdtk_enquote $directory] ;" ! set fl [open $filename r] ! set data [read $fl] ! close $fl ! set lines [split $data \n] ! set no_lines [llength $lines] ! ! #puts "fl -> $fl" ! puts "$data" ! puts "read $no_lines lines" ! ! ! foreach line $lines { ! ! #puts "[lindex $line 0]" ! ! set type [lindex $line 0] ! ! if {$type == "#N"} { ! ! puts "creates canvas" ! ! } else { ! ! ! #puts "creates obj or wire" ! ! set ow [lindex $line 1] ! ! if {$ow != "connect"} { ! ! puts "create obj" ! ! } else { ! ! puts "create wires" ! ! } ! ! } ! ! } ! ! #foreach item [lindex $lines 0] { ! # ! # puts "$item" ! # ! #} ! } } *************** *** 440,445 **** populate_menu .mbar.file {} { ! {"New" {foo menu_new} "Ctrl+n"} ! {"Open" {foo menu_open} "Ctrl+o"} {} {"Class List" {foo show_class_list} ""} --- 488,493 ---- populate_menu .mbar.file {} { ! {"New" {menu_new} "Ctrl+n"} ! {"Open" {menu_open} "Ctrl+o"} {} {"Class List" {foo show_class_list} ""}

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs August 2005