From 886f10a9440ff7757101259632645d33879df3c8 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Fri, 14 Aug 2015 18:18:19 -0400
Subject: [PATCH] ported: "*cosmetic fix of k12 output abstraction, renaming of
the data tab" from pd-l2ork: 4c18e0103458446e9285967d9eab5b58ffc72322
---
l2ork_addons/K12/output-help.pd | 34 ++++++++++++++++-----------------
pd/src/pd.tk | 10 +++++-----
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/l2ork_addons/K12/output-help.pd b/l2ork_addons/K12/output-help.pd
index 6de705473..61079faf9 100755
--- a/l2ork_addons/K12/output-help.pd
+++ b/l2ork_addons/K12/output-help.pd
@@ -1,32 +1,32 @@
-#N canvas 431 81 501 573 10;
+#N canvas 421 28 501 614 10;
#X obj 205 -24 preset_hub k12 %hidden% %node% 2 2 14 %node% 2 2 28
;
-#X obj 6 379 cnv 15 478 138 empty empty empty 20 12 0 14 -233017 -66577
+#X obj 7 379 cnv 15 478 164 empty empty empty 20 12 0 14 -233017 -66577
0;
-#X obj 13 386 K12/output;
+#X obj 14 386 K12/output;
#X obj 14 147 K12/wii_speed;
#X obj 14 269 K12/instr_sustained2;
-#N canvas 616 449 380 118 META 0;
-#X text 9 47 INLET_0 Connect any signal you want to hear through the
-speakers;
-#X text 9 10 DESCRIPTION This is the main audio output. This sends
-the signals to the speakers and controls the main volume.;
-#X restore 452 525 pd META;
+#N canvas 616 449 395 407 META 0;
+#X text 9 47 INLET_0 Connect any signal (one or more) you want to hear
+through the speakers;
+#X text 9 10 DESCRIPTION This is the main sound output. This sends
+the signals to the speakers and controls the main volume;
+#X restore 452 559 pd META;
#X obj -2 -2 cnv 3 501 3 empty empty empty 5 14 0 20 -260097 -191407
0;
#X obj -2 -30 cnv 15 501 28 empty empty Output 5 14 0 20 -139274 -262144
0;
#X obj 469 1 ggee/image @pd_extra/K12/icons/l2ork.png 0;
#X obj 14 34 K12/wii_connect;
-#X text 111 490 Typically you want to use only one output object per
-patch.;
-#X text 111 388 The Sound object is the main audio output. This is
-the object that sends the audio from the program to the speakers. The
-slider controls the overall volume. Sliding it up turns the speakers
-on and sets the level. Sliding it all the way down turns the speakers
-off.;
-#X text 111 458 Toggle "stereo mode" on when using headphones or standard
+#X text 111 454 Toggle "stereo mode" on when using headphones or standard
computer speakers. Toggle it off when using the L2Ork setup.;
+#X text 111 388 The Output object sends the sound from this program
+to the speakers. The slider controls the overall volume. Sliding it
+up turns the speakers on and sets the level. Sliding it all the way
+down turns the speakers off.;
+#X text 111 490 Typically you want to use only one output object per
+patch. If you use more than one \, they will all mirror each other's
+settings (e.g. loudness level and on/off state).;
#X connect 3 0 4 0;
#X connect 4 0 2 0;
#X connect 9 0 3 0;
diff --git a/pd/src/pd.tk b/pd/src/pd.tk
index 108a87685..b68a58cff 100644
--- a/pd/src/pd.tk
+++ b/pd/src/pd.tk
@@ -479,9 +479,9 @@ proc pdtk_enable_k12_mode {extra_dir} {
image create photo i.edit -file $extra_dir/K12/icons/edit.png
image create photo i.perform -file $extra_dir/K12/icons/perform.png
- image create photo i.data -file $extra_dir/K12/icons/data.png
+ image create photo i.data -file $extra_dir/K12/icons/control.png
image create photo i.sound -file $extra_dir/K12/icons/sound.png
- image create photo i.data_on -file $extra_dir/K12/icons/data_on.png
+ image create photo i.data_on -file $extra_dir/K12/icons/control_on.png
image create photo i.sound_on -file $extra_dir/K12/icons/sound_on.png
.mbar.file insert 2 command -label {K12 Demos} -command {menu_k12_open_demos}
@@ -2650,10 +2650,10 @@ proc pdtk_canvas_new {name width height geometry editable} {
# ---------------------------------- DATA VS SOUND BUTTONS ----------------------------------
match_linux_wm [list frame $name.k12frame.datasound -relief flat]
- match_linux_wm [list button $name.k12frame.datasound.data -text "DATA" -image i.data_on -command [concat pdtk_k12_show_data_icons $name]]
+ match_linux_wm [list button $name.k12frame.datasound.data -text "CONTROL" -image i.data_on -command [concat pdtk_k12_show_data_icons $name]]
match_linux_wm [list button $name.k12frame.datasound.sound -text "SOUND" -image i.sound -command [concat pdtk_k12_show_sound_icons $name]]
pack $name.k12frame.datasound.data $name.k12frame.datasound.sound -side left -pady 1 -padx 1 -expand 0
- setTooltip $name.k12frame.datasound.data "Show DATA objects"
+ setTooltip $name.k12frame.datasound.data "Show CONTROL objects"
setTooltip $name.k12frame.datasound.sound "Show SOUND objects"
pdtk_k12panel_standardkeybindings $name.k12frame.datasound.data
pdtk_k12panel_standardkeybindings $name.k12frame.datasound.sound
@@ -2992,7 +2992,7 @@ proc pdtk_canvas_new {name width height geometry editable} {
match_linux_wm [list button $name.k12frame.output.b_output -image i.output \
-command [concat put_K12_objects $name output]]
pack $name.k12frame.output.b_output -side left -expand 0 -padx 1 -pady 1
- setTooltip $name.k12frame.output.b_output "Output: Use this to send audio from computer into speakers"
+ setTooltip $name.k12frame.output.b_output "Output: Use this to send sound from computer into speakers"
pdtk_k12panel_standardkeybindings $name.k12frame.output.b_output
# ---------------------------------------- NOW PACK THEM ALL -----------------------------------------
--
GitLab