Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19344
Modified Files: Tag: impd_0_37 u_main.tk Log Message: .pdrc editor, second spike
Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.25 retrieving revision 1.1.1.4.2.7.4.26 diff -C2 -d -r1.1.1.4.2.7.4.25 -r1.1.1.4.2.7.4.26 *** u_main.tk 28 Mar 2004 03:15:23 -0000 1.1.1.4.2.7.4.25 --- u_main.tk 28 Mar 2004 04:14:27 -0000 1.1.1.4.2.7.4.26 *************** *** 2195,2242 ****
set pdrc_options { ! -r int "sample rate" ! -soundindev|-audioindev parsedevlist "audio in devices; e.g., "1,3" for first and third" ! -soundoutdev|-audiooutdev parsedevlist "audio devices; e.g., "1,3" for first and third" ! -sounddev|-audiodev parsedevlist {!} ! -inchannels sys_parsedevlist "audio input channels (by device, like "2" or "16,8")" ! -outchannels sys_parsedevlist "number of audio out channels (same)" ! -channels alias {list -inchannels %1 -outchannels %1} ! -audiobuf|-soundbuf int "specify size of audio buffer in msec" ! -blocksize int "specify audio I/O block size in sample frames" ! -sleepgrain int "specify number of milliseconds to sleep when idle" ! -nodac void "suppress audio output" ! -noadc void "suppress audio input" ! -noaudio|-nosound alias {list -nodac -noadc}
! -alsa void " use ALSA audio API" ! -jack void "use JACK audio API" ! -mmio void "use MMIO audio API (default for Windows)" ! -portaudio|-pa|-asio void "use ASIO audio driver (via Portaudio)" ! -oss void "use OSS audio API" ! -32bit void "allow 32 bit OSS audio (for RME Hammerfall)"
! -nomidiin void "suppress MIDI input" ! -nomidiout void "suppress MIDI output" ! -nomidi alias {list -nomidiin -nomidiout} ! -midiindev sys_parsedevlist "midi in device list; e.g., "1,3" for first and third" ! -midioutdev sys_parsedevlist "midi out device list, same format" ! -mididev sys_parsedevlist {list -midindev %1 -midioutdev %1} ! -path folder "add to file search path" ! -helppath folder "add to help file search path" ! -open file "open file(s) on startup" ! -lib file "load object library(s)" ! -font int "specify default font size in points" ! -verbose void "extra printout on startup and when searching for files" ! -version void "don't run Pd; just print out which version it is" ! -d void "specify debug level" ! -noloadbang void "suppress all loadbangs" ! -nogui void "suppress starting the GUI" ! -guicmd string "substitute another GUI program (e.g., rsh)" ! -send string "send a message at startup (after patches are loaded)" ! -listdev void "list audio and MIDI devices" ! -rt|-realtime void "use real-time priority (needs root privilege)" ! -console int "console scrollback lines (0 = disable console)" ! -look folder "folder containing buttonbar icons" ! -statusbar void "enable statusbar" }
--- 2195,2247 ----
set pdrc_options { ! section "" "Audio DSP" ! int -r "sample rate" ! devlist -soundindev|-audioindev "audio in devices" ! devlist -soundoutdev|-audiooutdev "audio out devices" ! alias -sounddev|-audiodev {list -soundindev %1 -soundoutdev %1} ! devlist -inchannels "audio input channels (by device, like "2" or "16,8")" ! devlist -outchannels "number of audio out channels (same)" ! alias -channels {list -inchannels %1 -outchannels %1} ! int -audiobuf|-soundbuf "specify size of audio buffer in msec" ! int -blocksize "specify audio I/O block size in sample frames" ! int -sleepgrain "specify number of milliseconds to sleep when idle" ! void -nodac "suppress audio output" ! void -noadc "suppress audio input" ! alias -noaudio|-nosound {list -nodac -noadc} ! radio {-alsa -jack -mmio -portaudio|-pa|-asio -oss} { ! "use ALSA audio API" ! "use JACK audio API" ! "use MMIO audio API (default for Windows)" ! "use ASIO audio driver (via Portaudio)" ! "use OSS audio API" ! } ! void -32bit "allow 32 bit OSS audio (for RME Hammerfall)"
! section "" "MIDI" ! void -nomidiin "suppress MIDI input" ! void -nomidiout "suppress MIDI output" ! alias -nomidi {list -nomidiin -nomidiout} ! devlist -midiindev "midi in device list; e.g., "1,3" for first and third" ! devlist -midioutdev "midi out device list, same format" ! alias -mididev {list -midindev %1 -midioutdev %1}
! section "" "Other" ! folder -path "add to file search path" ! folder -helppath "add to help file search path" ! file -open "open file(s) on startup" ! file -lib "load object library(s)" ! int -font "specify default font size in points" ! void -verbose "extra printout on startup and when searching for files" ! void -version "don't run Pd; just print out which version it is" ! void -d "specify debug level" ! void -noloadbang "suppress all loadbangs" ! void -nogui "suppress starting the GUI" ! string -guicmd "substitute another GUI program (e.g., rsh)" ! string -send "send a message at startup (after patches are loaded)" ! void -listdev "list audio and MIDI devices" ! void -rt|-realtime "use real-time priority (needs root privilege)" ! int -console "console scrollback lines (0 = disable console)" ! folder -look "folder containing buttonbar icons" ! void -statusbar "enable statusbar" }
*************** *** 2245,2249 **** proc pdrc_editor_apply {self} {error "BOO"}
! proc foo {args} {puts stderr "$args"}
proc pdrc_editor_new {} { --- 2250,2263 ---- proc pdrc_editor_apply {self} {error "BOO"}
! proc notebook_select {self i} { ! global _ ! catch { ! .$self.bar.$_($self:section) configure -relief raised ! place forget .$self.main.$_($self:section) ! } ! set _($self:section) $i ! place .$self.main.$_($self:section) -x 0 -y 0 ! .$self.bar.$_($self:section) configure -relief sunken ! }
proc pdrc_editor_new {} { *************** *** 2252,2270 **** toplevel .$self frame .$self.1 ! canvas .$self.1.1 -yscrollcommand ".$self.1.2 set" ! frame .$self.1.1.2 ! .$self.1.1 create window 0 0 -window .$self.1.1.2 -anchor nw ! scrollbar .$self.1.2 -command ".$self.1.1 yview" ! foreach {x y z} $pdrc_options { ! puts "$x $y $z" ! properties_dialog $self.1.1.2 pdrc_editor_ok [list $x "$x: $z" $y {}] } - pack .$self.1.1 -expand yes -fill both -side left - pack .$self.1.2 -fill y -side left - pack .$self.1 -expand yes -fill both cancel_apply_ok $self pdrc_editor ! .$self.1.1 configure -scrollregion \ ! [list 0 0 [.$self.1.1 cget -width] [.$self.1.1 cget -height]] ! .$self.1.2 set 0 [.$self.1.1 cget -height] return $self } --- 2266,2302 ---- toplevel .$self frame .$self.1 ! frame .$self.1.bar ! frame .$self.1.buttonsep -height 2 -borderwidth 1 -relief sunken ! frame .$self.1.main -borderwidth 1 -relief raised -width 600 -height 350 ! set section 0 ! foreach {type name desc} $pdrc_options { ! puts [list $type $name $desc] ! switch $type { void { set type toggle }} ! switch $type { ! section { ! incr section ! frame .$self.1.main.$section ! button .$self.1.bar.$section -text $desc \ ! -command [list notebook_select $self.1 $section] ! pack .$self.1.bar.$section -side left ! } ! alias {} ! radio { ! puts "(skipping radio)" ! properties_dialog $self.1.main.$section pdrc_editor_ok \ ! [list [lindex $name 0] "$desc" choice {}] ! } ! default { ! properties_dialog $self.1.main.$section pdrc_editor_ok \ ! [list $name "$name: $desc" $type {}] ! } ! } } cancel_apply_ok $self pdrc_editor ! notebook_select $self.1 1 ! pack .$self.1.bar -fill x ! pack .$self.1.buttonsep ! pack .$self.1.main -fill both -expand yes ! pack .$self.1 return $self }