macosx: removed no longer existing option 'server-port' from sprefs

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib
index 5da3830a515b8fde0ade2f7a79aaf20b4ac116d9..314aad71d4482ae2840f601b263fe8bb82ded69e 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
   <data>
     <int key="IBDocument.SystemTarget">1050</int>
-    <string key="IBDocument.SystemVersion">11A511</string>
+    <string key="IBDocument.SystemVersion">11A511a</string>
     <string key="IBDocument.InterfaceBuilderVersion">851</string>
     <string key="IBDocument.AppKitVersion">1138</string>
     <string key="IBDocument.HIToolboxVersion">566.00</string>
@@ -12,12 +12,12 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="2311"/>
-      <integer value="1538"/>
+      <integer value="2269"/>
       <integer value="2523"/>
       <integer value="2562"/>
+      <integer value="1538"/>
       <integer value="2332"/>
-      <integer value="2269"/>
+      <integer value="2311"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3174,140 +3174,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                 <int key="NSvFlags">274</int>
                 <object class="NSMutableArray" key="NSSubviews">
                   <bool key="EncodedWithXMLCoder">YES</bool>
-                  <object class="NSTextField" id="955218271">
-                    <reference key="NSNextResponder" ref="71852276"/>
-                    <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{222, 82}, {58, 22}}</string>
-                    <reference key="NSSuperview" ref="71852276"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSTextFieldCell" key="NSCell" id="888071880">
-                      <int key="NSCellFlags">-1804468671</int>
-                      <int key="NSCellFlags2">71304192</int>
-                      <object class="NSDecimalNumberPlaceholder" key="NSContents">
-                        <int key="NS.exponent">0</int>
-                        <int key="NS.length">1</int>
-                        <bool key="NS.negative">NO</bool>
-                        <bool key="NS.compact">YES</bool>
-                        <int key="NS.mantissa.bo">1</int>
-                        <bytes key="NS.mantissa">0gQAAAAAAAAAAAAAAAAAAA</bytes>
-                      </object>
-                      <reference key="NSSupport" ref="96267115"/>
-                      <object class="NSNumberFormatter" key="NSFormatter" id="313995595">
-                        <object class="NSMutableDictionary" key="NS.attributes">
-                          <bool key="EncodedWithXMLCoder">YES</bool>
-                          <object class="NSArray" key="dict.sortedKeys">
-                            <bool key="EncodedWithXMLCoder">YES</bool>
-                            <string>allowsFloats</string>
-                            <string>attributedStringForZero</string>
-                            <string>decimalSeparator</string>
-                            <string>formatterBehavior</string>
-                            <string>groupingSeparator</string>
-                            <string>locale</string>
-                            <string>maximum</string>
-                            <string>minimum</string>
-                            <string>negativeFormat</string>
-                            <string>positiveFormat</string>
-                            <string>usesGroupingSeparator</string>
-                          </object>
-                          <object class="NSMutableArray" key="dict.values">
-                            <bool key="EncodedWithXMLCoder">YES</bool>
-                            <boolean value="YES"/>
-                            <object class="NSAttributedString" id="519781368">
-                              <string key="NSString">0</string>
-                              <reference key="NSAttributes" ref="226083992"/>
-                            </object>
-                            <string>.</string>
-                            <integer value="1000"/>
-                            <string>,</string>
-                            <object class="NSLocale" id="356824444">
-                              <string key="NS.identifier"/>
-                            </object>
-                            <object class="NSDecimalNumberPlaceholder" id="927918270">
-                              <int key="NS.exponent">4</int>
-                              <int key="NS.length">1</int>
-                              <bool key="NS.negative">NO</bool>
-                              <bool key="NS.compact">YES</bool>
-                              <int key="NS.mantissa.bo">1</int>
-                              <bytes key="NS.mantissa">AQAAAAAAAAAAAAAAAAAAAA</bytes>
-                            </object>
-                            <object class="NSDecimalNumberPlaceholder" id="928096043">
-                              <int key="NS.exponent">0</int>
-                              <int key="NS.length">0</int>
-                              <bool key="NS.negative">NO</bool>
-                              <bool key="NS.compact">NO</bool>
-                              <int key="NS.mantissa.bo">1</int>
-                              <bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes>
-                            </object>
-                            <string/>
-                            <string>0</string>
-                            <boolean value="NO"/>
-                          </object>
-                        </object>
-                        <string key="NS.positiveformat">0</string>
-                        <string key="NS.negativeformat"/>
-                        <nil key="NS.positiveattrs"/>
-                        <nil key="NS.negativeattrs"/>
-                        <reference key="NS.zero" ref="519781368"/>
-                        <object class="NSAttributedString" key="NS.nil">
-                          <string key="NSString"/>
-                        </object>
-                        <object class="NSAttributedString" key="NS.nan">
-                          <string key="NSString">NaN</string>
-                          <reference key="NSAttributes" ref="226083992"/>
-                        </object>
-                        <reference key="NS.min" ref="928096043"/>
-                        <reference key="NS.max" ref="927918270"/>
-                        <nil key="NS.rounding"/>
-                        <string key="NS.decimal">.</string>
-                        <string key="NS.thousand">,</string>
-                        <bool key="NS.hasthousands">NO</bool>
-                        <bool key="NS.localized">NO</bool>
-                        <bool key="NS.allowsfloats">YES</bool>
-                      </object>
-                      <reference key="NSControlView" ref="955218271"/>
-                      <bool key="NSDrawsBackground">YES</bool>
-                      <reference key="NSBackgroundColor" ref="122952243"/>
-                      <reference key="NSTextColor" ref="292380699"/>
-                    </object>
-                  </object>
-                  <object class="NSStepper" id="348183576">
-                    <reference key="NSNextResponder" ref="71852276"/>
-                    <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{285, 79}, {19, 27}}</string>
-                    <reference key="NSSuperview" ref="71852276"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSStepperCell" key="NSCell" id="484538590">
-                      <int key="NSCellFlags">917024</int>
-                      <int key="NSCellFlags2">0</int>
-                      <reference key="NSControlView" ref="348183576"/>
-                      <double key="NSValue">1</double>
-                      <double key="NSMinValue">1</double>
-                      <double key="NSMaxValue">10000</double>
-                      <double key="NSIncrement">1</double>
-                      <bool key="NSValueWraps">YES</bool>
-                      <bool key="NSAutorepeat">YES</bool>
-                    </object>
-                  </object>
-                  <object class="NSTextField" id="730705500">
-                    <reference key="NSNextResponder" ref="71852276"/>
-                    <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{13, 85}, {204, 17}}</string>
-                    <reference key="NSSuperview" ref="71852276"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSTextFieldCell" key="NSCell" id="1347549">
-                      <int key="NSCellFlags">67239424</int>
-                      <int key="NSCellFlags2">272629760</int>
-                      <string key="NSContents">Default Server Port</string>
-                      <reference key="NSSupport" ref="96267115"/>
-                      <reference key="NSControlView" ref="730705500"/>
-                      <reference key="NSBackgroundColor" ref="535468639"/>
-                      <reference key="NSTextColor" ref="499525791"/>
-                    </object>
-                  </object>
                   <object class="NSTextField" id="652321588">
                     <reference key="NSNextResponder" ref="71852276"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{13, 52}, {204, 17}}</string>
