Hide OPL detail settings once not RIX

ios/SDLPal/SDLPal/Base.lproj/Settings.storyboard

@@ -211,20 +211,20 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="Wcd-0e-0uz">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="3qo-FD-4nl">
                                         <rect key="frame" x="0.0" y="487.33333333333337" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Wcd-0e-0uz" id="7gg-Gn-Rbv">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3qo-FD-4nl" id="A3N-bu-7U7">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="OPL Synthesizer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lpD-tV-FRw">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="CD Source" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t2Y-EX-5pB">
                                                     <rect key="frame" x="8" y="12" width="157" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8B-g4-Bkc">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RXF-wq-i6h">
                                                     <rect key="frame" x="173" y="11" width="194" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -232,116 +232,122 @@
                                                 </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="trailingMargin" secondItem="v8B-g4-Bkc" secondAttribute="trailing" id="56g-RS-d4z"/>
-                                                <constraint firstItem="v8B-g4-Bkc" firstAttribute="centerY" secondItem="7gg-Gn-Rbv" secondAttribute="centerY" id="C2p-G0-Z8c"/>
-                                                <constraint firstItem="lpD-tV-FRw" firstAttribute="centerY" secondItem="7gg-Gn-Rbv" secondAttribute="centerY" id="GZJ-y3-EQN"/>
-                                                <constraint firstAttribute="leadingMargin" secondItem="lpD-tV-FRw" secondAttribute="leading" id="xNW-ce-MEk"/>
+                                                <constraint firstAttribute="leadingMargin" secondItem="t2Y-EX-5pB" secondAttribute="leading" id="ALb-Xw-JzH"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="RXF-wq-i6h" secondAttribute="trailing" id="ROS-cO-0fx"/>
+                                                <constraint firstItem="RXF-wq-i6h" firstAttribute="centerY" secondItem="A3N-bu-7U7" secondAttribute="centerY" id="Sp5-ui-pXW"/>
+                                                <constraint firstItem="t2Y-EX-5pB" firstAttribute="centerY" secondItem="A3N-bu-7U7" secondAttribute="centerY" id="p1G-ey-jCW"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="5P5-9D-K9z">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="m0b-oW-cFG">
                                         <rect key="frame" x="0.0" y="531.33333333333337" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5P5-9D-K9z" id="xWo-4q-ewi">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="m0b-oW-cFG" id="C0a-eU-4ng">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="OPL Sample Rate" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LM0-rh-yuy">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Music Volume" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="csD-lo-BFX">
                                                     <rect key="frame" x="8" y="12" width="157" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="33S-Ni-0yw">
-                                                    <rect key="frame" x="173" y="11" width="194" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="100" minValue="0.0" maxValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="ts6-3l-05V">
+                                                    <rect key="frame" x="171" y="7.6666666666666661" width="198" height="31"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="194" id="gDJ-hv-b8c"/>
+                                                    </constraints>
+                                                </slider>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="leadingMargin" secondItem="LM0-rh-yuy" secondAttribute="leading" id="2Ay-FN-XlR"/>
-                                                <constraint firstItem="33S-Ni-0yw" firstAttribute="centerY" secondItem="xWo-4q-ewi" secondAttribute="centerY" id="AZn-Ke-guf"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="33S-Ni-0yw" secondAttribute="trailing" id="HVs-RW-jTx"/>
-                                                <constraint firstItem="LM0-rh-yuy" firstAttribute="centerY" secondItem="xWo-4q-ewi" secondAttribute="centerY" id="Ndr-kX-qCu"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="ts6-3l-05V" secondAttribute="trailing" id="Huf-XL-BIr"/>
+                                                <constraint firstAttribute="leadingMargin" secondItem="csD-lo-BFX" secondAttribute="leading" id="L8D-ix-A4z"/>
+                                                <constraint firstItem="csD-lo-BFX" firstAttribute="centerY" secondItem="C0a-eU-4ng" secondAttribute="centerY" id="RMR-7J-Fun"/>
+                                                <constraint firstItem="ts6-3l-05V" firstAttribute="centerY" secondItem="csD-lo-BFX" secondAttribute="centerY" id="tnm-kz-ldY"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="3qo-FD-4nl">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="V3l-ah-ZFI">
                                         <rect key="frame" x="0.0" y="575.33333333333337" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3qo-FD-4nl" id="A3N-bu-7U7">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="V3l-ah-ZFI" id="eVR-TT-9qV">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="CD Source" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t2Y-EX-5pB">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="SFX Volume" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L24-lU-K9K">
                                                     <rect key="frame" x="8" y="12" width="157" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RXF-wq-i6h">
