Skip to content

V
vlc-1.1
Commit 4f6cc614 authored by Benjamin Pracht's avatar Benjamin Pracht
Browse files
Options

* all : 

  - Get rid of the old TS over RTP stream output method in OSX interface
  - ab= and vb= parameters are now (hopefully) always updated
parent a69c9d8f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 28 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 4f6cc614
......@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>539 187 505 517 0 0 1024 746 </string>
<string>514 222 505 517 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>1617</key>
......@@ -14,17 +14,16 @@
<string>54 452 185 199 0 0 1024 746 </string>
</dict>
<key>IBFramework Version</key>
<string>362.0</string>
<string>364.0</string>
<key>IBLockedObjects</key>
<array>
<integer>1789</integer>
</array>
<key>IBOpenObjects</key>
<array>
<integer>1411</integer>
<integer>1617</integer>
<integer>29</integer>
<integer>21</integer>
<integer>1617</integer>
</array>
<key>IBSystem Version</key>
<string>7H63</string>
......
modules/gui/macosx/output.m
View file @ 4f6cc614
......@@ -144,7 +144,6 @@
[[o_stream_type itemAtIndex: 1] setTitle: @"MMSH"];
[[o_stream_type itemAtIndex: 2] setTitle: @"UDP"];
[[o_stream_type itemAtIndex: 3] setTitle: @"RTP"];
[[o_stream_type itemAtIndex: 4] setTitle: @"RTP (New)"];
[o_stream_type_lbl setStringValue: _NS("Type")];
[o_mux_lbl setStringValue: _NS("Encapsulation Method")];
......@@ -299,20 +298,6 @@
[o_channel_name setEnabled: YES];
}
else if( [o_mode isEqualToString: @"RTP"] )
{
[o_stream_address setEnabled: YES];
[o_stream_ttl setEnabled: YES];
[o_stream_ttl_stp setEnabled: YES];
[[o_mux_selector itemAtIndex: 1] setEnabled: NO];
[[o_mux_selector itemAtIndex: 2] setEnabled: NO];
[[o_mux_selector itemAtIndex: 3] setEnabled: NO];
[[o_mux_selector itemAtIndex: 4] setEnabled: NO];
[[o_mux_selector itemAtIndex: 5] setEnabled: NO];
[[o_mux_selector itemAtIndex: 6] setEnabled: NO];
[[o_mux_selector itemAtIndex: 7] setEnabled: NO];
[[o_mux_selector itemAtIndex: 8] setEnabled: YES];
}
else if( [o_mode isEqualToString: @"RTP (New)"] )
{
[o_stream_address setEnabled: YES];
[o_stream_ttl setEnabled: YES];
......@@ -335,11 +320,11 @@
}
}
if( ![[o_mux_selector selectedItem] isEnabled] && ![o_mode isEqualToString: @"RTP (New)"] )
if( ![[o_mux_selector selectedItem] isEnabled] && ![o_mode isEqualToString: @"RTP"] )
{
[o_mux_selector selectItemAtIndex: 0];
}
else if (![[o_mux_selector selectedItem] isEnabled] && [o_mode isEqualToString: @"RTP (New)"] )
else if (![[o_mux_selector selectedItem] isEnabled] && [o_mode isEqualToString: @"RTP"] )
{
[o_mux_selector selectItemAtIndex: 8];
}
......@@ -419,10 +404,7 @@
o_announce = [o_announce stringByAppendingString: @",slp"];
}
}
else if ( [o_mode isEqualToString: @"RTP"] )
o_mode = @"rtp";
if ( ![o_mode isEqualToString: @"RTP (New)"] )
if ( ![o_mode isEqualToString: @"RTP"] )
{
[o_mrl_string appendFormat:
......@@ -573,7 +555,6 @@
}
if ( [o_transcode_audio_chkbox state] == NSOnState )
{
fprintf(stderr,"%s\n",[[o_transcode_audio_bitrate stringValue] cString]);
[o_transcode_string appendFormat: @"acodec=\"%@\",ab=\"%@\"",
[o_transcode_audio_selector titleOfSelectedItem],
[o_transcode_audio_bitrate stringValue]];
......@@ -593,9 +574,9 @@ fprintf(stderr,"%s\n",[[o_transcode_audio_bitrate stringValue] cString]);
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 (New)"]];
|| [o_mode isEqualToString: @"RTP"]];
if ([o_mode isEqualToString: @"RTP (New)"])
if ([o_mode isEqualToString: @"RTP"])
{
if ([[sender title] isEqualToString: _NS("SAP announce")])
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment