* Copyright (C) 2005-2013 VLC authors and VideoLAN
* $Id$
*
- * Authors: Felix Paul Kühne <fkuehne at videolan dot org>,
+ * Authors: Felix Paul Kühne <fkuehne at videolan dot org>,
* Brendon Justin <brendonjustin at gmail.com>
*
* This program is free software; you can redistribute it and/or modify
/*****************************************************************************
* Note: this code is partially based upon ../wxwidgets/wizard.cpp and
- * ../wxwidgets/streamdata.h; both written by Clément Stenac.
+ * ../wxwidgets/streamdata.h; both written by ClÃ\83©ment Stenac.
*****************************************************************************/
/* add audio-bitrates for transcoding */
NSArray * audioBitratesArray;
- audioBitratesArray = [NSArray arrayWithObjects: @"512", @"256", @"192",
- @"128", @"64", @"32", @"16", nil ];
+ audioBitratesArray = [NSArray arrayWithObjects:@"512", @"256", @"192", @"128", @"64", @"32", @"16", nil];
[o_t4_pop_audioBitrate removeAllItems];
[o_t4_pop_audioBitrate addItemsWithTitles: audioBitratesArray];
[o_t4_pop_audioBitrate selectItemWithTitle: @"192"];
/* add video-bitrates for transcoding */
NSArray * videoBitratesArray;
- videoBitratesArray = [NSArray arrayWithObjects: @"3072", @"2048", @"1024",
- @"768", @"512", @"256", @"192", @"128", @"64", @"32", @"16", nil ];
+ videoBitratesArray = [NSArray arrayWithObjects:@"3072", @"2048", @"1024", @"768", @"512", @"256", @"192", @"128", @"64", @"32", @"16", nil];
[o_t4_pop_videoBitrate removeAllItems];
[o_t4_pop_videoBitrate addItemsWithTitles: videoBitratesArray];
[o_t4_pop_videoBitrate selectItemWithTitle: @"1024"];
NSArray * o_mjpg;
NSArray * o_theo;
NSArray * o_dummyVid;
- o_mp1v = [NSArray arrayWithObjects: @"MPEG-1 Video", @"mp1v",
- _NS("MPEG-1 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG "
- "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_OGG", @"MUX_RAW",
- @"NO", @"NO", @"NO", @"NO", nil];
- o_mp2v = [NSArray arrayWithObjects: @"MPEG-2 Video", @"mp2v",
- _NS("MPEG-2 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG "
- "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_OGG", @"MUX_RAW",
- @"NO", @"NO", @"NO", @"NO", nil];
- o_mp4v = [NSArray arrayWithObjects: @"MPEG-4 Video", @"mp4v",
- _NS("MPEG-4 Video codec (useable with MPEG PS, MPEG TS, MPEG1, ASF, "
- "MP4, OGG and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF",
- @"MUX_MP4", @"MUX_OGG", @"MUX_RAW", @"NO", @"NO", nil];
- o_div1 = [NSArray arrayWithObjects: @"DIVX 1", @"DIV1",
- _NS("DivX first version (useable with MPEG TS, MPEG1, ASF and OGG)"),
- @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO",
- @"NO", @"NO", nil];
- o_div2 = [NSArray arrayWithObjects: @"DIVX 2", @"DIV2",
- _NS("DivX second version (useable with MPEG TS, MPEG1, ASF and OGG)"),
- @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO",
- @"NO", @"NO", nil];
- o_div3 = [NSArray arrayWithObjects: @"DIVX 3", @"DIV3",
- _NS("DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"),
- @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO",
- @"NO", @"NO", nil];
- o_h263 = [NSArray arrayWithObjects: @"H.263", @"h263",
- _NS("H263 is a video codec optimized for videoconference "
- "(low rates, useable with MPEG TS)"), @"MUX_TS", @"NO", @"NO", @"NO",
- @"NO", @"NO", @"NO", @"NO", @"NO", nil];
- o_h264 = [NSArray arrayWithObjects: @"H.264", @"h264",
- _NS("H264 is a new video codec (useable with MPEG TS and MP4)"),
- @"MUX_TS", @"MUX_MP4", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO",
- @"NO", nil];
- o_wmv1 = [NSArray arrayWithObjects: @"WMV 1", @"WMV1",
- _NS("WMV (Windows Media Video) 1 (useable with MPEG TS, MPEG1, ASF and "
- "OGG)"), @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO",
- @"NO", @"NO", @"NO", nil];
- o_wmv2 = [NSArray arrayWithObjects: @"WMV 2", @"WMV2",
- _NS("WMV (Windows Media Video) 2 (useable with MPEG TS, MPEG1, ASF and "
- "OGG)"), @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO",
- @"NO", @"NO", @"NO", nil];
- o_mjpg = [NSArray arrayWithObjects: @"MJPEG", @"MJPG",
- _NS("MJPEG consists of a series of JPEG pictures (useable with MPEG TS,"
- " MPEG1, ASF and OGG)"), @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG",
- @"NO", @"NO", @"NO", @"NO", @"NO", nil];
- o_theo = [NSArray arrayWithObjects: @"Theora", @"theo",
- _NS("Theora is a free general-purpose codec (useable with MPEG TS "
- "and OGG)"), @"MUX_TS", @"MUX_OGG", @"NO", @"NO", @"NO", @"NO", @"NO",
- @"NO", @"NO", nil];
- o_dummyVid = [NSArray arrayWithObjects: @"Dummy", @"dummy",
- _NS("Dummy codec (do not transcode, useable with all encapsulation "
- "formats)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_MP4",
- @"MUX_OGG", @"MUX_WAV", @"MUX_RAW", @"MUX_MOV", nil];
+ o_mp1v = [NSArray arrayWithObjects:@"MPEG-1 Video", @"mp1v",
+ _NS("MPEG-1 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG "
+ "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_OGG", @"MUX_RAW",
+ @"NO", @"NO", @"NO", @"NO", nil];
+ o_mp2v = [NSArray arrayWithObjects:@"MPEG-2 Video", @"mp2v",
+ _NS("MPEG-2 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG "
+ "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_OGG", @"MUX_RAW",
+ @"NO", @"NO", @"NO", @"NO", nil];
+ o_mp4v = [NSArray arrayWithObjects:@"MPEG-4 Video", @"mp4v",
+ _NS("MPEG-4 Video codec (useable with MPEG PS, MPEG TS, MPEG1, ASF, "
+ "MP4, OGG and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF",
+ @"MUX_MP4", @"MUX_OGG", @"MUX_RAW", @"NO", @"NO", nil];
+ o_div1 = [NSArray arrayWithObjects:@"DIVX 1", @"DIV1",
+ _NS("DivX first version (useable with MPEG TS, MPEG1, ASF and OGG)"),
+ @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO",
+ @"NO", @"NO", nil];
+ o_div2 = [NSArray arrayWithObjects:@"DIVX 2", @"DIV2",
+ _NS("DivX second version (useable with MPEG TS, MPEG1, ASF and OGG)"),
+ @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO",
+ @"NO", @"NO", nil];
+ o_div3 = [NSArray arrayWithObjects:@"DIVX 3", @"DIV3",
+ _NS("DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"),
+ @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO",
+ @"NO", @"NO", nil];
+ o_h263 = [NSArray arrayWithObjects:@"H.263", @"h263",
+ _NS("H263 is a video codec optimized for videoconference "
+ "(low rates, useable with MPEG TS)"), @"MUX_TS", @"NO", @"NO", @"NO",
+ @"NO", @"NO", @"NO", @"NO", @"NO", nil];
+ o_h264 = [NSArray arrayWithObjects:@"H.264", @"h264",
+ _NS("H264 is a new video codec (useable with MPEG TS and MP4)"),
+ @"MUX_TS", @"MUX_MP4", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO",
+ @"NO", nil];
+ o_wmv1 = [NSArray arrayWithObjects:@"WMV 1", @"WMV1",
+ _NS("WMV (Windows Media Video) 1 (useable with MPEG TS, MPEG1, ASF and "
+ "OGG)"), @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO",
+ @"NO", @"NO", @"NO", nil];
+ o_wmv2 = [NSArray arrayWithObjects:@"WMV 2", @"WMV2",
+ _NS("WMV (Windows Media Video) 2 (useable with MPEG TS, MPEG1, ASF and "
+ "OGG)"), @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO",
+ @"NO", @"NO", @"NO", nil];
+ o_mjpg = [NSArray arrayWithObjects:@"MJPEG", @"MJPG",
+ _NS("MJPEG consists of a series of JPEG pictures (useable with MPEG TS,"
+ " MPEG1, ASF and OGG)"), @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG",
+ @"NO", @"NO", @"NO", @"NO", @"NO", nil];
+ o_theo = [NSArray arrayWithObjects:@"Theora", @"theo",
+ _NS("Theora is a free general-purpose codec (useable with MPEG TS "
+ "and OGG)"), @"MUX_TS", @"MUX_OGG", @"NO", @"NO", @"NO", @"NO", @"NO",
+ @"NO", @"NO", nil];
+ o_dummyVid = [NSArray arrayWithObjects:@"Dummy", @"dummy",
+ _NS("Dummy codec (do not transcode, useable with all encapsulation "
+ "formats)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_MP4",
+ @"MUX_OGG", @"MUX_WAV", @"MUX_RAW", @"MUX_MOV", nil];
o_videoCodecs = [[NSArray alloc] initWithObjects: o_mp1v, o_mp2v, o_mp4v,
o_div1, o_div2, o_div3, o_h263, o_h264, o_wmv1, o_wmv2, o_mjpg, o_theo,
o_dummyVid, nil];
NSArray * o_s16l;
NSArray * o_fl32;
NSArray * o_dummyAud;
- o_mpga = [NSArray arrayWithObjects: @"MPEG Audio", @"mpga",
- _NS("The standard MPEG audio (1/2) format (useable with MPEG PS, MPEG TS, "
- "MPEG1, ASF, OGG and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG",
- @"MUX_ASF", @"MUX_OGG", @"MUX_RAW", @"-1", @"-1", @"-1", nil];
- o_mp3 = [NSArray arrayWithObjects: @"MP3", @"mp3",
- _NS("MPEG Audio Layer 3 (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG "
- "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG",
- @"MUX_RAW", @"-1", @"-1", @"-1", nil];
- o_mp4a = [NSArray arrayWithObjects: @"MPEG 4 Audio", @"mp4a",
- _NS("Audio format for MPEG4 (useable with MPEG TS and MPEG4)"), @"MUX_TS",
- @"MUX_MP4", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
- o_a52 = [NSArray arrayWithObjects: @"A/52", @"a52",
- _NS("DVD audio format (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG "
- "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG",
- @"MUX_RAW", @"-1", @"-1", @"-1", nil];
- o_vorb = [NSArray arrayWithObjects: @"Vorbis", @"vorb",
- _NS("Vorbis is a free audio codec (useable with OGG)"), @"MUX_OGG",
- @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
- o_flac = [NSArray arrayWithObjects: @"FLAC", @"flac",
- _NS("FLAC is a lossless audio codec (useable with OGG and RAW)"),
- @"MUX_OGG", @"MUX_RAW", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1",
- @"-1", nil];
- o_spx = [NSArray arrayWithObjects: @"Speex", @"spx",
- _NS("A free audio codec dedicated to compression of voice (useable "
- "with OGG)"), @"MUX_OGG", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1",
- @"-1", @"-1", nil];
- o_s16l = [NSArray arrayWithObjects: @"Uncompressed, integer", @"s16l",
- _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV",
- @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
- o_fl32 = [NSArray arrayWithObjects: @"Uncompressed, floating point", @"fl32",
- _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV",
- @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
- o_dummyAud = [NSArray arrayWithObjects: @"Dummy", @"dummy",
- _NS("Dummy codec (do not transcode, useable with all encapsulation "
- "formats)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_MP4",
- @"MUX_OGG", @"MUX_RAW", @"MUX_MOV", @"MUX_WAV", nil];
+ o_mpga = [NSArray arrayWithObjects:@"MPEG Audio", @"mpga",
+ _NS("The standard MPEG audio (1/2) format (useable with MPEG PS, MPEG TS, "
+ "MPEG1, ASF, OGG and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG",
+ @"MUX_ASF", @"MUX_OGG", @"MUX_RAW", @"-1", @"-1", @"-1", nil];
+ o_mp3 = [NSArray arrayWithObjects:@"MP3", @"mp3",
+ _NS("MPEG Audio Layer 3 (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG "
+ "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG",
+ @"MUX_RAW", @"-1", @"-1", @"-1", nil];
+ o_mp4a = [NSArray arrayWithObjects:@"MPEG 4 Audio", @"mp4a",
+ _NS("Audio format for MPEG4 (useable with MPEG TS and MPEG4)"), @"MUX_TS",
+ @"MUX_MP4", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
+ o_a52 = [NSArray arrayWithObjects:@"A/52", @"a52",
+ _NS("DVD audio format (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG "
+ "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG",
+ @"MUX_RAW", @"-1", @"-1", @"-1", nil];
+ o_vorb = [NSArray arrayWithObjects:@"Vorbis", @"vorb",
+ _NS("Vorbis is a free audio codec (useable with OGG)"), @"MUX_OGG",
+ @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
+ o_flac = [NSArray arrayWithObjects:@"FLAC", @"flac",
+ _NS("FLAC is a lossless audio codec (useable with OGG and RAW)"),
+ @"MUX_OGG", @"MUX_RAW", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
+ o_spx = [NSArray arrayWithObjects:@"Speex", @"spx",
+ _NS("A free audio codec dedicated to compression of voice (useable "
+ "with OGG)"), @"MUX_OGG", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1",
+ @"-1", @"-1", nil];
+ o_s16l = [NSArray arrayWithObjects:@"Uncompressed, integer", @"s16l",
+ _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV",
+ @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
+ o_fl32 = [NSArray arrayWithObjects:@"Uncompressed, floating point", @"fl32",
+ _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV",
+ @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
+ o_dummyAud = [NSArray arrayWithObjects:@"Dummy", @"dummy",
+ _NS("Dummy codec (do not transcode, useable with all encapsulation "
+ "formats)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_MP4",
+ @"MUX_OGG", @"MUX_RAW", @"MUX_MOV", @"MUX_WAV", nil];
o_audioCodecs = [[NSArray alloc] initWithObjects: o_mpga, o_mp3, o_mp4a,
o_a52, o_vorb, o_flac, o_spx, o_s16l, o_fl32, o_dummyAud, nil];
NSArray * o_mov;
NSArray * o_wav;
NSArray * o_asfh;
- o_ps = [NSArray arrayWithObjects: @"ps", @"MPEG PS",
- _NS("MPEG Program Stream"), @"mpg", nil];
- o_ts = [NSArray arrayWithObjects: @"ts", @"MPEG TS",
- _NS("MPEG Transport Stream"), nil];
- o_mpeg = [NSArray arrayWithObjects: @"ps", @"MPEG 1",
- _NS("MPEG 1 Format"), @"mpg", nil];
- o_ogg = [NSArray arrayWithObjects: @"ogg", @"OGG", @"OGG", nil];
- o_raw = [NSArray arrayWithObjects: @"raw", @"RAW", @"RAW", nil];
- o_asf = [NSArray arrayWithObjects: @"asf", @"ASF", @"ASF", nil];
- o_mp4 = [NSArray arrayWithObjects: @"mp4", @"MP4", @"MPEG4", nil];
- o_mov = [NSArray arrayWithObjects: @"mov", @"MOV", @"MOV", nil];
- o_wav = [NSArray arrayWithObjects: @"wav", @"WAV", @"WAV", nil];
- o_asfh = [NSArray arrayWithObjects: @"asfh", @"ASFH", @"ASFH", nil];
+ o_ps = [NSArray arrayWithObjects:@"ps", @"MPEG PS", _NS("MPEG Program Stream"), @"mpg", nil];
+ o_ts = [NSArray arrayWithObjects:@"ts", @"MPEG TS", _NS("MPEG Transport Stream"), nil];
+ o_mpeg = [NSArray arrayWithObjects:@"ps", @"MPEG 1", _NS("MPEG 1 Format"), @"mpg", nil];
+ o_ogg = [NSArray arrayWithObjects:@"ogg", @"OGG", @"OGG", nil];
+ o_raw = [NSArray arrayWithObjects:@"raw", @"RAW", @"RAW", nil];
+ o_asf = [NSArray arrayWithObjects:@"asf", @"ASF", @"ASF", nil];
+ o_mp4 = [NSArray arrayWithObjects:@"mp4", @"MP4", @"MPEG4", nil];
+ o_mov = [NSArray arrayWithObjects:@"mov", @"MOV", @"MOV", nil];
+ o_wav = [NSArray arrayWithObjects:@"wav", @"WAV", @"WAV", nil];
+ o_asfh = [NSArray arrayWithObjects:@"asfh", @"ASFH", @"ASFH", nil];
o_encapFormats = [[NSArray alloc] initWithObjects: o_ps, o_ts, o_mpeg,
o_ogg, o_raw, o_asf, o_mp4, o_mov, o_wav, o_asfh, nil];
NSArray * o_udp_multi;
NSArray * o_rtp_uni;
NSArray * o_rtp_multi;
- o_http = [NSArray arrayWithObjects: @"http", @"HTTP", _NS("Enter the local "
+ o_http = [NSArray arrayWithObjects:@"http", @"HTTP", _NS("Enter the local "
"addresses you want to listen requests on. Do not enter anything if "
"you want to listen on all the network interfaces. This is generally "
"the best thing to do. Other computers can then access the stream at "
"http://yourip:8080 by default.") , _NS("Use this to stream to several "
"computers. This method is not the most efficient, as the server needs "\
"to send the stream several times, but generally the most compatible"), nil];
- o_mms = [NSArray arrayWithObjects: @"mmsh", @"MMS", _NS("Enter the local "
+ o_mms = [NSArray arrayWithObjects:@"mmsh", @"MMS", _NS("Enter the local "
"addresses you want to listen requests on. Do not enter anything if "
"you want to listen on all the network interfaces. This is generally "
"the best thing to do. Other computers can then access the stream at "
"mms://yourip:8080 by default."), _NS("Use this to stream to several "
"computers using the Microsoft MMS protocol. This protocol is used as "
- "transport method by many Microsoft's softwares. Note that only a "
+ "transport method by many Microsoft's software. Note that only a "
"small part of the MMS protocol is supported (MMS encapsulated in "
"HTTP)."), nil];
- o_udp_uni = [NSArray arrayWithObjects: @"udp", @"UDP-Unicast", _NS("Enter "
+ o_udp_uni = [NSArray arrayWithObjects:@"udp", @"UDP-Unicast", _NS("Enter "
"the address of the computer to stream to."), _NS("Use this to stream "
"to a single computer."), nil];
- o_udp_multi = [NSArray arrayWithObjects: @"udp", @"UDP-Multicast", _NS("Enter "
+ o_udp_multi = [NSArray arrayWithObjects:@"udp", @"UDP-Multicast", _NS("Enter "
"the multicast address to stream to in this field. This must be an IP "
"address between 224.0.0.0 and 239.255.255.255. For a private use, "
"enter an address beginning with 239.255."), _NS("Use this to stream "
"to a dynamic group of computers on a multicast-enabled network. This "
"is the most efficient method to stream to several computers, but it "
"won't work over the Internet."), nil];
- o_rtp_uni = [NSArray arrayWithObjects: @"rtp", @"RTP-Unicast", _NS("Enter the "
+ o_rtp_uni = [NSArray arrayWithObjects:@"rtp", @"RTP-Unicast", _NS("Enter the "
"address of the computer to stream to.") , _NS("Use this to stream "
"to a single computer. RTP headers will be added to the stream"), nil];
- o_rtp_multi = [NSArray arrayWithObjects: @"rtp", @"RTP-Multicast", _NS("Enter "
+ o_rtp_multi = [NSArray arrayWithObjects:@"rtp", @"RTP-Multicast", _NS("Enter "
"the multicast address to stream to in this field. This must be an IP "
"address between 224.0.0.0 and 239.255.255.255. For a private use, "
"enter an address beginning with 239.255."), _NS("Use this to stream "
"additional streaming parameters can be set.")];
[o_t6_txt_ttl setStringValue: _NS("Time-To-Live (TTL)")];
[o_t6_btn_mrInfo_ttl setTitle: _NS("More Info")];
- [o_t6_ckb_sap setTitle: _NS("SAP Announce")];
+ [o_t6_ckb_sap setTitle: _NS("SAP Announcement")];
[o_t6_btn_mrInfo_sap setTitle: _NS("More Info")];
[o_t6_ckb_local setTitle: _NS("Local playback")];
[o_t6_btn_mrInfo_local setTitle: _NS("More Info")];
stringByAppendingString: @":"]];
[o_t8_txt_partExtract setStringValue: [_NS("Partial Extract")
stringByAppendingString: @":"]];
- [o_t8_txt_sap setStringValue: [_NS("SAP Announce")
+ [o_t8_txt_sap setStringValue: [_NS("SAP Announcement")
stringByAppendingString: @":"]];
[o_t8_txt_saveFileTo setStringValue: [_NS("Save file to")
stringByAppendingString: @":"]];
}
else
{
- [o_userSelections setObject:[NSArray arrayWithObject:
- [o_t2_fld_pathToNewStrm stringValue]] forKey:@"pathToStrm"];
+ [o_userSelections setObject:[NSArray arrayWithObject:[o_t2_fld_pathToNewStrm stringValue]] forKey:@"pathToStrm"];
}
}
else
if (p_item->i_children <= 0)
{
char *psz_uri = input_item_GetURI( p_item->p_input);
- [tempArray addObject: [NSString stringWithUTF8String: psz_uri]];
+ [tempArray addObject: [NSString stringWithUTF8String:psz_uri]];
free( psz_uri);
stop = NO;
}
[o_t4_pop_videoCodec removeItemWithTitle:@"Theora"];
} else {
/* RTP/UDP Unicast/Multicast Streaming */
- [o_userSelections setObject: [[NSNumber numberWithInt: mode]
- stringValue] forKey:@"stmgMhd"];
+ [o_userSelections setObject: [[NSNumber numberWithInt:mode] stringValue] forKey:@"stmgMhd"];
/* disable all codecs which don't support MPEG-TS */
[o_t4_pop_audioCodec removeItemWithTitle:@"Vorbis"];
}
/* include subtitles? */
- [o_userSelections setObject:
- [[NSNumber numberWithInt:[o_t6_ckb_soverlay state]] stringValue]
- forKey: @"soverlay"];
+ [o_userSelections setObject: [[NSNumber numberWithInt:[o_t6_ckb_soverlay state]] stringValue] forKey: @"soverlay"];
/* go to "Summary" */
[self showSummary];
NSMutableArray * tempArray = [[NSMutableArray alloc] init];
int x = 0;
int y = [[o_userSelections objectForKey:@"pathToStrm"] count];
- NSMutableString * tempString = [[NSMutableString alloc] init];
+ NSString * tempString = [[NSString alloc] init];
while( x != y)
{
NSString * fileNameToUse;
* we need the casting to make GCC4 happy */
if ([[[NSFileManager defaultManager] attributesOfItemAtPath:
[[o_userSelections objectForKey:@"pathToStrm"]
- objectAtIndex: x] error:nil] objectForKey:
+ objectAtIndex:x] error:nil] objectForKey:
NSFileExtensionHidden])
fileNameToUse = [NSString stringWithString:
[[NSFileManager defaultManager] displayNameAtPath:
[[o_userSelections objectForKey:@"pathToStrm"]
- objectAtIndex: x]]];
+ objectAtIndex:x]]];
else
{
int z = 0;
int count = [[[[NSFileManager defaultManager]
displayNameAtPath:
[[o_userSelections objectForKey:@"pathToStrm"]
- objectAtIndex: x]]
+ objectAtIndex:x]]
componentsSeparatedByString: @"."] count];
fileNameToUse = @"";
while( z < (count - 1))
[[[[NSFileManager defaultManager]
displayNameAtPath:
[[o_userSelections objectForKey:@"pathToStrm"]
- objectAtIndex: x]]
+ objectAtIndex:x]]
componentsSeparatedByString: @"."]
- objectAtIndex: z]];
+ objectAtIndex:z]];
z += 1;
}
}
/* we don't need to check for existing items because Cocoa
* does that already when we are asking the user for a location
* to save her file */
- [o_userSelections setObject: [NSArray arrayWithObject:
- [o_t7_fld_filePath stringValue]] forKey: @"trnscdFilePath"];
+ [o_userSelections setObject: [NSArray arrayWithObject:[o_t7_fld_filePath stringValue]] forKey: @"trnscdFilePath"];
}
/* include subtitles ? */
- [o_userSelections setObject:
- [[NSNumber numberWithInt:[o_t7_ckb_soverlay state]] stringValue]
- forKey: @"soverlay"];
+ [o_userSelections setObject:[[NSNumber numberWithInt:[o_t7_ckb_soverlay state]] stringValue] forKey: @"soverlay"];
/* go to "Summary" */
[self showSummary];
[[o_userSelections objectForKey:@"pathToStrm"] count]]];
else
[o_t8_fld_inptStream setStringValue:
- [[o_userSelections objectForKey:@"pathToStrm"] objectAtIndex: 0]];
+ [[o_userSelections objectForKey:@"pathToStrm"] objectAtIndex:0]];
if ([[o_userSelections objectForKey:@"localPb"] isEqualToString: @"YES"])
{
[self createOpts];
[o_t8_fld_mrl setStringValue: [[o_userSelections objectForKey:@"opts"]
- objectAtIndex: 0]];
+ objectAtIndex:0]];
[o_tab_pageHolder selectTabViewItemAtIndex:7];
}
@":sout=#%@%@standard{mux=%@,access=file{no-overwrite},dst=%@}",
o_duplicateCmd,
o_trnscdCmd,
- [[o_encapFormats objectAtIndex: [[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0],
- [[o_userSelections objectForKey: @"trnscdFilePath"] objectAtIndex: x]];
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0],
+ [[o_userSelections objectForKey: @"trnscdFilePath"] objectAtIndex:x]];
}
else
{
[o_sap_option appendFormat: @"sap,name=\"%@\"",
[o_userSelections objectForKey:@"sapText"]];
}
- if ([[[o_strmgMthds objectAtIndex: [[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])
+ if ([[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])
{
/* RTP is no access out, but a stream out module */
[o_opts_string appendFormat:
@":sout=#%@%@rtp{mux=%@,dst=%@,%@}",
o_duplicateCmd, o_trnscdCmd,
- [[o_encapFormats objectAtIndex: [[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey: @"stmgDest"],
o_sap_option];
}
[o_opts_string appendFormat:
@":sout=#%@%@standard{mux=%@,dst=%@,access=%@,%@}",
o_duplicateCmd, o_trnscdCmd,
- [[o_encapFormats objectAtIndex: [[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey: @"stmgDest"],
- [[o_strmgMthds objectAtIndex: [[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0],
+ [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0],
o_sap_option];
}
}
else
{
/* no SAP, just streaming */
- if ([[[o_strmgMthds objectAtIndex: [[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])
+ if ([[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])
{
/* RTP is different from the other protocols, as it isn't provided through an access out module anymore */
[o_opts_string appendFormat:
@":sout=#%@%@rtp{mux=%@,dst=%@}",
o_duplicateCmd,
o_trnscdCmd,
- [[o_encapFormats objectAtIndex: [[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey: @"stmgDest"]];
}
else
@":sout=#%@%@standard{mux=%@,dst=%@,access=%@}",
o_duplicateCmd,
o_trnscdCmd,
- [[o_encapFormats objectAtIndex: [[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey: @"stmgDest"],
- [[o_strmgMthds objectAtIndex: [[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0]];
+ [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0]];
}
}
}
- (IBAction)t6_mrInfo_sap:(id)sender
{
/* show a sheet for the help */
- NSBeginInformationalAlertSheet(_NS("SAP Announce"),
+ NSBeginInformationalAlertSheet(_NS("SAP Announcement"),
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
_NS("When streaming using UDP, the streams can be "
"announced using the SAP/SDP announcing protocol. This "
projects / vlc / blobdiff