-                                                    <rect key="frame" x="173" y="11" width="194" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="100" minValue="0.0" maxValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="fyQ-sQ-eOv">
+                                                    <rect key="frame" x="171" y="7" width="198" height="31"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="194" id="PpE-ei-G2V"/>
+                                                    </constraints>
+                                                </slider>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="leadingMargin" secondItem="t2Y-EX-5pB" secondAttribute="leading" id="ALb-Xw-JzH"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="RXF-wq-i6h" secondAttribute="trailing" id="ROS-cO-0fx"/>
-                                                <constraint firstItem="RXF-wq-i6h" firstAttribute="centerY" secondItem="A3N-bu-7U7" secondAttribute="centerY" id="Sp5-ui-pXW"/>
-                                                <constraint firstItem="t2Y-EX-5pB" firstAttribute="centerY" secondItem="A3N-bu-7U7" secondAttribute="centerY" id="p1G-ey-jCW"/>
+                                                <constraint firstAttribute="leadingMargin" secondItem="L24-lU-K9K" secondAttribute="leading" id="NSg-LT-5d0"/>
+                                                <constraint firstItem="L24-lU-K9K" firstAttribute="centerY" secondItem="eVR-TT-9qV" secondAttribute="centerY" id="epv-PA-Mkq"/>
+                                                <constraint firstItem="fyQ-sQ-eOv" firstAttribute="centerY" secondItem="L24-lU-K9K" secondAttribute="centerY" id="uMf-Mu-ECn"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="fyQ-sQ-eOv" secondAttribute="trailing" id="vW5-Eh-pLv"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="6yy-RI-FfR">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="Wcd-0e-0uz">
                                         <rect key="frame" x="0.0" y="619.33333333333337" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6yy-RI-FfR" id="H5X-fx-gXk">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Wcd-0e-0uz" id="7gg-Gn-Rbv">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Stereo" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sIK-1p-lB9">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="OPL Synthesizer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lpD-tV-FRw">
                                                     <rect key="frame" x="8" y="12" width="157" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DGe-CJ-C30">
-                                                    <rect key="frame" x="318" y="7" width="51" height="31"/>
-                                                </switch>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8B-g4-Bkc">
+                                                    <rect key="frame" x="173" y="11" width="194" height="21"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="DGe-CJ-C30" firstAttribute="centerY" secondItem="sIK-1p-lB9" secondAttribute="centerY" id="Vpf-LU-GRc"/>
-                                                <constraint firstItem="sIK-1p-lB9" firstAttribute="centerY" secondItem="H5X-fx-gXk" secondAttribute="centerY" id="a9Q-NH-ck2"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="DGe-CJ-C30" secondAttribute="trailing" id="aG5-Js-o9z"/>
-                                                <constraint firstAttribute="leadingMargin" secondItem="sIK-1p-lB9" secondAttribute="leading" id="pdx-Zy-7nm"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="v8B-g4-Bkc" secondAttribute="trailing" id="56g-RS-d4z"/>
+                                                <constraint firstItem="v8B-g4-Bkc" firstAttribute="centerY" secondItem="7gg-Gn-Rbv" secondAttribute="centerY" id="C2p-G0-Z8c"/>
+                                                <constraint firstItem="lpD-tV-FRw" firstAttribute="centerY" secondItem="7gg-Gn-Rbv" secondAttribute="centerY" id="GZJ-y3-EQN"/>
+                                                <constraint firstAttribute="leadingMargin" secondItem="lpD-tV-FRw" secondAttribute="leading" id="xNW-ce-MEk"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="WrT-Dr-FrF">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="5P5-9D-K9z">
                                         <rect key="frame" x="0.0" y="663.33333333333337" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WrT-Dr-FrF" id="2Az-da-XqZ">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5P5-9D-K9z" id="xWo-4q-ewi">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="SurroundOPL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7y3-G9-hca">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="OPL Sample Rate" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LM0-rh-yuy">
                                                     <rect key="frame" x="8" y="12" width="157" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YBD-8I-fzH">
