From cedc1c9f387449ed690bb01390684be273e44f9f Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.noreply.github.com>
Date: Tue, 20 Jun 2023 14:06:04 -0700
Subject: [PATCH] Cocoa Port: Add option for Catmull-Rom sound interpolation in
 the GUI. Also update tooltips for all interpolation methods to better reflect
 how they compare to one another.

---
 desmume/src/SPU.h                             |   2 +-
 desmume/src/frontend/cocoa/cocoa_output.mm    |   4 +
 .../English.lproj/MainMenu.strings            | Bin 494388 -> 497164 bytes
 .../translations/English.lproj/MainMenu.xib   | 162 ++++++++++++++----
 4 files changed, 133 insertions(+), 35 deletions(-)

diff --git a/desmume/src/SPU.h b/desmume/src/SPU.h
index 5ba6d1c96..e88429415 100644
--- a/desmume/src/SPU.h
+++ b/desmume/src/SPU.h
@@ -49,7 +49,7 @@ enum SPUInterpolationMode
 	SPUInterpolation_None   = 0,
 	SPUInterpolation_Linear = 1,
 	SPUInterpolation_Cosine = 2,
-	SPUInterpolation_CatmullRom = 3,
+	SPUInterpolation_CatmullRom = 3
 };
 
 struct SoundInterface_struct
diff --git a/desmume/src/frontend/cocoa/cocoa_output.mm b/desmume/src/frontend/cocoa/cocoa_output.mm
index edff7cc58..f518ec7bf 100644
--- a/desmume/src/frontend/cocoa/cocoa_output.mm
+++ b/desmume/src/frontend/cocoa/cocoa_output.mm
@@ -469,6 +469,10 @@
 			theString = @"Cosine";
 			break;
 			
+		case SPUInterpolation_CatmullRom:
+			theString = @"Catmull-Rom";
+			break;
+			
 		default:
 			break;
 	}
diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.strings
index f801db50b7b635a1f811c4158065a5fdb6332782..90587aad6b747e888dd93a6205f57449cbbab370 100644
GIT binary patch
delta 1760
zcmcIk-%FEW6h3GB+!w>bsr}eYae>k#Lw6yB5lkWR7tCVa1h%2!q-{<&C53PoMH$^4
z=vZ?btRE1J7<|I6Lgr0g$^L@Cn{EtRVE3JUdZ9^l^L@OWkN5rFm-9U5InVoUzHWO}
zXe)kvqefv45|E^Fy4Mkc7)(REeCJ?R{w~wcbb#LHFSJHw{a7LfGqS%R`-?IQ%laWC
z$hXnKJ%i|?N><V0Z%5FGteS7bgDpORnGryNkueKPGK;{nkVw#@j2o}<{B3Ni)0xqy
zOuwTY{;Go9-<`r|5vCx_69sJL-~igx$Wh&+*)7vSwEbMS<>I&?P7D17VVFEs#@8%*
z=w7~oHZwiWQ$@(}>r%6y_ST(TCA4etyakO-N%8z={+7ZqPW?cI>jT&+4Ykp&cP{PR
zhoy`WO|4m_BvuI<ViC#4T)c@k_Sf9^;(jyxw{g<+e$r_683)G%w>XS0-W@`h`I!5;
zJsq<on1wTjw|=K4q{6AY*k^d|W43xOwvw<&SS1vRItg2;KA>Lh<E{rv7gt8G(;z+h
z=>RtKWC0sa-ulqNI92V6)eASc{6syEUS7?i+gwz}VO(_#>es*aAVp+!!yO96I=K2$
zRq&7tH>Q=#99*#|XOnRJ+*Zs(!F8{>B<V;R^ip}Pi7P|up-R7gTis40-r|3><bUGO
d_FALPMp`xT#oD3^bm@dZ^1epl3iN{={s2XK<7NN=

delta 757
zcmeBKBe!Lm+=gW{CyU%YF*$Fp-1HwSnWQ#<m?gqE+2sDY=>m<60h15xW|>?tw{Lpf
zXEuq+2J^Vs6&Mm3@)%O4Kb*ua%$&+lJl(OM-I`N}L4hHOp_HLyy1WmoIBPMGn>hVr
z2%{vw0z(c%K0`4ODgf!U>4Bb%($ha3W|5li;0-eWuFT|u`4-dp-qFJRV<7i$u2|^7
zINiaHg+()&Ar<JH93Yv;Py%#NG0;h+AnyR#g+Nv!P%aZFQ#skTP;z=pDB~?~0AwvO
z({*L2U?55R_LOi&Ge)R>naLjMBGVg;nOG**EaRDeFM?5F@`EnD$y_S}Hn%L_G6xt1
z$EJBPvTXNpW%Pmvf6z1!#tF0v`sovPG0IFo;KRr=oyUh!YPy0Kkf44vYzIbj1t%H7
iza1F-B8;Smdpj`PftU%1nSq!Eh*^P{4HzHn7UlrlN!jNB

diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib
index 83810f206..c94087d66 100644
--- a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib
+++ b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib
@@ -6190,14 +6190,15 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
         <string key="NSClassName">NSView</string>
       </object>
       <object class="NSCustomView" id="704316683">
-        <nil key="NSNextResponder"/>
+        <reference key="NSNextResponder"/>
         <int key="NSvFlags">268</int>
         <array class="NSMutableArray" key="NSSubviews">
           <object class="NSPopUpButton" id="193380617">
             <reference key="NSNextResponder" ref="704316683"/>
             <int key="NSvFlags">268</int>
-            <string key="NSFrame">{{163, 329}, {220, 26}}</string>
+            <string key="NSFrame">{{163, 347}, {220, 26}}</string>
             <reference key="NSSuperview" ref="704316683"/>
+            <reference key="NSWindow"/>
             <reference key="NSNextKeyView" ref="394747689"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSPopUpButtonCell" key="NSCell" id="29269565">
@@ -6254,8 +6255,9 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
           <object class="NSTextField" id="913591955">
             <reference key="NSNextResponder" ref="704316683"/>
             <int key="NSvFlags">268</int>
-            <string key="NSFrame">{{17, 335}, {144, 17}}</string>
+            <string key="NSFrame">{{17, 353}, {144, 17}}</string>
             <reference key="NSSuperview" ref="704316683"/>
+            <reference key="NSWindow"/>
             <reference key="NSNextKeyView" ref="193380617"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSTextFieldCell" key="NSCell" id="748093335">
@@ -6283,6 +6285,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                     <int key="NSvFlags">268</int>
                     <string key="NSFrame">{{16, 12}, {153, 18}}</string>
                     <reference key="NSSuperview" ref="441129927"/>
+                    <reference key="NSWindow"/>
                     <reference key="NSNextKeyView" ref="1070621411"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="412966482">
@@ -6305,11 +6308,13 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                 </array>
                 <string key="NSFrame">{{1, 1}, {364, 38}}</string>
                 <reference key="NSSuperview" ref="990175597"/>
+                <reference key="NSWindow"/>
                 <reference key="NSNextKeyView" ref="89239259"/>
               </object>
             </array>
-            <string key="NSFrame">{{17, 209}, {366, 54}}</string>
+            <string key="NSFrame">{{17, 227}, {366, 54}}</string>
             <reference key="NSSuperview" ref="704316683"/>
+            <reference key="NSWindow"/>
             <reference key="NSNextKeyView" ref="441129927"/>
             <string key="NSOffsets">{0, 0}</string>
             <object class="NSTextFieldCell" key="NSTitleCell">
@@ -6339,6 +6344,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                     <int key="NSvFlags">268</int>
                     <string key="NSFrame">{{18, 15}, {180, 46}}</string>
                     <reference key="NSSuperview" ref="611125211"/>
+                    <reference key="NSWindow"/>
                     <reference key="NSNextKeyView" ref="329183370"/>
                     <bool key="NSEnabled">YES</bool>
                     <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -6584,6 +6590,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                     <int key="NSvFlags">268</int>
                     <string key="NSFrame">{{145, 10}, {204, 26}}</string>
                     <reference key="NSSuperview" ref="611125211"/>
+                    <reference key="NSWindow"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSPopUpButtonCell" key="NSCell" id="289234889">
                       <int key="NSCellFlags">-2076180416</int>
@@ -6650,11 +6657,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                 </array>
                 <string key="NSFrame">{{1, 1}, {364, 71}}</string>
                 <reference key="NSSuperview" ref="379003821"/>
+                <reference key="NSWindow"/>
                 <reference key="NSNextKeyView" ref="996962843"/>
               </object>
             </array>
             <string key="NSFrame">{{17, 16}, {366, 87}}</string>
             <reference key="NSSuperview" ref="704316683"/>
+            <reference key="NSWindow"/>
             <reference key="NSNextKeyView" ref="611125211"/>
             <string key="NSOffsets">{0, 0}</string>
             <object class="NSTextFieldCell" key="NSTitleCell">
@@ -6682,12 +6691,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                   <object class="NSMatrix" id="945502088">
                     <reference key="NSNextResponder" ref="244021145"/>
                     <int key="NSvFlags">268</int>
-                    <string key="NSFrame">{{18, 14}, {328, 58}}</string>
+                    <string key="NSFrame">{{18, 13}, {130, 78}}</string>
                     <reference key="NSSuperview" ref="244021145"/>
+                    <reference key="NSWindow"/>
                     <reference key="NSNextKeyView" ref="379003821"/>
                     <bool key="NSEnabled">YES</bool>
                     <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                    <int key="NSNumRows">3</int>
+                    <int key="NSNumRows">4</int>
                     <int key="NSNumCols">1</int>
                     <array class="NSMutableArray" key="NSCells">
                       <object class="NSButtonCell" id="1001250119">
@@ -6821,8 +6831,21 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
                         <int key="NSPeriodicDelay">400</int>
                         <int key="NSPeriodicInterval">75</int>
                       </object>
+                      <object class="NSButtonCell" id="746333771">
+                        <int key="NSCellFlags">67108864</int>
+                        <int key="NSCellFlags2">0</int>
+                        <string key="NSContents">Catmull-Rom</string>
+                        <reference key="NSSupport" ref="462791774"/>
+                        <reference key="NSControlView" ref="945502088"/>
+                        <int key="NSTag">3</int>
+                        <int key="NSButtonFlags">1211912448</int>
+                        <int key="NSButtonFlags2">0</int>
+                        <reference key="NSAlternateImage" ref="491083016"/>
+                        <int key="NSPeriodicDelay">400</int>
+                        <int key="NSPeriodicInterval">75</int>
+                      </object>
                     </array>
-                    <string key="NSCellSize">{328, 18}</string>
+                    <string key="NSCellSize">{130, 18}</string>
                     <string key="NSIntercellSpacing">{4, 2}</string>
                     <int key="NSMatrixFlags">1151868928</int>
                     <string key="NSCellClass">NSActionCell</string>
@@ -6936,13 +6959,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                     <reference key="NSFont" ref="462791774"/>
                   </object>
                 </array>
-                <string key="NSFrame">{{1, 1}, {364, 82}}</string>
+                <string key="NSFrame">{{1, 1}, {364, 100}}</string>
                 <reference key="NSSuperview" ref="1070621411"/>
+                <reference key="NSWindow"/>
                 <reference key="NSNextKeyView" ref="945502088"/>
               </object>
             </array>
-            <string key="NSFrame">{{17, 107}, {366, 98}}</string>
+            <string key="NSFrame">{{17, 107}, {366, 116}}</string>
             <reference key="NSSuperview" ref="704316683"/>
+            <reference key="NSWindow"/>
             <reference key="NSNextKeyView" ref="244021145"/>
             <string key="NSOffsets">{0, 0}</string>
             <object class="NSTextFieldCell" key="NSTitleCell">
@@ -6972,6 +6997,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                     <int key="NSvFlags">268</int>
                     <string key="NSFrame">{{40, 13}, {246, 21}}</string>
                     <reference key="NSSuperview" ref="539280335"/>
+                    <reference key="NSWindow"/>
                     <reference key="NSNextKeyView" ref="990570759"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSSliderCell" key="NSCell" id="577080553">
@@ -6995,6 +7021,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                     <int key="NSvFlags">268</int>
                     <string key="NSFrame">{{287, 17}, {62, 17}}</string>
                     <reference key="NSSuperview" ref="539280335"/>
+                    <reference key="NSWindow"/>
                     <reference key="NSNextKeyView" ref="990175597"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSTextFieldCell" key="NSCell" id="871591132">
@@ -7074,6 +7101,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                     </set>
                     <string key="NSFrame">{{18, 16}, {16, 16}}</string>
                     <reference key="NSSuperview" ref="539280335"/>
+                    <reference key="NSWindow"/>
                     <reference key="NSNextKeyView" ref="682389865"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSImageCell" key="NSCell" id="206851430">
@@ -7094,11 +7122,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                 </array>
                 <string key="NSFrame">{{1, 1}, {364, 44}}</string>
                 <reference key="NSSuperview" ref="394747689"/>
+                <reference key="NSWindow"/>
                 <reference key="NSNextKeyView" ref="983879008"/>
               </object>
             </array>
-            <string key="NSFrame">{{17, 267}, {366, 60}}</string>
+            <string key="NSFrame">{{17, 285}, {366, 60}}</string>
             <reference key="NSSuperview" ref="704316683"/>
+            <reference key="NSWindow"/>
             <reference key="NSNextKeyView" ref="539280335"/>
             <string key="NSOffsets">{0, 0}</string>
             <object class="NSTextFieldCell" key="NSTitleCell">
@@ -7116,7 +7146,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
             <bool key="NSTransparent">NO</bool>
           </object>
         </array>
-        <string key="NSFrameSize">{400, 373}</string>
+        <string key="NSFrameSize">{400, 391}</string>
+        <reference key="NSSuperview"/>
+        <reference key="NSWindow"/>
         <reference key="NSNextKeyView" ref="913591955"/>
         <string key="NSClassName">NSView</string>
       </object>
@@ -33259,7 +33291,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
       <object class="NSWindowTemplate" id="298377540">
         <int key="NSWindowStyleMask">279</int>
         <int key="NSWindowBacking">2</int>
-        <string key="NSWindowRect">{{230, 40}, {248, 501}}</string>
+        <string key="NSWindowRect">{{230, 40}, {248, 519}}</string>
         <int key="NSWTFlags">-461896704</int>
         <string key="NSWindowTitle">Sound Settings</string>
         <string key="NSWindowClass">NSPanel</string>
@@ -33267,7 +33299,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
         <nil key="NSUserInterfaceItemIdentifier"/>
         <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
         <object class="NSView" key="NSWindowView" id="924299424">
-          <nil key="NSNextResponder"/>
+          <reference key="NSNextResponder"/>
           <int key="NSvFlags">256</int>
           <array class="NSMutableArray" key="NSSubviews">
             <object class="NSBox" id="1036485405">
@@ -33281,11 +33313,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                     <object class="NSMatrix" id="573406686">
                       <reference key="NSNextResponder" ref="946617804"/>
                       <int key="NSvFlags">268</int>
-                      <string key="NSFrame">{{18, 14}, {61, 58}}</string>
+                      <string key="NSFrame">{{18, 13}, {110, 78}}</string>
                       <reference key="NSSuperview" ref="946617804"/>
+                      <reference key="NSWindow"/>
                       <bool key="NSEnabled">YES</bool>
                       <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                      <int key="NSNumRows">3</int>
+                      <int key="NSNumRows">4</int>
                       <int key="NSNumCols">1</int>
                       <array class="NSMutableArray" key="NSCells">
                         <object class="NSButtonCell" id="819803843">
@@ -33419,8 +33452,21 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
                           <int key="NSPeriodicDelay">400</int>
                           <int key="NSPeriodicInterval">75</int>
                         </object>
+                        <object class="NSButtonCell" id="402160860">
+                          <int key="NSCellFlags">67108864</int>
+                          <int key="NSCellFlags2">131072</int>
+                          <string key="NSContents">Catmull-Rom</string>
+                          <reference key="NSSupport" ref="26"/>
+                          <reference key="NSControlView" ref="573406686"/>
+                          <int key="NSTag">3</int>
+                          <int key="NSButtonFlags">1211912448</int>
+                          <int key="NSButtonFlags2">0</int>
+                          <reference key="NSAlternateImage" ref="491083016"/>
+                          <int key="NSPeriodicDelay">400</int>
+                          <int key="NSPeriodicInterval">75</int>
+                        </object>
                       </array>
-                      <string key="NSCellSize">{61, 18}</string>
+                      <string key="NSCellSize">{110, 18}</string>
                       <string key="NSIntercellSpacing">{4, 2}</string>
                       <int key="NSMatrixFlags">1151868928</int>
                       <string key="NSCellClass">NSActionCell</string>
@@ -33534,12 +33580,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                       <reference key="NSFont" ref="462791774"/>
                     </object>
                   </array>
-                  <string key="NSFrame">{{1, 1}, {213, 82}}</string>
+                  <string key="NSFrame">{{1, 1}, {213, 100}}</string>
                   <reference key="NSSuperview" ref="1036485405"/>
+                  <reference key="NSWindow"/>
                 </object>
               </array>
-              <string key="NSFrame">{{16, 179}, {215, 98}}</string>
+              <string key="NSFrame">{{16, 179}, {215, 116}}</string>
               <reference key="NSSuperview" ref="924299424"/>
+              <reference key="NSWindow"/>
               <string key="NSOffsets">{0, 0}</string>
               <object class="NSTextFieldCell" key="NSTitleCell">
                 <int key="NSCellFlags">67108864</int>
@@ -33568,6 +33616,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                       <int key="NSvFlags">268</int>
                       <string key="NSFrame">{{18, 80}, {154, 38}}</string>
                       <reference key="NSSuperview" ref="651086227"/>
+                      <reference key="NSWindow"/>
                       <bool key="NSEnabled">YES</bool>
                       <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                       <int key="NSNumRows">2</int>
@@ -33810,6 +33859,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                       <int key="NSvFlags">268</int>
                       <string key="NSFrame">{{53, 14}, {100, 58}}</string>
                       <reference key="NSSuperview" ref="651086227"/>
+                      <reference key="NSWindow"/>
                       <bool key="NSEnabled">YES</bool>
                       <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                       <int key="NSNumRows">3</int>
@@ -34062,10 +34112,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                   </array>
                   <string key="NSFrame">{{1, 1}, {213, 128}}</string>
                   <reference key="NSSuperview" ref="982308127"/>
+                  <reference key="NSWindow"/>
                 </object>
               </array>
               <string key="NSFrame">{{16, 31}, {215, 144}}</string>
               <reference key="NSSuperview" ref="924299424"/>
+              <reference key="NSWindow"/>
               <string key="NSOffsets">{0, 0}</string>
               <object class="NSTextFieldCell" key="NSTitleCell">
                 <int key="NSCellFlags">67108864</int>
@@ -34094,6 +34146,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                       <int key="NSvFlags">268</int>
                       <string key="NSFrame">{{15, 12}, {135, 18}}</string>
                       <reference key="NSSuperview" ref="216894813"/>
+                      <reference key="NSWindow"/>
                       <bool key="NSEnabled">YES</bool>
                       <object class="NSButtonCell" key="NSCell" id="291427635">
                         <int key="NSCellFlags">-2080374784</int>
@@ -34115,10 +34168,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                   </array>
                   <string key="NSFrame">{{1, 1}, {213, 38}}</string>
                   <reference key="NSSuperview" ref="658920776"/>
+                  <reference key="NSWindow"/>
                 </object>
               </array>
-              <string key="NSFrame">{{16, 281}, {215, 54}}</string>
+              <string key="NSFrame">{{16, 299}, {215, 54}}</string>
               <reference key="NSSuperview" ref="924299424"/>
+              <reference key="NSWindow"/>
               <string key="NSOffsets">{0, 0}</string>
               <object class="NSTextFieldCell" key="NSTitleCell">
                 <int key="NSCellFlags">67108864</int>
@@ -34147,6 +34202,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                       <int key="NSvFlags">268</int>
                       <string key="NSFrame">{{40, 13}, {115, 21}}</string>
                       <reference key="NSSuperview" ref="112653742"/>
+                      <reference key="NSWindow"/>
                       <bool key="NSEnabled">YES</bool>
                       <object class="NSSliderCell" key="NSCell" id="811159600">
                         <int key="NSCellFlags">67371264</int>
@@ -34169,6 +34225,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                       <int key="NSvFlags">268</int>
                       <string key="NSFrame">{{147, 17}, {52, 14}}</string>
                       <reference key="NSSuperview" ref="112653742"/>
+                      <reference key="NSWindow"/>
                       <bool key="NSEnabled">YES</bool>
                       <object class="NSTextFieldCell" key="NSCell" id="365973783">
                         <int key="NSCellFlags">68157504</int>
@@ -34240,6 +34297,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                       </set>
                       <string key="NSFrame">{{18, 16}, {16, 16}}</string>
                       <reference key="NSSuperview" ref="112653742"/>
+                      <reference key="NSWindow"/>
                       <bool key="NSEnabled">YES</bool>
                       <object class="NSImageCell" key="NSCell" id="32483980">
                         <int key="NSCellFlags">134217728</int>
@@ -34256,10 +34314,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                   </array>
                   <string key="NSFrame">{{1, 1}, {213, 44}}</string>
                   <reference key="NSSuperview" ref="755029719"/>
+                  <reference key="NSWindow"/>
                 </object>
               </array>
-              <string key="NSFrame">{{16, 339}, {215, 60}}</string>
+              <string key="NSFrame">{{16, 357}, {215, 60}}</string>
               <reference key="NSSuperview" ref="924299424"/>
+              <reference key="NSWindow"/>
               <string key="NSOffsets">{0, 0}</string>
               <object class="NSTextFieldCell" key="NSTitleCell">
                 <int key="NSCellFlags">67108864</int>
@@ -34280,6 +34340,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
               <int key="NSvFlags">268</int>
               <string key="NSFrame">{{43, 8}, {162, 19}}</string>
               <reference key="NSSuperview" ref="924299424"/>
+              <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
               <object class="NSButtonCell" key="NSCell" id="1024891561">
                 <int key="NSCellFlags">-2080374784</int>
@@ -34309,6 +34370,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                       <int key="NSvFlags">268</int>
                       <string key="NSFrame">{{18, 14}, {128, 38}}</string>
                       <reference key="NSSuperview" ref="300862151"/>
+                      <reference key="NSWindow"/>
                       <bool key="NSEnabled">YES</bool>
                       <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                       <int key="NSNumRows">2</int>
@@ -34549,10 +34611,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
                   </array>
                   <string key="NSFrame">{{1, 1}, {213, 62}}</string>
                   <reference key="NSSuperview" ref="67832852"/>
+                  <reference key="NSWindow"/>
                 </object>
               </array>
-              <string key="NSFrame">{{16, 403}, {215, 78}}</string>
+              <string key="NSFrame">{{16, 421}, {215, 78}}</string>
               <reference key="NSSuperview" ref="924299424"/>
+              <reference key="NSWindow"/>
               <string key="NSOffsets">{0, 0}</string>
               <object class="NSTextFieldCell" key="NSTitleCell">
                 <int key="NSCellFlags">67108864</int>
@@ -34569,7 +34633,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
               <bool key="NSTransparent">NO</bool>
             </object>
           </array>
-          <string key="NSFrameSize">{248, 501}</string>
+          <string key="NSFrameSize">{248, 519}</string>
+          <reference key="NSSuperview"/>
+          <reference key="NSWindow"/>
         </object>
         <string key="NSScreenRect">{{0, 0}, {1920, 1177}}</string>
         <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
@@ -60447,6 +60513,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
               <reference ref="597669038"/>
               <reference ref="683577764"/>
               <reference ref="186397803"/>
+              <reference ref="746333771"/>
             </array>
             <reference key="parent" ref="1070621411"/>
           </object>
@@ -61190,6 +61257,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
               <reference ref="653769551"/>
               <reference ref="171251521"/>
               <reference ref="483451617"/>
+              <reference ref="402160860"/>
             </array>
             <reference key="parent" ref="1036485405"/>
           </object>
@@ -80886,6 +80954,16 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
             <reference key="object" ref="885417578"/>
             <reference key="parent" ref="271982446"/>
           </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">12294</int>
+            <reference key="object" ref="746333771"/>
+            <reference key="parent" ref="945502088"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">12295</int>
+            <reference key="object" ref="402160860"/>
+            <reference key="parent" ref="573406686"/>
+          </object>
         </array>
       </object>
       <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -83672,6 +83750,22 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
         <string key="12239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="12240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="12241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+        <object class="NSMutableDictionary" key="12294.IBAttributePlaceholdersKey">
+          <string key="NS.key.0">ToolTip</string>
+          <object class="IBToolTipAttribute" key="NS.object.0">
+            <string key="name">ToolTip</string>
+            <reference key="object" ref="746333771"/>
+            <string key="toolTip">Aggressively smooths the sound, eliminating the harsh sounding harmonics and noise. However, some sound detail is lost. Negligible CPU usage.</string>
+          </object>
+        </object>
+        <object class="NSMutableDictionary" key="12295.IBAttributePlaceholdersKey">
+          <string key="NS.key.0">ToolTip</string>
+          <object class="IBToolTipAttribute" key="NS.object.0">
+            <string key="name">ToolTip</string>
+            <reference key="object" ref="402160860"/>
+            <string key="toolTip">Aggressively smooths the sound, eliminating the harsh sounding harmonics and noise. However, some sound detail is lost. Negligible CPU usage.</string>
+          </object>
+        </object>
         <string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -83837,7 +83931,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
         <string key="2155.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="2246.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <boolean value="YES" key="2246.toolbarItem.selectable"/>
-        <string key="2248.IBEditorWindowLastContentRect">{{329, 472}, {400, 373}}</string>
+        <string key="2248.IBEditorWindowLastContentRect">{{329, 454}, {400, 391}}</string>
         <string key="2248.IBPersistedLastKnownCanvasPosition">{668, 408.5}</string>
         <string key="2248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="2250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -83894,7 +83988,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
           <object class="IBToolTipAttribute" key="NS.object.0">
             <string key="name">ToolTip</string>
             <reference key="object" ref="1001250119"/>
-            <string key="toolTip">Performs no interpolation. This method produces the most accurate sound compared to the real hardware. All sound detail is preserved, but some sounds may sound harsh due to the presence of high-end harmonics. No CPU usage.</string>
+            <string key="toolTip">Performs no interpolation. This method produces the most accurate sound compared to the real hardware. All sound detail is preserved, but most sounds may sound harsh and noisy due to the presence of high-end harmonics and sound mixing roughness. No CPU usage.</string>
           </object>
         </object>
         <string key="2329.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -83903,7 +83997,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
           <object class="IBToolTipAttribute" key="NS.object.0">
             <string key="name">ToolTip</string>
             <reference key="object" ref="597669038"/>
-            <string key="toolTip">Smooths the sound and eliminates the harsh sounding harmonics, but also causes a significant loss of sound detail, especially in the high-end. Negligible CPU usage.</string>
+            <string key="toolTip">Aggressively smooths the sound, eliminating the harsh sounding harmonics and noise. However, much sound detail is lost, especially in the high-end. Negligible CPU usage.</string>
           </object>
         </object>
         <string key="2330.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -83913,7 +84007,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
           <object class="IBToolTipAttribute" key="NS.object.0">
             <string key="name">ToolTip</string>
             <reference key="object" ref="186397803"/>
-            <string key="toolTip">Excellent sound quality, producing the best balance between smoothness and sound detail. Neglible CPU usage. Recommended setting.</string>
+            <string key="toolTip">Moderately smooths the sound, significantly reducing the harsh sounding harmonics and noise. Produces the best balance between smoothness and sound detail. Neglible CPU usage. Recommended setting.</string>
           </object>
         </object>
         <string key="2332.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -84150,7 +84244,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
         <string key="2895.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="2896.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="2897.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-        <string key="29.IBEditorWindowLastContentRect">{{928, 836}, {512, 20}}</string>
+        <string key="29.IBEditorWindowLastContentRect">{{616, 836}, {512, 20}}</string>
         <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="2900.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="2901.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -84243,10 +84337,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
         <string key="3666.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="3667.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <string key="3709.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-        <string key="3712.IBEditorWindowLastContentRect">{{880, 95}, {248, 501}}</string>
+        <string key="3712.IBEditorWindowLastContentRect">{{874, 133}, {248, 519}}</string>
         <string key="3712.IBPersistedLastKnownCanvasPosition">{50, 735.5}</string>
         <string key="3712.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-        <string key="3712.IBWindowTemplateEditedContentRect">{{880, 95}, {248, 501}}</string>
+        <string key="3712.IBWindowTemplateEditedContentRect">{{874, 133}, {248, 519}}</string>
         <boolean value="NO" key="3712.NSWindowTemplate.visibleAtLaunch"/>
         <string key="3713.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
         <object class="NSMutableDictionary" key="3714.IBAttributePlaceholdersKey">
@@ -84273,7 +84367,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
           <object class="IBToolTipAttribute" key="NS.object.0">
             <string key="name">ToolTip</string>
             <reference key="object" ref="819803843"/>
-            <string key="toolTip">Performs no interpolation. This method produces the most accurate sound compared to the real hardware. All sound detail is preserved, but some sounds may sound harsh due to the presence of high-end harmonics. No CPU usage.</string>
+            <string key="toolTip">Performs no interpolation. This method produces the most accurate sound compared to the real hardware. All sound detail is preserved, but most sounds may sound harsh and noisy due to the presence of high-end harmonics and sound mixing roughness. No CPU usage.</string>
           </object>
         </object>
         <string key="3719.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -84282,7 +84376,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
           <object class="IBToolTipAttribute" key="NS.object.0">
             <string key="name">ToolTip</string>
             <reference key="object" ref="653769551"/>
-            <string key="toolTip">Smooths the sound and eliminates the harsh sounding harmonics, but also causes a significant loss of sound detail, especially in the high-end. Negligible CPU usage.</string>
+            <string key="toolTip">Aggressively smooths the sound, eliminating the harsh sounding harmonics and noise. However, much sound detail is lost, especially in the high-end. Negligible CPU usage.</string>
           </object>
         </object>
         <string key="3720.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -84312,7 +84406,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
           <object class="IBToolTipAttribute" key="NS.object.0">
             <string key="name">ToolTip</string>
             <reference key="object" ref="483451617"/>
-            <string key="toolTip">Excellent sound quality, producing the best balance between smoothness and sound detail. Neglible CPU usage. Recommended setting.</string>
+            <string key="toolTip">Moderately smooths the sound, significantly reducing the harsh sounding harmonics and noise. Produces the best balance between smoothness and sound detail. Neglible CPU usage. Recommended setting.</string>
           </object>
         </object>
         <string key="3732.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -87010,7 +87104,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
       <nil key="activeLocalization"/>
       <dictionary class="NSMutableDictionary" key="localizations"/>
       <nil key="sourceID"/>
-      <int key="maxID">12293</int>
+      <int key="maxID">12295</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -89802,7 +89896,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
       <string key="Image_Piano">{515, 457}</string>
       <string key="NSActionTemplate">{14, 14}</string>
       <string key="NSAddTemplate">{8, 8}</string>
-      <string key="NSApplicationIcon">{512, 512}</string>
+      <string key="NSApplicationIcon">{128, 128}</string>
       <string key="NSMenuCheckmark">{11, 11}</string>
       <string key="NSMenuMixedState">{10, 3}</string>
       <string key="NSPreferencesGeneral">{32, 32}</string>