[PD-cvs] externals/hardware/multio multio-help.pd, NONE, 1.1 multio.libs, NONE, 1.1 Makefile, 1.1, 1.2 multio.c, 1.1, 1.2 help-multio.pd, 1.1, NONE

Hans-Christoph Steiner eighthave at users.sourceforge.net
Fri Mar 17 03:41:49 CET 2006 

Update of /cvsroot/pure-data/externals/hardware/multio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27500

Modified Files:
	Makefile multio.c 
Added Files:
	multio-help.pd multio.libs 
Removed Files:
	help-multio.pd 
Log Message:
cleaned things up for the Pd-extended build system, it shouldn't break anything, simple things

--- help-multio.pd DELETED ---

--- NEW FILE: multio-help.pd ---
#N canvas 112 95 1011 631 12;
#X obj 132 124 tgl 30 0 empty empty empty 0 -6 0 8 -62784 -1 -1 0 1
;
#X obj 506 210 unpack f f;
#X floatatom 421 247 5 0 0 0 - - -;
#X floatatom 499 248 5 0 0 0 - - -;
#X msg 132 161 open;
#X obj 132 202 multio;
#X msg 132 69 readout_time 20;
#X msg 132 98 readout_time 1000;
#X msg 132 25 readout_time 1;
#X text 185 163 <-- open the device (opened by default if possible)
;
#X text 170 132 <-- start/stop readout of the device (on by default)
;
#X text 290 39 <--+ | <--+-> set the time between readouts (msec) |
20 msec is the default <--+;
#X obj 123 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 59 1;
#X obj 154 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 198 1;
#X obj 185 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 177 1;
#X obj 216 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 155 1;
#X obj 247 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 3 1;
#X obj 278 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 0 1;
#X obj 309 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 186 1;
#X obj 340 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 769 1;
#X obj 371 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 353 1;
#X obj 402 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 1659 1;
#X obj 433 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992
-1 -1 1380 1;
#X obj 123 274 route 0 1 2 3 4 5 6 7 8 9 10;
#X obj 433 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 445 256;
#X obj 402 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 535 256;
#X obj 371 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 114 256;
#X obj 340 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 248 256;
#X obj 309 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 60 256;
#X obj 278 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 0 256;
#X obj 247 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 1 256;
#X obj 216 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 50 256;
#X obj 185 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 57 256;
#X obj 154 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 64 256;
#X obj 123 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
14 -262144 -1 -1 19 256;
#X msg 130 46 readout_time 5;
#X connect 0 0 5 0;
#X connect 1 0 2 0;
#X connect 1 1 3 0;
#X connect 4 0 5 0;
#X connect 5 0 23 0;
#X connect 5 1 1 0;
#X connect 6 0 5 0;
#X connect 7 0 5 0;
#X connect 8 0 5 0;
#X connect 23 0 34 0;
#X connect 23 1 33 0;
#X connect 23 2 32 0;
#X connect 23 3 31 0;
#X connect 23 4 30 0;
#X connect 23 5 29 0;
#X connect 23 6 28 0;
#X connect 23 7 27 0;
#X connect 23 8 26 0;
#X connect 23 9 25 0;
#X connect 23 10 24 0;
#X connect 24 0 22 0;
#X connect 25 0 21 0;
#X connect 26 0 20 0;
#X connect 27 0 19 0;
#X connect 28 0 18 0;
#X connect 29 0 17 0;
#X connect 30 0 16 0;
#X connect 31 0 15 0;
#X connect 32 0 14 0;
#X connect 33 0 13 0;
#X connect 34 0 12 0;
#X connect 35 0 5 0;

Index: multio.c
===================================================================
RCS file: /cvsroot/pure-data/externals/hardware/multio/multio.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** multio.c	18 Oct 2005 23:25:57 -0000	1.1
--- multio.c	17 Mar 2006 02:41:47 -0000	1.2
***************
*** 10,16 ****
  
  */
! #ifdef NT
! #include <windows.h>
! #endif
  
  #include "m_pd.h"
--- 10,16 ----
  
  */
! #ifdef _WIN32
! #include <windows.h>
! #endif /* _WIN32 */
  
  #include "m_pd.h"
***************
*** 74,78 ****
  			if(bytesread > 0)
  			{
! 				if(x->buf_count[mybuf]+bytesread > MAXBUF)
  					x->buf_count[mybuf] = 0;
  				x->double_buffer[mybuf][x->buf_count[mybuf]++] = bytesread; // store the number of bytes for that message
--- 74,78 ----
  			if(bytesread > 0)
  			{
! 				if(x->buf_count[mybuf]+bytesread > MAXBUF)
  					x->buf_count[mybuf] = 0;
  				x->double_buffer[mybuf][x->buf_count[mybuf]++] = bytesread; // store the number of bytes for that message
***************
*** 84,90 ****
  			}
  		}
! #ifdef NT
  		Sleep(1);
! #endif
  	}
  }
--- 84,90 ----
  			}
  		}
! #ifdef _WIN32
  		Sleep(1);
! #endif /* _WIN32 */
  	}
  }

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/hardware/multio/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	18 Oct 2005 23:25:57 -0000	1.1
--- Makefile	17 Mar 2006 02:41:47 -0000	1.2
***************
*** 4,7 ****
--- 4,9 ----
  current: pd_linux
  
+ pd_src = ../../../pd
+ 
  # ----------------------- NT -----------------------
  
***************
*** 40,44 ****
      -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS)
  
! LINUXINCLUDE =  -I../../src
  
  .c.pd_linux:
--- 42,46 ----
      -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS)
  
! LINUXINCLUDE =  -I../../src -I$(pd_src)/src
  
  .c.pd_linux:
***************
*** 54,63 ****
  .SUFFIXES: .pd_darwin
  
! DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \
!     -Wno-unused -Wno-parentheses -Wno-switch
  
  .c.pd_darwin:
! 	$(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
! 	$(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o 
  	rm -f $*.o
  
--- 56,68 ----
  .SUFFIXES: .pd_darwin
  
! DARWINCFLAGS = -DPD -O2 -Wall -W
! 
! DARWININCLUDE =  -I../../src -I$(pd_src)/src -I/sw/include
! DARWINLIBS = -L/sw/lib -lusb
  
  .c.pd_darwin:
! 	$(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -o $*.o -c $*.c
! 	$(CC) -bundle -bundle_loader $(pd_src)/bin/pd $(DARWINLIBS) \
! 		-o $*.pd_darwin $*.o 
  	rm -f $*.o
  

--- NEW FILE: multio.libs ---
-lusb

More information about the Pd-cvs mailing list