-                                                    <rect key="frame" x="318" y="7" width="51" height="31"/>
-                                                </switch>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="33S-Ni-0yw">
+                                                    <rect key="frame" x="173" y="11" width="194" height="21"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="leadingMargin" secondItem="7y3-G9-hca" secondAttribute="leading" id="0dq-NQ-hcf"/>
-                                                <constraint firstItem="7y3-G9-hca" firstAttribute="centerY" secondItem="2Az-da-XqZ" secondAttribute="centerY" id="kaI-ps-oTV"/>
-                                                <constraint firstItem="YBD-8I-fzH" firstAttribute="centerY" secondItem="7y3-G9-hca" secondAttribute="centerY" id="knd-b3-hWT"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="YBD-8I-fzH" secondAttribute="trailing" id="oJO-Fm-Bfn"/>
+                                                <constraint firstAttribute="leadingMargin" secondItem="LM0-rh-yuy" secondAttribute="leading" id="2Ay-FN-XlR"/>
+                                                <constraint firstItem="33S-Ni-0yw" firstAttribute="centerY" secondItem="xWo-4q-ewi" secondAttribute="centerY" id="AZn-Ke-guf"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="33S-Ni-0yw" secondAttribute="trailing" id="HVs-RW-jTx"/>
+                                                <constraint firstItem="LM0-rh-yuy" firstAttribute="centerY" secondItem="xWo-4q-ewi" secondAttribute="centerY" id="Ndr-kX-qCu"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -401,87 +407,81 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="H6k-zH-SLQ">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="6yy-RI-FfR">
                                         <rect key="frame" x="0.0" y="795.33333333333337" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="H6k-zH-SLQ" id="3vu-2x-gU2">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6yy-RI-FfR" id="H5X-fx-gXk">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="SSRC Quality" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oQa-bR-CM1">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Stereo" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sIK-1p-lB9">
                                                     <rect key="frame" x="8" y="12" width="157" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="4" minValue="0.0" maxValue="4" translatesAutoresizingMaskIntoConstraints="NO" id="M1b-8i-ldA">
-                                                    <rect key="frame" x="171" y="7" width="198" height="31"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="194" id="iYs-hM-l2x"/>
-                                                    </constraints>
-                                                </slider>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DGe-CJ-C30">
+                                                    <rect key="frame" x="318" y="7" width="51" height="31"/>
+                                                </switch>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="oQa-bR-CM1" firstAttribute="centerY" secondItem="3vu-2x-gU2" secondAttribute="centerY" id="BUE-Ev-XQ2"/>
-                                                <constraint firstAttribute="leadingMargin" secondItem="oQa-bR-CM1" secondAttribute="leading" id="CLY-nE-6fl"/>
-                                                <constraint firstItem="M1b-8i-ldA" firstAttribute="centerY" secondItem="oQa-bR-CM1" secondAttribute="centerY" id="Zrq-qm-0qW"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="M1b-8i-ldA" secondAttribute="trailing" id="ueZ-xM-RHS"/>
+                                                <constraint firstItem="DGe-CJ-C30" firstAttribute="centerY" secondItem="sIK-1p-lB9" secondAttribute="centerY" id="Vpf-LU-GRc"/>
+                                                <constraint firstItem="sIK-1p-lB9" firstAttribute="centerY" secondItem="H5X-fx-gXk" secondAttribute="centerY" id="a9Q-NH-ck2"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="DGe-CJ-C30" secondAttribute="trailing" id="aG5-Js-o9z"/>
+                                                <constraint firstAttribute="leadingMargin" secondItem="sIK-1p-lB9" secondAttribute="leading" id="pdx-Zy-7nm"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="m0b-oW-cFG">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="WrT-Dr-FrF">
                                         <rect key="frame" x="0.0" y="839.33333333333337" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="m0b-oW-cFG" id="C0a-eU-4ng">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WrT-Dr-FrF" id="2Az-da-XqZ">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Music Volume" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="csD-lo-BFX">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="SurroundOPL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7y3-G9-hca">
                                                     <rect key="frame" x="8" y="12" width="157" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="100" minValue="0.0" maxValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="ts6-3l-05V">