+                    <string key="NSFrame">{{13, 43}, {204, 17}}</string>
                     <reference key="NSSuperview" ref="71852276"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSTextFieldCell" key="NSCell" id="17261147">
@@ -3323,7 +3193,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSTextField" id="1031566139">
                     <reference key="NSNextResponder" ref="71852276"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{222, 50}, {290, 22}}</string>
+                    <string key="NSFrame">{{222, 41}, {290, 22}}</string>
                     <reference key="NSSuperview" ref="71852276"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSTextFieldCell" key="NSCell" id="541454770">
@@ -3340,7 +3210,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSTextField" id="506517403">
                     <reference key="NSNextResponder" ref="71852276"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{14, 24}, {204, 17}}</string>
+                    <string key="NSFrame">{{14, 15}, {204, 17}}</string>
                     <reference key="NSSuperview" ref="71852276"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSTextFieldCell" key="NSCell" id="368625871">
@@ -3356,7 +3226,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSTextField" id="823832045">
                     <reference key="NSNextResponder" ref="71852276"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{222, 22}, {290, 22}}</string>
+                    <string key="NSFrame">{{222, 13}, {290, 22}}</string>
                     <reference key="NSSuperview" ref="71852276"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSTextFieldCell" key="NSCell" id="716901297">
@@ -3371,11 +3241,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                     </object>
                   </object>
                 </object>
