Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29426
Modified Files: Tag: impd_0_37 m_sched.c makefile.mingw u_main.tk Log Message: peak meters
Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.39 retrieving revision 1.1.1.4.2.7.4.40 diff -C2 -d -r1.1.1.4.2.7.4.39 -r1.1.1.4.2.7.4.40 *** u_main.tk 10 Apr 2004 19:53:11 -0000 1.1.1.4.2.7.4.39 --- u_main.tk 11 Apr 2004 05:16:40 -0000 1.1.1.4.2.7.4.40 *************** *** 117,129 **** set ctrls_audio_on 0 set ctrls_meter_on 0 - set ctrls_inlevel 0 - set ctrls_outlevel 0
proc pdtk_pd_meters {indb outdb inclip outclip} { ! global ctrls_inlevel ctrls_outlevel ! set ctrls_inlevel $indb ! set ctrls_outlevel $outdb foreach {z clip} [list in $inclip out $outclip] { ! .controls.$z.1.clip configure -background [if {$clip==1} {list red} {list grey}] } } --- 117,126 ---- set ctrls_audio_on 0 set ctrls_meter_on 0
proc pdtk_pd_meters {indb outdb inclip outclip} { ! .controls.in.1.mtr coords m 0 0 $indb 0 ! .controls.out.1.mtr coords m 0 0 $outdb 0 foreach {z clip} [list in $inclip out $outclip] { ! .controls.$z.1.clip configure -background [if {$clip==1} {list red} {list black}] } } *************** *** 133,144 **** frame $f frame $f.1 -borderwidth 2 -relief groove ! frame $f.1.pad -height 1 ! entry $f.1.level -textvariable ctrls_${z}level -width 3 ! button $f.1.clip -text "Clip" -state disabled ! pack $f.1.pad $f.1.level $f.1.clip -side top -pady 4 -padx 4 ! pack $f.1 -padx 4 -pady 4 ! label $f.2 -text [string toupper $z] ! place $f.2 -x 14 -y -4 ! pack $f -side left -pady 4 -padx 4 }
--- 130,141 ---- frame $f frame $f.1 -borderwidth 2 -relief groove ! canvas $f.1.mtr -width 100 -height 10 -bg #222222 ! $f.1.mtr create line 0 0 0 0 -width 24 -fill [switch $z {in {set 0 blue} out {set 0 green}}] -tags m ! canvas $f.1.clip -width 5 -height 10 -bg #222222 ! pack $f.1.mtr $f.1.clip -side left -pady 2 -padx 0 ! pack $f.1 -padx 6 -pady 9 ! label $f.2 -text [string tolower $z] ! place $f.2 -x 11 -y -4 ! pack $f -side left -pady 0 -padx 0 }
*************** *** 155,168 **** frame .controls.switches foreach {w x y z} { ! audiobutton "Compute Audio" ctrls_audio_on {pd "pd dsp $ctrls_audio_on ;"} ! meterbutton "Peak Meters" ctrls_meter_on {pd "pd meters $ctrls_meter_on ;"} } { checkbutton .controls.switches.$w -text $x -variable $y -anchor w -command $z ! pack .controls.switches.$w -side top }
! button .controls.switches.dio -text "DIO Errors" -command {pd "pd audiostatus ;"} pack .controls.switches.dio ! pack .controls.switches -side left
bind . <Control-Key> {pdtk_pd_ctrlkey %W %K 0} --- 152,165 ---- frame .controls.switches foreach {w x y z} { ! audiobutton "audio" ctrls_audio_on {pd "pd dsp $ctrls_audio_on ;"} ! meterbutton "meters" ctrls_meter_on {pd "pd meters $ctrls_meter_on ;"} } { checkbutton .controls.switches.$w -text $x -variable $y -anchor w -command $z ! pack .controls.switches.$w -side left }
! button .controls.switches.dio -text "io errors" -command {pd "pd audiostatus ;"} pack .controls.switches.dio ! pack .controls.switches -side right
bind . <Control-Key> {pdtk_pd_ctrlkey %W %K 0}
Index: makefile.mingw =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.mingw,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** makefile.mingw 30 Mar 2004 06:44:06 -0000 1.1.2.3 --- makefile.mingw 11 Apr 2004 05:16:40 -0000 1.1.2.4 *************** *** 1,5 **** VPATH = ../obj:./ INSTDIR = .. ! OBJ_DIR = $(INSTDIR)/src BIN_DIR = $(INSTDIR)/bin
--- 1,5 ---- VPATH = ../obj:./ INSTDIR = .. ! OBJ_DIR = $(INSTDIR)/obj BIN_DIR = $(INSTDIR)/bin
*************** *** 10,14 **** GFLAGS = -DINSTALL_PREFIX="$(INSTDIR)"
! MORECFLAGS = -g
PADIR = $(INSTDIR)/portaudio --- 10,14 ---- GFLAGS = -DINSTALL_PREFIX="$(INSTDIR)"
! MORECFLAGS =
PADIR = $(INSTDIR)/portaudio *************** *** 30,35 ****
SYSSRC += s_audio_pa.c s_audio_mmio.c s_midi_mmio.c ! ! PASRC = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c \ $(PADIR)/pablio/pablio_pd.c $(PADIR)/pablio/ringbuffer_pd.c
--- 30,35 ----
SYSSRC += s_audio_pa.c s_audio_mmio.c s_midi_mmio.c ! ! PASRC = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c \ $(PADIR)/pablio/pablio_pd.c $(PADIR)/pablio/ringbuffer_pd.c
*************** *** 86,90 **** $(OBJ_DIR)/$(PDEXEC): s_entry.o cd $(OBJ_DIR); $(CC) -o $(PDEXEC) s_entry.o $(LIB) pd.a $(LDFLAGS) ! $(OBJ_DIR)/$(PDDLL): $(OBJC) cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def pd.def \ --- 86,90 ---- $(OBJ_DIR)/$(PDEXEC): s_entry.o cd $(OBJ_DIR); $(CC) -o $(PDEXEC) s_entry.o $(LIB) pd.a $(LDFLAGS) ! $(OBJ_DIR)/$(PDDLL): $(OBJC) cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def pd.def \ *************** *** 105,109 **** install -m644 $(OBJ_DIR)/pd.tk $(BIN_DIR)/pd.tk install -m644 u_object.tk $(BIN_DIR)/u_object.tk - install -m644 ../extra/*/*.pd $(INSTDIR)/doc/5.reference/
clean: --- 105,108 ----
Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.1.1.2.2.7.2.1 retrieving revision 1.1.1.2.2.7.2.2 diff -C2 -d -r1.1.1.2.2.7.2.1 -r1.1.1.2.2.7.2.2 *** m_sched.c 26 Mar 2004 03:12:11 -0000 1.1.1.2.2.7.2.1 --- m_sched.c 11 Apr 2004 05:16:33 -0000 1.1.1.2.2.7.2.2 *************** *** 311,315 **** } sched_nextmeterpolltime = ! sched_diddsp + (int)(sys_dacsr /(double)sys_schedblocksize); }
--- 311,315 ---- } sched_nextmeterpolltime = ! sched_diddsp + (int)(sys_dacsr / 16 / (double)sys_schedblocksize); }