-                                                    <rect key="frame" x="171" y="7.6666666666666661" width="198" height="31"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="194" id="gDJ-hv-b8c"/>
-                                                    </constraints>
-                                                </slider>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YBD-8I-fzH">
+                                                    <rect key="frame" x="318" y="7" width="51" height="31"/>
+                                                </switch>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="trailingMargin" secondItem="ts6-3l-05V" secondAttribute="trailing" id="Huf-XL-BIr"/>
-                                                <constraint firstAttribute="leadingMargin" secondItem="csD-lo-BFX" secondAttribute="leading" id="L8D-ix-A4z"/>
-                                                <constraint firstItem="csD-lo-BFX" firstAttribute="centerY" secondItem="C0a-eU-4ng" secondAttribute="centerY" id="RMR-7J-Fun"/>
-                                                <constraint firstItem="ts6-3l-05V" firstAttribute="centerY" secondItem="csD-lo-BFX" secondAttribute="centerY" id="tnm-kz-ldY"/>
+                                                <constraint firstAttribute="leadingMargin" secondItem="7y3-G9-hca" secondAttribute="leading" id="0dq-NQ-hcf"/>
+                                                <constraint firstItem="7y3-G9-hca" firstAttribute="centerY" secondItem="2Az-da-XqZ" secondAttribute="centerY" id="kaI-ps-oTV"/>
+                                                <constraint firstItem="YBD-8I-fzH" firstAttribute="centerY" secondItem="7y3-G9-hca" secondAttribute="centerY" id="knd-b3-hWT"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="YBD-8I-fzH" secondAttribute="trailing" id="oJO-Fm-Bfn"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="V3l-ah-ZFI">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="H6k-zH-SLQ">
                                         <rect key="frame" x="0.0" y="883.33333333333337" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="V3l-ah-ZFI" id="eVR-TT-9qV">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="H6k-zH-SLQ" id="3vu-2x-gU2">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="SFX Volume" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L24-lU-K9K">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="SSRC Quality" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oQa-bR-CM1">
                                                     <rect key="frame" x="8" y="12" width="157" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="100" minValue="0.0" maxValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="fyQ-sQ-eOv">
+                                                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="4" minValue="0.0" maxValue="4" translatesAutoresizingMaskIntoConstraints="NO" id="M1b-8i-ldA">
                                                     <rect key="frame" x="171" y="7" width="198" height="31"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="194" id="PpE-ei-G2V"/>
+                                                        <constraint firstAttribute="width" constant="194" id="iYs-hM-l2x"/>
                                                     </constraints>
                                                 </slider>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="leadingMargin" secondItem="L24-lU-K9K" secondAttribute="leading" id="NSg-LT-5d0"/>
-                                                <constraint firstItem="L24-lU-K9K" firstAttribute="centerY" secondItem="eVR-TT-9qV" secondAttribute="centerY" id="epv-PA-Mkq"/>
-                                                <constraint firstItem="fyQ-sQ-eOv" firstAttribute="centerY" secondItem="L24-lU-K9K" secondAttribute="centerY" id="uMf-Mu-ECn"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="fyQ-sQ-eOv" secondAttribute="trailing" id="vW5-Eh-pLv"/>
+                                                <constraint firstItem="oQa-bR-CM1" firstAttribute="centerY" secondItem="3vu-2x-gU2" secondAttribute="centerY" id="BUE-Ev-XQ2"/>
+                                                <constraint firstAttribute="leadingMargin" secondItem="oQa-bR-CM1" secondAttribute="leading" id="CLY-nE-6fl"/>
+                                                <constraint firstItem="M1b-8i-ldA" firstAttribute="centerY" secondItem="oQa-bR-CM1" secondAttribute="centerY" id="Zrq-qm-0qW"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="M1b-8i-ldA" secondAttribute="trailing" id="ueZ-xM-RHS"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>

ios/SDLPal/SDLPal/SDLPal-Info.plist

@@ -42,6 +42,7 @@
 	<array>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 </dict>
 </plist>

ios/SDLPal/SDLPal/SettingsTableViewController.m

@@ -119,17 +119,30 @@ typedef void(^SelectedBlock)(NSString *selected);
                                                    origin:origin];
 }
 
