[PD-cvs] pd/src desire.tk,1.1.2.578,1.1.2.579
chunlee
chunlee at users.sourceforge.net
Tue Nov 21 03:46:35 CET 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12398
Modified Files:
Tag: devel_0_39
desire.tk
Log Message:
first commit for audio_dialog stuff..
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.578
retrieving revision 1.1.2.579
diff -C2 -d -r1.1.2.578 -r1.1.2.579
*** desire.tk 20 Nov 2006 11:29:29 -0000 1.1.2.578
--- desire.tk 21 Nov 2006 02:46:32 -0000 1.1.2.579
***************
*** 6209,6212 ****
--- 6209,6232 ----
}
+ def Dialog add_devlist {f name label} {
+ global _
+ $self add_stuff $f $name $label
+ #set v $_($self:$name) ;# bug in poetcl
+ menu $f.menu -tearoff 0
+ set i 0
+ set trim_name [string trimleft $name "-"]
+ foreach part $@$trim_name {
+ $f.menu add command -label "[expr $i+1]. $part" \
+ -command [list $self dropmenu_set $f $name $part $i]
+ incr i
+ }
+ label $f.butt -text " 1. [lindex $@$trim_name 0]" -relief raised -width 20
+ balloon $f.butt "click to change setting"
+ pack $f.label $f.butt -side left
+ bind $f.butt <1> [list $self dropmenu_open $f]
+
+ }
+
+
def Dialog listbox_up {listbox} {$self listbox_swap $listbox -1}
def Dialog listbox_down {listbox} {$self listbox_swap $listbox +1}
***************
*** 6235,6238 ****
--- 6255,6259 ----
folders {$self add_folders $f $name $label}
libraries {$self add_libraries $f $name $label}
+ devlist {$self add_devlist $f $name $label}
section {label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold}}
subsection {label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold}}
***************
*** 6244,6248 ****
default {
$self add_stuff $f $name $label
! eval [concat [list entry $f.entry -textvariable _($self:$name)] $options]
pack $f.entry -side left
bind $f.entry <Return> "$self ok"
--- 6265,6270 ----
default {
$self add_stuff $f $name $label
! set trim_name [string trimleft $name "-"]
! eval [concat [list entry $f.entry -textvariable _($self:$trim_name)] $options]
pack $f.entry -side left
bind $f.entry <Return> "$self ok"
***************
*** 6560,6565 ****
devlist -audioindev|-soundindev
devlist -audiooutdev|-soundoutdev
! devlist -inchannels
! devlist -outchannels
integer -audiobuf|-soundbuf
integer -blocksize
--- 6582,6587 ----
devlist -audioindev|-soundindev
devlist -audiooutdev|-soundoutdev
! integer -inchannels
! integer -outchannels
integer -audiobuf|-soundbuf
integer -blocksize
***************
*** 6600,6605 ****
}
! proc pdtk_audio_dialog {args} {
! logvar args
}
--- 6622,6635 ----
}
! proc pdtk_audio_dialog {id indevlist indev1 indev2 indev3 indev4 \
! inchan1 inchan2 inchan3 inchan4 \
! outdevlist outdev1 outdev2 outdev3 outdev4 \
! outchan1 outchan2 outchan3 outchan4 sr dspblock \
! advance multi longform} {
! pdrc audio_properties $indevlist [list $indev1 $indev2 $indev3 $indev4] \
! [list $inchan1 $inchan2 $inchan3 $inchan4] \
! $outdevlist [list $outdev1 $outdev2 $outdev3 $outdev4] \
! [list $outchan1 $outchan2 $outchan3 $outchan4] $sr $dspblock \
! $advance $multi
}
***************
*** 6616,6619 ****
--- 6646,6663 ----
}
+ def ServerPrefsDialog audio_properties {indevlist indevs inchans outdevlist outdevs outchans sr dspblock advance multi} {
+ set @audioindev $indevlist
+ set @audiooutdev $outdevlist
+ set @inchannels $inchans
+ set @outchannels $outchans
+ set @audiobuf $advance
+ set @blocksize $dspblock
+ set @usemulti $multi
+ set @r $sr
+ set @midiindev "midione"
+ set @midioutdev "miditwo"
+ $self init_window
+ }
+
def ServerPrefsDialog read_one {type name contents i} {
global pdrc_options_h
***************
*** 6684,6692 ****
def ServerPrefsDialog reset {} {
}
! def ServerPrefsDialog init {} {
global pdrc_options
- $self init_reverse_hash
- $self read
- super reset cancel apply ok
set f .$self.1
set section 0
--- 6728,6734 ----
def ServerPrefsDialog reset {} {
}
!
! def ServerPrefsDialog init_window {} {
global pdrc_options
set f .$self.1
set section 0
***************
*** 6700,6713 ****
$@nb add_section [incr section] [say $name]
}
! choice {$self add $f.main.$section \
[list $name choice -choices [lrange $names 1 end]]}
! default {$self add $f.main.$section [list $name $type]}
}
}
$@nb page_select 1
! # pd pd audio-properties
# pd pd midi-properties
}
#################### ClientPrefsDialog
set ddrc_options {
--- 6742,6769 ----
$@nb add_section [incr section] [say $name]
}
! choice {
! $self add $f.main.$section \
[list $name choice -choices [lrange $names 1 end]]}
! devlist {
! $self add $f.main.$section [list $name devlist -devlist]
! }
! default {
! $self add $f.main.$section [list $name $type]
! }
}
}
$@nb page_select 1
! }
!
! def ServerPrefsDialog init {} {
! pd pd audio-properties
!
! $self init_reverse_hash
! $self read
! super reset cancel apply ok
# pd pd midi-properties
}
+
#################### ClientPrefsDialog
set ddrc_options {
More information about the Pd-cvs
mailing list