-                <string key="NSFrame">{{2, 2}, {532, 114}}</string>
+                <string key="NSFrame">{{2, 2}, {532, 73}}</string>
                 <reference key="NSSuperview" ref="247116589"/>
               </object>
             </object>
-            <string key="NSFrame">{{17, 251}, {536, 131}}</string>
+            <string key="NSFrame">{{17, 251}, {536, 90}}</string>
             <reference key="NSSuperview" ref="127370005"/>
             <string key="NSOffsets">{0, 0}</string>
             <object class="NSTextFieldCell" key="NSTitleCell">
@@ -3450,7 +3320,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                             <string>.</string>
                             <integer value="1000"/>
                             <string>,</string>
-                            <reference ref="356824444"/>
+                            <object class="NSLocale">
+                              <string key="NS.identifier"/>
+                            </object>
                             <object class="NSDecimalNumberPlaceholder" id="752074440">
                               <int key="NS.exponent">0</int>
                               <int key="NS.length">1</int>
@@ -3891,7 +3763,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <bool key="NSTransparent">NO</bool>
           </object>
         </object>
-        <string key="NSFrameSize">{570, 402}</string>
+        <string key="NSFrameSize">{570, 361}</string>
         <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
         <string key="NSExtension">NSResponder</string>
@@ -5009,14 +4881,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">2522</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">inputSettingChanged:</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="955218271"/>
-          </object>
-          <int key="connectionID">2608</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">inputSettingChanged:</string>
@@ -5153,22 +5017,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">2633</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_input_serverport_fld</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="955218271"/>
-          </object>
-          <int key="connectionID">2634</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_input_serverport_txt</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="730705500"/>
-          </object>
-          <int key="connectionID">2635</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_osd_encoding_pop</string>
@@ -5353,14 +5201,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">2662</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">takeIntValueFrom:</string>
-            <reference key="source" ref="955218271"/>
-            <reference key="destination" ref="348183576"/>
-          </object>
-          <int key="connectionID">2666</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">takeIntValueFrom:</string>
@@ -5569,14 +5409,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">3418</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">nextKeyView</string>
-            <reference key="source" ref="955218271"/>
-            <reference key="destination" ref="1031566139"/>
-          </object>
-          <int key="connectionID">3420</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">nextKeyView</string>
@@ -5593,14 +5425,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">3422</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">nextKeyView</string>
-            <reference key="source" ref="962653572"/>
-            <reference key="destination" ref="955218271"/>
-          </object>
-          <int key="connectionID">3423</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">nextKeyView</string>
@@ -6310,9 +6134,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <reference key="object" ref="247116589"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="955218271"/>
-              <reference ref="348183576"/>
-              <reference ref="730705500"/>
               <reference ref="652321588"/>
               <reference ref="1031566139"/>
               <reference ref="506517403"/>
@@ -7673,57 +7494,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <reference key="object" ref="12940531"/>
             <reference key="parent" ref="599295502"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">2565</int>
-            <reference key="object" ref="955218271"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="888071880"/>
-            </object>
-            <reference key="parent" ref="247116589"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3506</int>
-            <reference key="object" ref="888071880"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="313995595"/>
-            </object>
-            <reference key="parent" ref="955218271"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">2566</int>
-            <reference key="object" ref="313995595"/>
-            <reference key="parent" ref="888071880"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">2567</int>
-            <reference key="object" ref="348183576"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="484538590"/>
-            </object>
-            <reference key="parent" ref="247116589"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3507</int>
-            <reference key="object" ref="484538590"/>
-            <reference key="parent" ref="348183576"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">2569</int>
-            <reference key="object" ref="730705500"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="1347549"/>
-            </object>
-            <reference key="parent" ref="247116589"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3508</int>
-            <reference key="object" ref="1347549"/>
-            <reference key="parent" ref="730705500"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">2570</int>
             <reference key="object" ref="652321588"/>
@@ -8505,14 +8275,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>2562.ImportedFromIB2</string>
           <string>2563.IBPluginDependency</string>
           <string>2563.ImportedFromIB2</string>