-//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-//{
-//    float heightForRow = 40;
-//    
-//    if([lblMusicType.text isEqualToString:@"MIDI"] &&
-//      ((indexPath.row == 1 && indexPath.section == 3) ||
-//       (indexPath.row == 1 && indexPath.section == 3)))
-//        return 0;
-//    else
-//        return heightForRow;
-//}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    //need manually sync with storyboard...
+    int rows = 1;
+    switch(section) {
+        case 0:
+            rows = 1;
+            break;
+        case 1:
+            rows = 2;
+            break;
+       case 2:
+            rows = 2;
+            break;
+        case 3:
+            rows = [lblMusicType.text isEqualToString:@"RIX"] ? 11 : 4;
+            break;
+        case 4:
+            rows = 2;
+            break;
+        default:
+            break;
+    }
+    return rows;
+}
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
@@ -138,17 +151,19 @@ typedef void(^SelectedBlock)(NSString *selected);
     }else if( indexPath.section == 1 && indexPath.row == 1 ) { //font file
         [self showPickerWithTitle:nil toLabel:lblFontFile inArray:AvailFiles origin:cell allowEmpty:YES];
     }else if( indexPath.section == 3 && indexPath.row == 0 ) { //BGM
-        [self showPickerWithTitle:nil toLabel:lblMusicType inArray:MusicFormats origin:cell];
-    }else if( indexPath.section == 3 && indexPath.row == 1 ) { //OPL Type
+        [self showPickerWithTitle:nil toLabel:lblMusicType inArray:MusicFormats origin:cell allowEmpty:NO doneBlock:^(NSString *selected) {
+            [self.tableView reloadData];
+        }];
+    }else if( indexPath.section == 3 && indexPath.row == 4 ) { //OPL Type
         [self showPickerWithTitle:nil toLabel:lblOPLType inArray:OPLFormats origin:cell];
-    }else if( indexPath.section == 3 && indexPath.row == 2 ) { //OPL Rate
+    }else if( indexPath.section == 3 && indexPath.row == 5 ) { //OPL Rate
         [self showPickerWithTitle:nil toLabel:lblOPLRate inArray:OPLSampleRates origin:cell];
-    }else if( indexPath.section == 3 && indexPath.row == 3 ) { //CD Source
+    }else if( indexPath.section == 3 && indexPath.row == 1 ) { //CD Source
         [self showPickerWithTitle:nil toLabel:lblCDAudioSource inArray:CDFormats origin:cell];
-    }else if( indexPath.section == 3 && indexPath.row == 4 ) { //Stereo
-        toggleStereo.enabled = !toggleStereo.isEnabled;
-    }else if( indexPath.section == 3 && indexPath.row == 5 ) { //Surround
-        toggleSurroundOPL.enabled = !toggleSurroundOPL.isEnabled;
+    }else if( indexPath.section == 3 && indexPath.row == 8 ) { //Stereo
+        toggleStereo.on = !toggleStereo.isOn;
+    }else if( indexPath.section == 3 && indexPath.row == 9 ) { //Surround
+        toggleSurroundOPL.on = !toggleSurroundOPL.isOn;
     }else if( indexPath.section == 3 && indexPath.row == 6 ) { //SampleRate
         [self showPickerWithTitle:nil toLabel:lblResampleRate inArray:AudioSampleRates origin:cell];
     }else if( indexPath.section == 3 && indexPath.row == 7 ) { //Buffer size
@@ -183,8 +198,8 @@ typedef void(^SelectedBlock)(NSString *selected);
     lblFontFile.text        = [NSString stringWithUTF8String:gConfig.pszFontFile ? gConfig.pszFontFile : ""];
     textLogFile.text        = [NSString stringWithUTF8String:gConfig.pszLogFile  ? gConfig.pszLogFile  : ""];
     
-    toggleStereo.enabled        = gConfig.iAudioChannels == 2;
-    toggleSurroundOPL.enabled   = gConfig.fUseSurroundOPL;
+    toggleStereo.on         = gConfig.iAudioChannels == 2;
+    toggleSurroundOPL.on    = gConfig.fUseSurroundOPL;
     
     lblMusicType.text       = MusicFormats[gConfig.eMusicType];
     lblOPLType.text         = OPLFormats[gConfig.eOPLType];
@@ -198,6 +213,8 @@ typedef void(^SelectedBlock)(NSString *selected);
     sliderResampleQuality.value = gConfig.iResampleQuality;
     
     lblLogLevel.text        = LogLevels[gConfig.iLogLevel];
+    
+    [self.tableView reloadData];
 }
 
 - (void)saveConfigs {
@@ -205,8 +222,8 @@ typedef void(^SelectedBlock)(NSString *selected);
     gConfig.pszFontFile = [lblLanguageFile.text length] == 0 ? NULL : strdup([[lblFontFile      text] UTF8String]);
     gConfig.pszLogFile  = [lblLanguageFile.text length] == 0 ? NULL : strdup([[textLogFile      text] UTF8String]);
     
-    gConfig.iAudioChannels  = toggleStereo.isEnabled ? 2 : 1;
-    gConfig.fUseSurroundOPL = toggleSurroundOPL.isEnabled;
+    gConfig.iAudioChannels  = toggleStereo.isOn ? 2 : 1;
+    gConfig.fUseSurroundOPL = toggleSurroundOPL.isOn;
     
     gConfig.eMusicType  = (MUSICTYPE)[MusicFormats indexOfObject:lblMusicType.text];
     gConfig.eOPLType    = (OPLTYPE  )[OPLFormats   indexOfObject:lblOPLType.text];