Delete more SLP stuff

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib
index c7f251fcf87de691a21f3b3b3f18e2004364f8f6..df30533a8de96e947c597219d77b411be2ecb4e9 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib
@@ -363,7 +363,6 @@
                 "o_sap_chkbox" = id; 
                 "o_sdp_url" = id; 
                 "o_sdp_url_lbl" = id; 
-                "o_slp_chkbox" = id; 
                 "o_stream_address" = id; 
                 "o_stream_address_lbl" = id; 
                 "o_stream_port" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
index f0f5281b093e7b5e7cd5495a10521816f3ca013c..9b30aaff30dc0baf128eda4edf93594a4f945a22 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
@@ -14,6 +14,6 @@
                <integer>2199</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>8C46</string>
+       <string>8F46</string>
 </dict>
 </plist>

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib
index cee12ac0a6a3e0b7fd81ed3bc142717dad66c45e..f38616d9f85c2b736e411e3f0dd88d5bab296a41 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/output.h b/modules/gui/macosx/output.h
index a3008c113496240a3aaccc18ba9e155df723b55a..b9c32c0fa9b7bcd816f76ee7537e2ce0992fc82c 100644 (file)
--- a/modules/gui/macosx/output.h
+++ b/modules/gui/macosx/output.h
@@ -70,7 +70,6 @@
 
     IBOutlet id o_misc_lbl;
     IBOutlet id o_sap_chkbox;
-    IBOutlet id o_slp_chkbox;
     IBOutlet id o_channel_name;
     IBOutlet id o_channel_name_lbl;
 

diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index e16c99453cb24f9b1a883420ee72768548c9c9a0..bba0086137cf74a1b646dda4edb9e81312ad31e7 100644 (file)
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -179,7 +179,6 @@
 
     [o_misc_lbl setTitle: _NS("Stream Announcing")];
     [o_sap_chkbox setTitle: _NS("SAP announce")];
-    [o_slp_chkbox setTitle: _NS("SLP announce")];
     [o_rtsp_chkbox setTitle: _NS("RTSP announce")];
     [o_http_chkbox setTitle:_NS("HTTP announce")];
     [o_file_chkbox setTitle:_NS("Export SDP as file")];
@@ -221,7 +220,6 @@
     o_mode = [[o_method selectedCell] title];
 
     [o_sap_chkbox setEnabled: NO];
-    [o_slp_chkbox setEnabled: NO];
     [o_http_chkbox setEnabled: NO];
     [o_rtsp_chkbox setEnabled: NO];
     [o_file_chkbox setEnabled: NO];
@@ -306,7 +304,6 @@
             [[o_mux_selector itemAtIndex: 7] setEnabled: NO];
             [[o_mux_selector itemAtIndex: 8] setEnabled: YES];
             [o_sap_chkbox setEnabled: YES];
-            [o_slp_chkbox setEnabled: YES];
             [o_channel_name setEnabled: YES];
         }
         else if( [o_mode isEqualToString: @"RTP"] )
@@ -325,7 +322,6 @@
             [[o_mux_selector itemAtIndex: 8] setEnabled: YES];
             [o_mux_selector selectItemAtIndex: 8];
             [o_sap_chkbox setEnabled: YES];
-            [o_slp_chkbox setEnabled: NO];
             [o_rtsp_chkbox setEnabled: YES];
             [o_http_chkbox setEnabled: YES];
             [o_file_chkbox setEnabled: YES];
@@ -414,14 +410,6 @@
                 else
                     [o_announce appendFormat:@",sap"];
             }
-            if( [o_slp_chkbox state] == NSOnState )
-            {
-               if ( ![[o_channel_name stringValue] isEqualToString: @""] )
-                    [o_announce appendFormat:@
-                            "slp,name=%@",[o_channel_name stringValue]];
-                else
-                    [o_announce appendString: @",slp"];
-            }
         }
         if ( ![o_mode isEqualToString: @"RTP"] )
         {
@@ -634,8 +622,8 @@
 {
     NSString *o_mode;
     o_mode = [[o_stream_type selectedCell] title];
-    [o_channel_name setEnabled: [o_sap_chkbox state] || [o_slp_chkbox state]
-                || [o_mode isEqualToString: @"RTP"]];
+    [o_channel_name setEnabled: [o_sap_chkbox state] ||
+                [o_mode isEqualToString: @"RTP"]];
 
     if ([o_mode isEqualToString: @"RTP"])
     {