-          <string>2565.IBPluginDependency</string>
-          <string>2565.ImportedFromIB2</string>
-          <string>2566.IBPluginDependency</string>
-          <string>2566.ImportedFromIB2</string>
-          <string>2567.IBPluginDependency</string>
-          <string>2567.ImportedFromIB2</string>
-          <string>2569.IBPluginDependency</string>
-          <string>2569.ImportedFromIB2</string>
           <string>2570.IBPluginDependency</string>
           <string>2570.ImportedFromIB2</string>
           <string>2571.IBPluginDependency</string>
@@ -8672,9 +8434,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>3503.IBPluginDependency</string>
           <string>3504.IBPluginDependency</string>
           <string>3505.IBPluginDependency</string>
-          <string>3506.IBPluginDependency</string>
-          <string>3507.IBPluginDependency</string>
-          <string>3508.IBPluginDependency</string>
           <string>3509.IBPluginDependency</string>
           <string>3510.IBPluginDependency</string>
           <string>3511.IBPluginDependency</string>
@@ -9063,15 +8822,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{343, 286}, {570, 402}}</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <boolean value="YES"/>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <boolean value="YES"/>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <boolean value="YES"/>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <boolean value="YES"/>
+          <string>{{343, 327}, {570, 361}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -9261,9 +9012,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
@@ -10627,8 +10375,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>o_input_postproc_fld</string>
               <string>o_input_postproc_txt</string>
               <string>o_input_rtsp_ckb</string>
-              <string>o_input_serverport_fld</string>
-              <string>o_input_serverport_txt</string>
               <string>o_input_skipLoop_pop</string>
               <string>o_input_skipLoop_txt</string>
               <string>o_input_view</string>
@@ -10813,8 +10559,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>id</string>
               <string>id</string>
               <string>id</string>
-              <string>id</string>
-              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -10868,8 +10612,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>o_input_postproc_fld</string>
               <string>o_input_postproc_txt</string>
               <string>o_input_rtsp_ckb</string>
-              <string>o_input_serverport_fld</string>
-              <string>o_input_serverport_txt</string>
               <string>o_input_skipLoop_pop</string>
               <string>o_input_skipLoop_txt</string>
               <string>o_input_view</string>
@@ -11128,14 +10870,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                 <string key="name">o_input_rtsp_ckb</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">o_input_serverport_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">o_input_serverport_txt</string>
-                <string key="candidateClassName">id</string>
-              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_input_skipLoop_pop</string>
                 <string key="candidateClassName">id</string>

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 216032180ada974b3aaf189c134d3b0b12a2efdc..12893592e5afae321cbb945a649e75c9c56e67ff 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 5d8584401f91dcd74ebd2d791d704340ce88b810..2bc7a47c8d83b2843f05be5898b807df80dbe53e 100644 (file)
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -81,8 +81,6 @@
     IBOutlet id o_input_rtsp_ckb;
     IBOutlet id o_input_skipLoop_txt;
     IBOutlet id o_input_skipLoop_pop;
-    IBOutlet id o_input_serverport_fld;
-    IBOutlet id o_input_serverport_txt;
     IBOutlet id o_input_view;
 
     IBOutlet id o_intf_style_txt;

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index e681991719922ac4be3767e1b6a5726ca327627e..8c75896d9bb6bd86ce10210fa9c55902f94d1ee6 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -219,7 +219,6 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
     [o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")];
     [o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")];
     [o_input_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")];
-    [o_input_serverport_txt setStringValue: _NS("Default Server Port")];
 
     /* interface */
     [o_intf_style_txt setStringValue: _NS("Interface style")];
@@ -516,8 +515,6 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
     /***************************
      * input & codecs settings *
      ***************************/
-    [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port")];
-    [o_input_serverport_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "server-port")]];
     [self setupField: o_input_httpproxy_fld forOption:"http-proxy"];
     [self setupField: o_input_httpproxypwd_sfld forOption:"http-proxy-pwd"];
     [o_input_postproc_fld setIntValue: config_GetInt( p_intf, "postproc-q")];
@@ -858,7 +855,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
      ***************************/
     if( b_inputSettingChanged )
     {
-        config_PutInt( p_intf, "server-port", [o_input_serverport_fld intValue] );
         config_PutPsz( p_intf, "http-proxy", [[o_input_httpproxy_fld stringValue] UTF8String] );
         config_PutPsz( p_intf, "http-proxy-pwd", [[o_input_httpproxypwd_sfld stringValue] UTF8String] );
         config_PutInt( p_intf, "postproc-q", [o_input_postproc_fld intValue] );