From: Benjamin Pracht Date: Sat, 23 Jul 2005 18:11:58 +0000 (+0000) Subject: We use 4 space caracters instead of spaces in VLC's sources ;) X-Git-Tag: 0.8.4~1185 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7d9d7bad793fe5dec4800cb80db7856f10159507;p=vlc We use 4 space caracters instead of spaces in VLC's sources ;) --- diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m index f07373c6d4..36dd32637b 100644 --- a/modules/gui/macosx/wizard.m +++ b/modules/gui/macosx/wizard.m @@ -4,13 +4,13 @@ * Copyright (C) 2005 the VideoLAN team * $Id$ * - * Authors: Felix Kühne + * Authors: Felix Kühne * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -21,18 +21,18 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ - + /***************************************************************************** - * Note: this code is partially based upon ../wxwindows/wizard.cpp and - * ../wxwindows/streamdata.h; both written by Clément Stenac. - *****************************************************************************/ + * Note: this code is partially based upon ../wxwindows/wizard.cpp and + * ../wxwindows/streamdata.h; both written by Clément Stenac. + *****************************************************************************/ /* TODO: - - fill the playlist-table on t2 - - see FIXME's + - fill the playlist-table on t2 + - see FIXME's */ - + /***************************************************************************** * Preamble *****************************************************************************/ @@ -53,33 +53,33 @@ static VLCWizard *_o_sharedInstance = nil; return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init]; } -- (id)init +- (id)init { if (_o_sharedInstance) { [self dealloc]; } else { _o_sharedInstance = [super init]; } - + return _o_sharedInstance; } - (void)dealloc { - [o_userSelections release]; - [o_videoCodecs release]; - [o_audioCodecs release]; - [o_encapFormats release]; - [super dealloc]; + [o_userSelections release]; + [o_videoCodecs release]; + [o_audioCodecs release]; + [o_encapFormats release]; + [super dealloc]; } - (void)awakeFromNib { /* some minor cleanup */ [o_t2_tbl_plst setEnabled:NO]; - [o_wizardhelp_window setExcludedFromWindowsMenu:YES]; - o_userSelections = [[NSMutableDictionary alloc] init]; - [o_btn_backward setEnabled:NO]; + [o_wizardhelp_window setExcludedFromWindowsMenu:YES]; + o_userSelections = [[NSMutableDictionary alloc] init]; + [o_btn_backward setEnabled:NO]; /* add audio-bitrates for transcoding */ NSArray * audioBitratesArray; @@ -87,140 +87,140 @@ static VLCWizard *_o_sharedInstance = 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 ]; [o_t4_pop_videoBitrate removeAllItems]; [o_t4_pop_videoBitrate addItemsWithTitles: videoBitratesArray]; [o_t4_pop_videoBitrate selectItemWithTitle: @"1024"]; + + /* fill 2 global arrays with arrays containing all codec-related information + * - one array per codec named by its short name to define the encap-compability, + * cmd-names, real names, more info in the order: realName, shortName, + * moreInfo, encaps */ + NSArray * o_mp1v; + NSArray * o_mp2v; + NSArray * o_mp4v; + NSArray * o_div1; + NSArray * o_div2; + NSArray * o_div3; + NSArray * o_h263; + NSArray * o_h264; + NSArray * o_wmv1; + NSArray * o_wmv2; + NSArray * o_mjpg; + NSArray * o_theo; + NSArray * o_dummyVid; + o_mp1v = [NSArray arrayWithObjects: @"MPEG-1 Video", @"mp1v", _NS("MPEG-1 Video codec"), @"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"), @"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"), @"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"), @"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"), @"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"), @"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)"), @"MUX_TS", @"MUX_AVI", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", nil]; + o_h264 = [NSArray arrayWithObjects: @"H 264", @"H264", _NS("H264 is a new video codec"), @"MUX_TS", @"MUX_AVI", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", nil]; + o_wmv1 = [NSArray arrayWithObjects: @"WMV 1", @"WMV1", _NS("WMV (Windows Media Video) 1"), @"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"), @"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"), @"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"), @"MUX_TS", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", nil]; + o_dummyVid = [NSArray arrayWithObjects: @"Dummy", @"dummy", _NS("Dummy codec (do not transcode)"), @"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]; + [o_t4_pop_videoCodec removeAllItems]; + unsigned int x; + x = 0; + while (x != [o_videoCodecs count]) + { + [o_t4_pop_videoCodec addItemWithTitle:[[o_videoCodecs objectAtIndex:x] objectAtIndex:0]]; + x = (x + 1); + } - /* fill 2 global arrays with arrays containing all codec-related information - * - one array per codec named by its short name to define the encap-compability, - * cmd-names, real names, more info in the order: realName, shortName, - * moreInfo, encaps */ - NSArray * o_mp1v; - NSArray * o_mp2v; - NSArray * o_mp4v; - NSArray * o_div1; - NSArray * o_div2; - NSArray * o_div3; - NSArray * o_h263; - NSArray * o_h264; - NSArray * o_wmv1; - NSArray * o_wmv2; - NSArray * o_mjpg; - NSArray * o_theo; - NSArray * o_dummyVid; - o_mp1v = [NSArray arrayWithObjects: @"MPEG-1 Video", @"mp1v", _NS("MPEG-1 Video codec"), @"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"), @"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"), @"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"), @"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"), @"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"), @"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)"), @"MUX_TS", @"MUX_AVI", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", nil]; - o_h264 = [NSArray arrayWithObjects: @"H 264", @"H264", _NS("H264 is a new video codec"), @"MUX_TS", @"MUX_AVI", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", nil]; - o_wmv1 = [NSArray arrayWithObjects: @"WMV 1", @"WMV1", _NS("WMV (Windows Media Video) 1"), @"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"), @"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"), @"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"), @"MUX_TS", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", nil]; - o_dummyVid = [NSArray arrayWithObjects: @"Dummy", @"dummy", _NS("Dummy codec (do not transcode)"), @"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]; - [o_t4_pop_videoCodec removeAllItems]; - unsigned int x; - x = 0; - while (x != [o_videoCodecs count]) - { - [o_t4_pop_videoCodec addItemWithTitle:[[o_videoCodecs objectAtIndex:x] objectAtIndex:0]]; - x = (x + 1); - } - - NSArray * o_mpga; - NSArray * o_mp3; - NSArray * o_mp4a; - NSArray * o_a52; - NSArray * o_vorb; - NSArray * o_flac; - NSArray * o_spx; - NSArray * o_s16l; - NSArray * o_fl32; - NSArray * o_dummyAud; - o_mpga = [NSArray arrayWithObjects: @"MPEG Audio", @"mpga", _NS("The standard MPEG audio (1/2) format"), @"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"), @"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"), @"MUX_TS", @"MUX_MP4", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; - o_a52 = [NSArray arrayWithObjects: @"A/52", @"a52", _NS("DVD audio format"), @"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"), @"MUX_OGG", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; - o_flac = [NSArray arrayWithObjects: @"FLAC", @"flac", _NS("FLAC is a lossless audio codec"), @"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"), @"MUX_OGG", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; - o_s16l = [NSArray arrayWithObjects: @"Uncompressed, integer", @"s16l", _NS("Uncompressed audio samples"), @"MUX_WAV", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; - o_fl32 = [NSArray arrayWithObjects: @"Uncompressed, floating", @"fl32", _NS("Uncompressed audio samples"), @"MUX_WAV", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; - o_dummyAud = [NSArray arrayWithObjects: @"Dummy", @"dummy", _NS("Dummy codec (do not transcode)"), @"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]; - [o_t4_pop_audioCodec removeAllItems]; - x = 0; - while (x != [o_audioCodecs count]) - { - [o_t4_pop_audioCodec addItemWithTitle:[[o_audioCodecs objectAtIndex:x] objectAtIndex:0]]; - x = (x + 1); - } - - - /* fill another global array with all information about the encap-formats - * note that the order of the formats inside the g. array is the same as on - * the encap-tab */ - NSArray * o_ps; - NSArray * o_ts; - NSArray * o_mpeg; - NSArray * o_ogg; - NSArray * o_raw; - NSArray * o_asf; - NSArray * o_avi; - NSArray * o_mp4; - NSArray * o_mov; - NSArray * o_wav; - o_ps = [NSArray arrayWithObjects: @"ps", @"MPEG PS", _NS("MPEG Program Stream"), nil]; - o_ts = [NSArray arrayWithObjects: @"ts", @"MPEG TS", _NS("MPEG Transport Stream"), nil]; - o_mpeg = [NSArray arrayWithObjects: @"ps", @"MPEG 1", _NS("MPEG 1 Format"), 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_avi = [NSArray arrayWithObjects: @"avi", @"AVI", @"AVI", 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_encapFormats = [[NSArray alloc] initWithObjects: o_ps, o_ts, o_mpeg, o_ogg, o_raw, o_asf, o_avi, o_mp4, o_mov, o_wav, nil]; - - /* yet another array on streaming methods including help texts */ - NSArray * o_http; - NSArray * o_udp_uni; - NSArray * o_udp_multi; - o_http = [NSArray arrayWithObjects: @"http", @"HTTP", _NS("Enter the local " \ - "addresses you want to listen to. Do not enter anything if you want to " \ - "listen to all adresses or if you don't understand. 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 less efficient, as the server needs to send " \ - "the stream several times."), nil]; - 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 " \ - "does not work over Internet."), nil]; - 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_strmgMthds = [[NSArray alloc] initWithObjects: o_http, o_udp_multi, o_udp_uni, nil]; + NSArray * o_mpga; + NSArray * o_mp3; + NSArray * o_mp4a; + NSArray * o_a52; + NSArray * o_vorb; + NSArray * o_flac; + NSArray * o_spx; + NSArray * o_s16l; + NSArray * o_fl32; + NSArray * o_dummyAud; + o_mpga = [NSArray arrayWithObjects: @"MPEG Audio", @"mpga", _NS("The standard MPEG audio (1/2) format"), @"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"), @"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"), @"MUX_TS", @"MUX_MP4", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; + o_a52 = [NSArray arrayWithObjects: @"A/52", @"a52", _NS("DVD audio format"), @"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"), @"MUX_OGG", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; + o_flac = [NSArray arrayWithObjects: @"FLAC", @"flac", _NS("FLAC is a lossless audio codec"), @"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"), @"MUX_OGG", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; + o_s16l = [NSArray arrayWithObjects: @"Uncompressed, integer", @"s16l", _NS("Uncompressed audio samples"), @"MUX_WAV", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; + o_fl32 = [NSArray arrayWithObjects: @"Uncompressed, floating", @"fl32", _NS("Uncompressed audio samples"), @"MUX_WAV", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; + o_dummyAud = [NSArray arrayWithObjects: @"Dummy", @"dummy", _NS("Dummy codec (do not transcode)"), @"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]; + [o_t4_pop_audioCodec removeAllItems]; + x = 0; + while (x != [o_audioCodecs count]) + { + [o_t4_pop_audioCodec addItemWithTitle:[[o_audioCodecs objectAtIndex:x] objectAtIndex:0]]; + x = (x + 1); + } + + + /* fill another global array with all information about the encap-formats + * note that the order of the formats inside the g. array is the same as on + * the encap-tab */ + NSArray * o_ps; + NSArray * o_ts; + NSArray * o_mpeg; + NSArray * o_ogg; + NSArray * o_raw; + NSArray * o_asf; + NSArray * o_avi; + NSArray * o_mp4; + NSArray * o_mov; + NSArray * o_wav; + o_ps = [NSArray arrayWithObjects: @"ps", @"MPEG PS", _NS("MPEG Program Stream"), nil]; + o_ts = [NSArray arrayWithObjects: @"ts", @"MPEG TS", _NS("MPEG Transport Stream"), nil]; + o_mpeg = [NSArray arrayWithObjects: @"ps", @"MPEG 1", _NS("MPEG 1 Format"), 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_avi = [NSArray arrayWithObjects: @"avi", @"AVI", @"AVI", 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_encapFormats = [[NSArray alloc] initWithObjects: o_ps, o_ts, o_mpeg, o_ogg, o_raw, o_asf, o_avi, o_mp4, o_mov, o_wav, nil]; + + /* yet another array on streaming methods including help texts */ + NSArray * o_http; + NSArray * o_udp_uni; + NSArray * o_udp_multi; + o_http = [NSArray arrayWithObjects: @"http", @"HTTP", _NS("Enter the local " \ + "addresses you want to listen to. Do not enter anything if you want to " \ + "listen to all adresses or if you don't understand. 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 less efficient, as the server needs to send " \ + "the stream several times."), nil]; + 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 " \ + "does not work over Internet."), nil]; + 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_strmgMthds = [[NSArray alloc] initWithObjects: o_http, o_udp_multi, o_udp_uni, nil]; } - (void)showWizard { /* just present the window to the user */ [o_tab_pageHolder selectFirstTabViewItem:self]; + + [self resetWizard]; - [self resetWizard]; - [o_wizard_window center]; [o_wizard_window displayIfNeeded]; [o_wizard_window makeKeyAndOrderFront:nil]; @@ -228,65 +228,65 @@ static VLCWizard *_o_sharedInstance = nil; - (void)resetWizard { - /* reset the wizard-window to its default values */ - - [o_userSelections removeAllObjects]; - [o_t1_matrix_strmgOrTrnscd selectCellAtRow:0 column:0]; - [[o_t1_matrix_strmgOrTrnscd cellAtRow:1 column:0] setState: NSOffState]; - [o_btn_forward setTitle: _NS("Next")]; - - /* "Input" */ - [o_t2_fld_pathToNewStrm setStringValue: @""]; - [o_t2_ckb_enblPartExtrct setState: NSOffState]; - [self t2_enableExtract:nil]; - [o_t2_matrix_inputSourceType selectCellAtRow:0 column:0]; - [[o_t2_matrix_inputSourceType cellAtRow:1 column:0] setState: NSOffState]; - /* FIXME: we need to refresh the playlist-table as well */ - [o_t2_tbl_plst setEnabled:NO]; - [o_t2_fld_pathToNewStrm setEnabled:YES]; - [o_t2_btn_chooseFile setEnabled:YES]; - - /* "Streaming 1" */ - [o_t3_fld_address setStringValue: @""]; - [o_t3_matrix_stmgMhd selectCellAtRow:0 column:0]; - [[o_t3_matrix_stmgMhd cellAtRow:1 column:1] setState: NSOffState]; - [[o_t3_matrix_stmgMhd cellAtRow:1 column:2] setState: NSOffState]; - - /* "Transcode 1" */ - [o_t4_ckb_audio setState: NSOffState]; - [o_t4_ckb_video setState: NSOffState]; - [self t4_enblVidTrnscd:nil]; - [self t4_enblAudTrnscd:nil]; - - /* "Streaming 2" */ - [o_t6_fld_ttl setStringValue: @"1"]; - [o_t6_ckb_sap setState: NSOffState]; - [self t6_enblSapAnnce:nil]; - - /* "Transcode 2" */ - [o_t7_fld_filePath setStringValue: @""]; + /* reset the wizard-window to its default values */ + + [o_userSelections removeAllObjects]; + [o_t1_matrix_strmgOrTrnscd selectCellAtRow:0 column:0]; + [[o_t1_matrix_strmgOrTrnscd cellAtRow:1 column:0] setState: NSOffState]; + [o_btn_forward setTitle: _NS("Next")]; + + /* "Input" */ + [o_t2_fld_pathToNewStrm setStringValue: @""]; + [o_t2_ckb_enblPartExtrct setState: NSOffState]; + [self t2_enableExtract:nil]; + [o_t2_matrix_inputSourceType selectCellAtRow:0 column:0]; + [[o_t2_matrix_inputSourceType cellAtRow:1 column:0] setState: NSOffState]; + /* FIXME: we need to refresh the playlist-table as well */ + [o_t2_tbl_plst setEnabled:NO]; + [o_t2_fld_pathToNewStrm setEnabled:YES]; + [o_t2_btn_chooseFile setEnabled:YES]; + + /* "Streaming 1" */ + [o_t3_fld_address setStringValue: @""]; + [o_t3_matrix_stmgMhd selectCellAtRow:0 column:0]; + [[o_t3_matrix_stmgMhd cellAtRow:1 column:1] setState: NSOffState]; + [[o_t3_matrix_stmgMhd cellAtRow:1 column:2] setState: NSOffState]; + + /* "Transcode 1" */ + [o_t4_ckb_audio setState: NSOffState]; + [o_t4_ckb_video setState: NSOffState]; + [self t4_enblVidTrnscd:nil]; + [self t4_enblAudTrnscd:nil]; + + /* "Streaming 2" */ + [o_t6_fld_ttl setStringValue: @"1"]; + [o_t6_ckb_sap setState: NSOffState]; + [self t6_enblSapAnnce:nil]; + + /* "Transcode 2" */ + [o_t7_fld_filePath setStringValue: @""]; } - (void)initStrings { /* localise all strings to the users lang */ /* method is called from intf.m (in method openWizard) */ - + /* general items */ [o_btn_backward setTitle: _NS("Back")]; [o_btn_cancel setTitle: _NS("Cancel")]; [o_btn_forward setTitle: _NS("Next")]; [o_wizard_window setTitle: _NS("Streaming/Transcoding Wizard")]; - + /* page one ("Hello") */ [o_t1_txt_title setStringValue: _NS("Streaming/Transcoding Wizard")]; [o_t1_txt_text setStringValue: _NS("This wizard helps you to stream, transcode or save a stream.")]; [o_t1_btn_mrInfo_strmg setTitle: _NS("More Info")]; [o_t1_btn_mrInfo_trnscd setTitle: _NS("More Info")]; [o_t1_txt_notice setStringValue: _NS("This wizard only gives access to a small subset of VLC's streaming and transcoding capabilities. Use the Open and Stream Output dialogs to get all of them.")]; - [[o_t1_matrix_strmgOrTrnscd cellAtRow:0 column:0] setTitle: _NS("Stream to network")]; + [[o_t1_matrix_strmgOrTrnscd cellAtRow:0 column:0] setTitle: _NS("Stream to network")]; [[o_t1_matrix_strmgOrTrnscd cellAtRow:1 column:0] setTitle: _NS("Transcode/Save to file")]; - + /* page two ("Input") */ [o_t2_title setStringValue: _NS("Choose input")]; [o_t2_text setStringValue: _NS("Choose here your input stream.")]; @@ -303,7 +303,7 @@ static VLCWizard *_o_sharedInstance = nil; "Enter the starting and ending times (in seconds).")]; [o_t2_txt_prtExtrctFrom setStringValue: _NS("From")]; [o_t2_txt_prtExtrctTo setStringValue: _NS("To")]; - + /* page three ("Streaming 1") */ [o_t3_txt_title setStringValue: _NS("Streaming")]; [o_t3_txt_text setStringValue: _NS("In this page, you will select how your input stream will be sent.")]; @@ -312,8 +312,8 @@ static VLCWizard *_o_sharedInstance = nil; [o_t3_txt_destInfo setStringValue: _NS("Enter the address of the computer to stream to.")]; [[o_t3_matrix_stmgMhd cellAtRow:1 column:0] setTitle: _NS("UDP Unicast")]; [[o_t3_matrix_stmgMhd cellAtRow:1 column:1] setTitle: _NS("UDP Multicast")]; - [o_t3_txt_strgMthdInfo setStringValue: _NS("Use this to stream to a single computer.")]; - + [o_t3_txt_strgMthdInfo setStringValue: _NS("Use this to stream to a single computer.")]; + /* page four ("Transcode 1") */ [o_t4_title setStringValue: _NS("Transcode")]; [o_t4_text setStringValue: _NS("If you want to change the compression format of the audio or video tracks, fill in this page. (If you only want to change the container format, proceed to next page.)")]; @@ -327,13 +327,13 @@ static VLCWizard *_o_sharedInstance = nil; "transcode it, enable this.")]; [o_t4_txt_hintVideo setStringValue: _NS("If your stream has video and you want to " \ "transcode it, enable this.")]; - + /* page five ("Encap") */ [o_t5_title setStringValue: _NS("Encapsulation format")]; [o_t5_text setStringValue: _NS("In this page, you will select how the stream will be "\ "encapsulated. Depending on the choices you made, all "\ "formats won't be available.")]; - + /* page six ("Streaming 2") */ [o_t6_title setStringValue: _NS("Additional streaming options")]; [o_t6_text setStringValue: _NS("In this page, you will define a few " \ @@ -342,30 +342,30 @@ static VLCWizard *_o_sharedInstance = nil; [o_t6_btn_mrInfo_ttl setTitle: _NS("More Info")]; [o_t6_ckb_sap setTitle: _NS("SAP Announce")]; [o_t6_btn_mrInfo_sap setTitle: _NS("More Info")]; - + /* page seven ("Transcode 2") */ [o_t7_title setStringValue: _NS("Additional transcode options")]; [o_t7_text setStringValue: _NS("In this page, you will define a few " \ "additionnal parameters for your transcoding.")]; [o_t7_txt_saveFileTo setStringValue: _NS("Select the file to save to")]; [o_t7_btn_chooseFile setTitle: _NS("Choose...")]; - - /* page eight ("Summary") */ - [o_t8_txt_text setStringValue: _NS("This page lists all your selections. " \ - "Click \"Finish\" to start your streaming or transcoding.")]; + + /* page eight ("Summary") */ + [o_t8_txt_text setStringValue: _NS("This page lists all your selections. " \ + "Click \"Finish\" to start your streaming or transcoding.")]; [o_t8_txt_title setStringValue: _NS("Summary")]; - [o_t8_txt_destination setStringValue: [_NS("Destination") stringByAppendingString: @":"]]; + [o_t8_txt_destination setStringValue: [_NS("Destination") stringByAppendingString: @":"]]; [o_t8_txt_encapFormat setStringValue: [_NS("Encap. format") stringByAppendingString: @":"]]; - [o_t8_txt_inputStream setStringValue: [_NS("Input stream") stringByAppendingString: @":"]]; + [o_t8_txt_inputStream setStringValue: [_NS("Input stream") stringByAppendingString: @":"]]; [o_t8_txt_partExtract setStringValue: [_NS("Partial Extract") stringByAppendingString: @":"]]; [o_t8_txt_sap setStringValue: [_NS("SAP Announce") stringByAppendingString: @":"]]; [o_t8_txt_saveFileTo setStringValue: [_NS("Save file to") stringByAppendingString: @":"]]; [o_t8_txt_strmgMthd setStringValue: [_NS("Streaming method") stringByAppendingString: @":"]]; [o_t8_txt_trnscdAudio setStringValue: [_NS("Transcode audio") stringByAppendingString: @":"]]; [o_t8_txt_trnscdVideo setStringValue: [_NS("Transcode video") stringByAppendingString: @":"]]; - - /* wizard help window */ - [o_wh_btn_okay setTitle: _NS("OK")]; + + /* wizard help window */ + [o_wh_btn_okay setTitle: _NS("OK")]; } - (IBAction)cancelRun:(id)sender @@ -375,63 +375,63 @@ static VLCWizard *_o_sharedInstance = nil; - (IBAction)nextTab:(id)sender { - if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Hello"]) - { - /* check whether the user wants to stream or just to transcode; - * store information for later usage */ - NSString *o_mode; - o_mode = [[o_t1_matrix_strmgOrTrnscd selectedCell] title]; - if( [o_mode isEqualToString: _NS("Stream to network")] ) - { - [o_userSelections setObject:@"strmg" forKey:@"trnscdOrStrmg"]; - }else{ - [o_userSelections setObject:@"trnscd" forKey:@"trnscdOrStrmg"]; - } - [o_btn_backward setEnabled:YES]; - [o_tab_pageHolder selectTabViewItemAtIndex:1]; - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Input"]) - { - /* check whether partialExtract is enabled and store the values, if needed */ - if ([o_t2_ckb_enblPartExtrct state] == NSOnState) - { - [o_userSelections setObject:@"YES" forKey:@"partExtract"]; - [o_userSelections setObject:[o_t2_fld_prtExtrctFrom stringValue] forKey:@"partExtractFrom"]; - [o_userSelections setObject:[o_t2_fld_prtExtrctTo stringValue] forKey:@"partExtractTo"]; - }else{ - [o_userSelections setObject:@"NO" forKey:@"partExtract"]; - } - - /* check whether we use an existing pl-item or add an new one; - * store the path or the index and set a flag. - * complain to the user if s/he didn't provide a path */ - NSString *o_mode; - BOOL stop; - stop = NO; - o_mode = [[o_t2_matrix_inputSourceType selectedCell] title]; - if( [o_mode isEqualToString: _NS("Select a stream")] ) - { - [o_userSelections setObject:@"YES" forKey:@"newStrm"]; - if ([[o_t2_fld_pathToNewStrm stringValue] isEqualToString: @""]) - { + if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Hello"]) + { + /* check whether the user wants to stream or just to transcode; + * store information for later usage */ + NSString *o_mode; + o_mode = [[o_t1_matrix_strmgOrTrnscd selectedCell] title]; + if( [o_mode isEqualToString: _NS("Stream to network")] ) + { + [o_userSelections setObject:@"strmg" forKey:@"trnscdOrStrmg"]; + }else{ + [o_userSelections setObject:@"trnscd" forKey:@"trnscdOrStrmg"]; + } + [o_btn_backward setEnabled:YES]; + [o_tab_pageHolder selectTabViewItemAtIndex:1]; + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Input"]) + { + /* check whether partialExtract is enabled and store the values, if needed */ + if ([o_t2_ckb_enblPartExtrct state] == NSOnState) + { + [o_userSelections setObject:@"YES" forKey:@"partExtract"]; + [o_userSelections setObject:[o_t2_fld_prtExtrctFrom stringValue] forKey:@"partExtractFrom"]; + [o_userSelections setObject:[o_t2_fld_prtExtrctTo stringValue] forKey:@"partExtractTo"]; + }else{ + [o_userSelections setObject:@"NO" forKey:@"partExtract"]; + } + + /* check whether we use an existing pl-item or add an new one; + * store the path or the index and set a flag. + * complain to the user if s/he didn't provide a path */ + NSString *o_mode; + BOOL stop; + stop = NO; + o_mode = [[o_t2_matrix_inputSourceType selectedCell] title]; + if( [o_mode isEqualToString: _NS("Select a stream")] ) + { + [o_userSelections setObject:@"YES" forKey:@"newStrm"]; + if ([[o_t2_fld_pathToNewStrm stringValue] isEqualToString: @""]) + { /* set a flag that no file is selected */ - stop = YES; - }else{ - [o_userSelections setObject:[@"file://" stringByAppendingString:[o_t2_fld_pathToNewStrm stringValue]] forKey:@"pathToStrm"]; - } - }else{ - if ([o_t2_tbl_plst selectedRow] != -1) - { - /* FIXME: put the path of the selected pl-item to pathToStrm */ + stop = YES; + }else{ + [o_userSelections setObject:[@"file://" stringByAppendingString:[o_t2_fld_pathToNewStrm stringValue]] forKey:@"pathToStrm"]; + } + }else{ + if ([o_t2_tbl_plst selectedRow] != -1) + { + /* FIXME: put the path of the selected pl-item to pathToStrm */ } else { /* set a flag that no item is selected */ stop = YES; - } - } - - /* show either "Streaming 1" or "Transcode 1" to the user */ - if (stop == NO) - { + } + } + + /* show either "Streaming 1" or "Transcode 1" to the user */ + if (stop == NO) + { if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) { /* we are streaming */ @@ -443,622 +443,622 @@ static VLCWizard *_o_sharedInstance = nil; } else { /* show a sheet that the user didn't select a file */ NSBeginInformationalAlertSheet(_NS("No input selected"), _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("You selected neither " \ - "a new stream nor an existing playlist item. VLC is unable to " \ - "guess, which input you want use. \n\n Choose one " \ - "before going to the next page.")); + "a new stream nor an existing playlist item. VLC is unable to " \ + "guess, which input you want use. \n\n Choose one " \ + "before going to the next page.")); + } + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Streaming 1"]) + { + /* check which streaming method is selected and store it */ + NSString *o_mode; + o_mode = [[o_t3_matrix_stmgMhd selectedCell] title]; + if( [o_mode isEqualToString: @"HTTP"] ) + { + [o_userSelections setObject:@"0" forKey:@"stmgMhd"]; + /* enable MPEG PS, MPEG TS, MPEG 1, OGG, RAW and ASF; select MPEG PS */ + [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO]; + [o_t5_matrix_encap selectCellAtRow:0 column:0]; + } else { + if( [o_mode isEqualToString: _NS("UDP Unicast")] ) + { + [o_userSelections setObject:@"2" forKey:@"stmgMhd"]; + } else { + [o_userSelections setObject:@"1" forKey:@"stmgMhd"]; + } + /* disable all encap-formats but MPEG-TS and select it */ + [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:1 column:0]; } - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Streaming 1"]) - { - /* check which streaming method is selected and store it */ - NSString *o_mode; - o_mode = [[o_t3_matrix_stmgMhd selectedCell] title]; - if( [o_mode isEqualToString: @"HTTP"] ) - { - [o_userSelections setObject:@"0" forKey:@"stmgMhd"]; - /* enable MPEG PS, MPEG TS, MPEG 1, OGG, RAW and ASF; select MPEG PS */ - [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO]; - [o_t5_matrix_encap selectCellAtRow:0 column:0]; - } else { - if( [o_mode isEqualToString: _NS("UDP Unicast")] ) - { - [o_userSelections setObject:@"2" forKey:@"stmgMhd"]; - } else { - [o_userSelections setObject:@"1" forKey:@"stmgMhd"]; - } - /* disable all encap-formats but MPEG-TS and select it */ - [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:1 column:0]; - } - - /* store the destination and check whether is it empty */ - if(! [o_mode isEqualToString: @"HTTP"] ) - { - /* empty field is valid for HTTP */ - if( [[o_t3_fld_address stringValue] isEqualToString: @""] ) - { - /* complain to the user that "" is no valid dest. */ - NSBeginInformationalAlertSheet(_NS("No valid destination"), _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("You need to enter " \ - "a valid destination you want to stream to. Enter either a " \ - "Unicast-IP or a Multicast-IP.\n\n If you don't know " - "what this means, have a look at the VLC Streaming HOWTO and " \ - "the help texts in this window.")); - } else { + + /* store the destination and check whether is it empty */ + if(! [o_mode isEqualToString: @"HTTP"] ) + { + /* empty field is valid for HTTP */ + if( [[o_t3_fld_address stringValue] isEqualToString: @""] ) + { + /* complain to the user that "" is no valid dest. */ + NSBeginInformationalAlertSheet(_NS("No valid destination"), _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("You need to enter " \ + "a valid destination you want to stream to. Enter either a " \ + "Unicast-IP or a Multicast-IP.\n\n If you don't know " + "what this means, have a look at the VLC Streaming HOWTO and " \ + "the help texts in this window.")); + } else { /* FIXME: check whether the entered IP is really valid */ [o_userSelections setObject:[o_t3_fld_address stringValue] forKey:@"stmgDest"]; - /* let's go to the encap-tab */ - [o_tab_pageHolder selectTabViewItemAtIndex:4]; - } - } else { - [o_userSelections setObject:[o_t3_fld_address stringValue] forKey:@"stmgDest"]; - /* let's go to the encap-tab */ - [o_tab_pageHolder selectTabViewItemAtIndex:4]; - } - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Transcode 1"]) - { - /* check whether the user wants to transcode the video-track and store the related options */ - if ([o_t4_ckb_video state] == NSOnState) - { - NSNumber * theNum; - theNum = [NSNumber numberWithInt:[o_t4_pop_videoCodec indexOfSelectedItem]]; - [o_userSelections setObject:@"YES" forKey:@"trnscdVideo"]; - [o_userSelections setObject:[o_t4_pop_videoBitrate titleOfSelectedItem] forKey:@"trnscdVideoBitrate"]; - [o_userSelections setObject:theNum forKey:@"trnscdVideoCodec"]; - } else { - [o_userSelections setObject:@"NO" forKey:@"trnscdVideo"]; - } - - /* check whether the user wants to transcode the audio-track and store the related options */ - if ([o_t4_ckb_audio state] == NSOnState) - { - NSNumber * theNum; - theNum = [NSNumber numberWithInt:[o_t4_pop_audioCodec indexOfSelectedItem]]; - [o_userSelections setObject:@"YES" forKey:@"trnscdAudio"]; - [o_userSelections setObject:[o_t4_pop_audioBitrate titleOfSelectedItem] forKey:@"trnscdAudioBitrate"]; - [o_userSelections setObject:theNum forKey:@"trnscdAudioCodec"]; - } else { - [o_userSelections setObject:@"NO" forKey:@"trnscdAudio"]; - } - - /* disable all encap-formats */ - [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO]; - - /* re-enable the encap-formats supported by the chosen codecs */ - /* FIXME: the following is a really bad coding-style. feel free to mail - me ideas how to make this nicer, if you want to -- FK, 7/11/05 */ - - if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualTo: @"YES"]) - { - if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualTo: @"YES"]) - { - /* we are transcoding both audio and video, so we need to check both deps */ - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_PS"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_PS"]) - { - [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:0 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_TS"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_TS"]) - { - [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:1 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MPEG"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MPEG"]) - { - [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:2 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_OGG"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_OGG"]) - { - [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:3 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_RAW"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_RAW"]) - { - [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:4 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_ASF"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_ASF"]) - { - [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:5 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_AVI"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_AVI"]) - { - [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:6 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MP4"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MP4"]) - { - [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:7 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MOV"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MOV"]) - { - [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:8 column:0]; - } - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_WAV"]) - { - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_WAV"]) - { - [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:9 column:0]; - } - } - - } else { - - /* we just transcoding the audio */ - - /* select formats supported by the audio codec */ - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_PS"]) - { - [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:0 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_TS"]) - { - [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:1 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MPEG"]) - { - [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:2 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_OGG"]) - { - [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:3 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_RAW"]) - { - [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:4 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_ASF"]) - { - [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:5 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_AVI"]) - { - [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:6 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MP4"]) - { - [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:7 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MOV"]) - { - [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:8 column:0]; - } - if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_WAV"]) - { - [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:9 column:0]; - } - } - } - else if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualTo: @"YES"]) - { - /* we are just transcoding the video */ - - /* select formats supported by the video-codec */ - - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_PS"]) - { - [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:0 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_TS"]) - { - [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:1 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MPEG"]) - { - [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:2 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_OGG"]) - { - [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:3 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_RAW"]) - { - [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:4 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_ASF"]) - { - [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:5 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_AVI"]) - { - [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:6 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MP4"]) - { - [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:7 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MOV"]) - { - [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:8 column:0]; - } - if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_WAV"]) - { - [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:YES]; - [o_t5_matrix_encap selectCellAtRow:9 column:0]; - } - } else { - /* we don't do any transcoding - * -> enabled the encap-formats allowed when streaming content via http - * since this should work fine in most cases */ - /* FIXME: choose a selection of encap-formats based upon the actually used codecs */ - - /* enable MPEG PS, MPEG TS, MPEG 1, OGG, RAW and ASF; select MPEG PS */ - [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; - [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO]; - [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO]; - [o_t5_matrix_encap selectCellAtRow:0 column:0]; - } - int x; - BOOL anythingEnabled; - x = 0; - anythingEnabled = NO; - while (x != [o_t5_matrix_encap numberOfRows]) - { - if ([[o_t5_matrix_encap cellAtRow:x column:0] isEnabled]) - { - anythingEnabled = YES; - } - x = (x + 1); - } - if (anythingEnabled == YES) - { - [o_tab_pageHolder selectTabViewItemAtIndex:4]; - } else { - /* show a sheet that the selected codecs are not compatible */ - NSBeginInformationalAlertSheet(_NS("Invalid selection"), _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("Your chosen codecs are " \ - "not compatible with each other. For example: you cannot " \ - "mix uncompressed audio with any video codec.\n\n" \ - "Correct your selection and try again.")); - } - - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Encap"]) - { - /* get the chosen encap format and store it */ - NSNumber * theNum; - theNum = [NSNumber numberWithInt:[[o_t5_matrix_encap selectedCell] tag]]; - [o_userSelections setObject:[theNum stringValue] forKey:@"encapFormat"]; - - /* show either "Streaming 2" or "Transcode 2" to the user */ - if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) - { - /* we are streaming */ - [o_tab_pageHolder selectTabViewItemAtIndex:5]; - }else{ - /* we are just transcoding */ - [o_tab_pageHolder selectTabViewItemAtIndex:6]; - } - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Streaming 2"]) - { - /* store the chosen TTL */ - [o_userSelections setObject:[o_t6_fld_ttl stringValue] forKey:@"ttl"]; - - /* check whether SAP is enabled and store the announce, if needed */ - if ([o_t6_ckb_sap state] == NSOnState) - { - [o_userSelections setObject:@"YES" forKey:@"sap"]; - [o_userSelections setObject:[o_t6_fld_sap stringValue] forKey:@"sapText"]; - } else { - [o_userSelections setObject:@"NO" forKey:@"sap"]; - } - - /* go to "Summary" */ - [self showSummary]; - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Transcode 2"]) - { - /* check whether the path != "" and store it */ - if( [[o_t7_fld_filePath stringValue] isEqualToString: @""] ) - { + /* let's go to the encap-tab */ + [o_tab_pageHolder selectTabViewItemAtIndex:4]; + } + } else { + [o_userSelections setObject:[o_t3_fld_address stringValue] forKey:@"stmgDest"]; + /* let's go to the encap-tab */ + [o_tab_pageHolder selectTabViewItemAtIndex:4]; + } + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Transcode 1"]) + { + /* check whether the user wants to transcode the video-track and store the related options */ + if ([o_t4_ckb_video state] == NSOnState) + { + NSNumber * theNum; + theNum = [NSNumber numberWithInt:[o_t4_pop_videoCodec indexOfSelectedItem]]; + [o_userSelections setObject:@"YES" forKey:@"trnscdVideo"]; + [o_userSelections setObject:[o_t4_pop_videoBitrate titleOfSelectedItem] forKey:@"trnscdVideoBitrate"]; + [o_userSelections setObject:theNum forKey:@"trnscdVideoCodec"]; + } else { + [o_userSelections setObject:@"NO" forKey:@"trnscdVideo"]; + } + + /* check whether the user wants to transcode the audio-track and store the related options */ + if ([o_t4_ckb_audio state] == NSOnState) + { + NSNumber * theNum; + theNum = [NSNumber numberWithInt:[o_t4_pop_audioCodec indexOfSelectedItem]]; + [o_userSelections setObject:@"YES" forKey:@"trnscdAudio"]; + [o_userSelections setObject:[o_t4_pop_audioBitrate titleOfSelectedItem] forKey:@"trnscdAudioBitrate"]; + [o_userSelections setObject:theNum forKey:@"trnscdAudioCodec"]; + } else { + [o_userSelections setObject:@"NO" forKey:@"trnscdAudio"]; + } + + /* disable all encap-formats */ + [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO]; + + /* re-enable the encap-formats supported by the chosen codecs */ + /* FIXME: the following is a really bad coding-style. feel free to mail + me ideas how to make this nicer, if you want to -- FK, 7/11/05 */ + + if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualTo: @"YES"]) + { + if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualTo: @"YES"]) + { + /* we are transcoding both audio and video, so we need to check both deps */ + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_PS"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_PS"]) + { + [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:0 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_TS"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_TS"]) + { + [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:1 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MPEG"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MPEG"]) + { + [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:2 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_OGG"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_OGG"]) + { + [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:3 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_RAW"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_RAW"]) + { + [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:4 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_ASF"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_ASF"]) + { + [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:5 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_AVI"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_AVI"]) + { + [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:6 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MP4"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MP4"]) + { + [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:7 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MOV"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MOV"]) + { + [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:8 column:0]; + } + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_WAV"]) + { + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_WAV"]) + { + [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:9 column:0]; + } + } + + } else { + + /* we just transcoding the audio */ + + /* select formats supported by the audio codec */ + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_PS"]) + { + [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:0 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_TS"]) + { + [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:1 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MPEG"]) + { + [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:2 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_OGG"]) + { + [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:3 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_RAW"]) + { + [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:4 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_ASF"]) + { + [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:5 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_AVI"]) + { + [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:6 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MP4"]) + { + [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:7 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_MOV"]) + { + [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:8 column:0]; + } + if ([[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] containsObject: @"MUX_WAV"]) + { + [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:9 column:0]; + } + } + } + else if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualTo: @"YES"]) + { + /* we are just transcoding the video */ + + /* select formats supported by the video-codec */ + + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_PS"]) + { + [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:0 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_TS"]) + { + [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:1 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MPEG"]) + { + [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:2 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_OGG"]) + { + [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:3 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_RAW"]) + { + [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:4 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_ASF"]) + { + [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:5 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_AVI"]) + { + [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:6 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MP4"]) + { + [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:7 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_MOV"]) + { + [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:8 column:0]; + } + if ([[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] containsObject: @"MUX_WAV"]) + { + [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:YES]; + [o_t5_matrix_encap selectCellAtRow:9 column:0]; + } + } else { + /* we don't do any transcoding + * -> enabled the encap-formats allowed when streaming content via http + * since this should work fine in most cases */ + /* FIXME: choose a selection of encap-formats based upon the actually used codecs */ + + /* enable MPEG PS, MPEG TS, MPEG 1, OGG, RAW and ASF; select MPEG PS */ + [[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES]; + [[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO]; + [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO]; + [o_t5_matrix_encap selectCellAtRow:0 column:0]; + } + int x; + BOOL anythingEnabled; + x = 0; + anythingEnabled = NO; + while (x != [o_t5_matrix_encap numberOfRows]) + { + if ([[o_t5_matrix_encap cellAtRow:x column:0] isEnabled]) + { + anythingEnabled = YES; + } + x = (x + 1); + } + if (anythingEnabled == YES) + { + [o_tab_pageHolder selectTabViewItemAtIndex:4]; + } else { + /* show a sheet that the selected codecs are not compatible */ + NSBeginInformationalAlertSheet(_NS("Invalid selection"), _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("Your chosen codecs are " \ + "not compatible with each other. For example: you cannot " \ + "mix uncompressed audio with any video codec.\n\n" \ + "Correct your selection and try again.")); + } + + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Encap"]) + { + /* get the chosen encap format and store it */ + NSNumber * theNum; + theNum = [NSNumber numberWithInt:[[o_t5_matrix_encap selectedCell] tag]]; + [o_userSelections setObject:[theNum stringValue] forKey:@"encapFormat"]; + + /* show either "Streaming 2" or "Transcode 2" to the user */ + if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) + { + /* we are streaming */ + [o_tab_pageHolder selectTabViewItemAtIndex:5]; + }else{ + /* we are just transcoding */ + [o_tab_pageHolder selectTabViewItemAtIndex:6]; + } + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Streaming 2"]) + { + /* store the chosen TTL */ + [o_userSelections setObject:[o_t6_fld_ttl stringValue] forKey:@"ttl"]; + + /* check whether SAP is enabled and store the announce, if needed */ + if ([o_t6_ckb_sap state] == NSOnState) + { + [o_userSelections setObject:@"YES" forKey:@"sap"]; + [o_userSelections setObject:[o_t6_fld_sap stringValue] forKey:@"sapText"]; + } else { + [o_userSelections setObject:@"NO" forKey:@"sap"]; + } + + /* go to "Summary" */ + [self showSummary]; + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Transcode 2"]) + { + /* check whether the path != "" and store it */ + if( [[o_t7_fld_filePath stringValue] isEqualToString: @""] ) + { /* complain to the user that "" is no valid path */ - NSBeginInformationalAlertSheet(_NS("No file selected"), _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("You you need to select a file, you want to save to. " \ + NSBeginInformationalAlertSheet(_NS("No file selected"), _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("You you need to select a file, you want to save to. " \ "\n\n Enter either a valid path or choose a location through " \ "the button's dialog-box.")); - } else { - [o_userSelections setObject:[o_t7_fld_filePath stringValue] forKey:@"trnscdFilePath"]; - - /* go to "Summary" */ - [self showSummary]; - } - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Summary"]) - { - intf_thread_t * p_intf = VLCIntf; + } else { + [o_userSelections setObject:[o_t7_fld_filePath stringValue] forKey:@"trnscdFilePath"]; + + /* go to "Summary" */ + [self showSummary]; + } + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Summary"]) + { + intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = (playlist_t *)vlc_object_find( p_intf, + playlist_t * p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE); if( p_playlist ) { - playlist_item_t *p_item = playlist_ItemNew( p_playlist, [[o_userSelections objectForKey:@"pathToStrm"] UTF8String], _("Streaming/Transcoding Wizard") ); - playlist_ItemAddOption( p_item, [[o_userSelections objectForKey:@"opts"] UTF8String]); - - if(! [[o_userSelections objectForKey:@"partExtractFrom"] isEqualToString:@""] ) - { - playlist_ItemAddOption( p_item, [[@"start-time=" stringByAppendingString: [o_userSelections objectForKey:@"partExtractFrom"]] UTF8String] ); - } + playlist_item_t *p_item = playlist_ItemNew( p_playlist, [[o_userSelections objectForKey:@"pathToStrm"] UTF8String], _("Streaming/Transcoding Wizard") ); + playlist_ItemAddOption( p_item, [[o_userSelections objectForKey:@"opts"] UTF8String]); + + if(! [[o_userSelections objectForKey:@"partExtractFrom"] isEqualToString:@""] ) + { + playlist_ItemAddOption( p_item, [[@"start-time=" stringByAppendingString: [o_userSelections objectForKey:@"partExtractFrom"]] UTF8String] ); + } - if(! [[o_userSelections objectForKey:@"partExtractTo"] isEqualToString:@""] ) - { - playlist_ItemAddOption( p_item, [[@"stop-time=" stringByAppendingString: [o_userSelections objectForKey:@"partExtractTo"]] UTF8String] ); - } - - playlist_ItemAddOption( p_item, [[@"ttl=" stringByAppendingString: [o_userSelections objectForKey:@"ttl"]] UTF8String] ); - - playlist_AddItem( p_playlist, p_item, PLAYLIST_GO, PLAYLIST_END ); - - msg_Warn(p_intf, "updating the playlist-table is not implemented!"); - - playlist_ViewUpdate( p_playlist, VIEW_CATEGORY ); - - vlc_object_release(p_playlist); - } else { - msg_Err( p_intf, "Uh Oh! Unable to find playlist!" ); - } - - /* close the window, since we are done */ - [o_wizard_window close]; - } + if(! [[o_userSelections objectForKey:@"partExtractTo"] isEqualToString:@""] ) + { + playlist_ItemAddOption( p_item, [[@"stop-time=" stringByAppendingString: [o_userSelections objectForKey:@"partExtractTo"]] UTF8String] ); + } + + playlist_ItemAddOption( p_item, [[@"ttl=" stringByAppendingString: [o_userSelections objectForKey:@"ttl"]] UTF8String] ); + + playlist_AddItem( p_playlist, p_item, PLAYLIST_GO, PLAYLIST_END ); + + msg_Warn(p_intf, "updating the playlist-table is not implemented!"); + + playlist_ViewUpdate( p_playlist, VIEW_CATEGORY ); + + vlc_object_release(p_playlist); + } else { + msg_Err( p_intf, "Uh Oh! Unable to find playlist!" ); + } + + /* close the window, since we are done */ + [o_wizard_window close]; + } } - (void)showSummary { - [o_btn_forward setTitle: _NS("Finish")]; - [o_t8_fld_inptStream setStringValue:[o_userSelections objectForKey:@"pathToStrm"]]; - - if ([[o_userSelections objectForKey:@"partExtract"] isEqualToString: @"YES"]) - { - [o_t8_fld_partExtract setStringValue: [[[[[_NS("yes") stringByAppendingString:@" - "] stringByAppendingString: _NS("from ")] stringByAppendingString: [o_userSelections objectForKey:@"partExtractFrom"]] stringByAppendingString: _NS(" to ")] stringByAppendingString: [o_userSelections objectForKey:@"partExtractTo"]]]; - } else { - [o_t8_fld_partExtract setStringValue: _NS("no")]; - } - - if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) - { - /* we are streaming; no transcoding allowed atm */ - [o_t8_fld_saveFileTo setStringValue: @"-"]; - [o_t8_fld_trnscdAudio setStringValue: @"-"]; - [o_t8_fld_trnscdVideo setStringValue: @"-"]; - [o_t8_fld_strmgMthd setStringValue: [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey:@"stmgMhd"] intValue]] objectAtIndex:1]]; - [o_t8_fld_destination setStringValue: [o_userSelections objectForKey:@"stmgDest"]]; - [o_t8_fld_ttl setStringValue: [o_userSelections objectForKey:@"ttl"]]; - if ([[o_userSelections objectForKey:@"sap"] isEqualToString: @"YES"]) - { - [o_t8_fld_sap setStringValue: [[_NS("yes") stringByAppendingString:@": "] stringByAppendingString:[o_userSelections objectForKey:@"sapText"]]]; - }else{ - [o_t8_fld_sap setStringValue: _NS("no")]; - } - } else { - /* we are transcoding */ - [o_t8_fld_strmgMthd setStringValue: @"-"]; - [o_t8_fld_destination setStringValue: @"-"]; - [o_t8_fld_ttl setStringValue: @"-"]; - [o_t8_fld_sap setStringValue: @"-"]; - if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"YES"]) - { - [o_t8_fld_trnscdVideo setStringValue: [[[[[_NS("yes") stringByAppendingString:@": "] stringByAppendingString: [[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] objectAtIndex:0]] stringByAppendingString:@" @ "] stringByAppendingString: [o_userSelections objectForKey:@"trnscdVideoBitrate"]] stringByAppendingString:@" kb/s"]]; - }else{ - [o_t8_fld_trnscdVideo setStringValue: _NS("no")]; - } - if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"]) - { - [o_t8_fld_trnscdAudio setStringValue: [[[[[_NS("yes") stringByAppendingString:@": "] stringByAppendingString: [[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] objectAtIndex:0]] stringByAppendingString:@" @ "] stringByAppendingString: [o_userSelections objectForKey:@"trnscdAudioBitrate"]] stringByAppendingString:@" kb/s"]]; - }else{ - [o_t8_fld_trnscdAudio setStringValue: _NS("no")]; - } - [o_t8_fld_saveFileTo setStringValue: [o_userSelections objectForKey:@"trnscdFilePath"]]; - } - [o_t8_fld_encapFormat setStringValue: [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:1]]; - - [self createOpts]; - [o_t8_fld_mrl setStringValue: [o_userSelections objectForKey:@"opts"]]; - - [o_tab_pageHolder selectTabViewItemAtIndex:7]; + [o_btn_forward setTitle: _NS("Finish")]; + [o_t8_fld_inptStream setStringValue:[o_userSelections objectForKey:@"pathToStrm"]]; + + if ([[o_userSelections objectForKey:@"partExtract"] isEqualToString: @"YES"]) + { + [o_t8_fld_partExtract setStringValue: [[[[[_NS("yes") stringByAppendingString:@" - "] stringByAppendingString: _NS("from ")] stringByAppendingString: [o_userSelections objectForKey:@"partExtractFrom"]] stringByAppendingString: _NS(" to ")] stringByAppendingString: [o_userSelections objectForKey:@"partExtractTo"]]]; + } else { + [o_t8_fld_partExtract setStringValue: _NS("no")]; + } + + if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) + { + /* we are streaming; no transcoding allowed atm */ + [o_t8_fld_saveFileTo setStringValue: @"-"]; + [o_t8_fld_trnscdAudio setStringValue: @"-"]; + [o_t8_fld_trnscdVideo setStringValue: @"-"]; + [o_t8_fld_strmgMthd setStringValue: [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey:@"stmgMhd"] intValue]] objectAtIndex:1]]; + [o_t8_fld_destination setStringValue: [o_userSelections objectForKey:@"stmgDest"]]; + [o_t8_fld_ttl setStringValue: [o_userSelections objectForKey:@"ttl"]]; + if ([[o_userSelections objectForKey:@"sap"] isEqualToString: @"YES"]) + { + [o_t8_fld_sap setStringValue: [[_NS("yes") stringByAppendingString:@": "] stringByAppendingString:[o_userSelections objectForKey:@"sapText"]]]; + }else{ + [o_t8_fld_sap setStringValue: _NS("no")]; + } + } else { + /* we are transcoding */ + [o_t8_fld_strmgMthd setStringValue: @"-"]; + [o_t8_fld_destination setStringValue: @"-"]; + [o_t8_fld_ttl setStringValue: @"-"]; + [o_t8_fld_sap setStringValue: @"-"]; + if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"YES"]) + { + [o_t8_fld_trnscdVideo setStringValue: [[[[[_NS("yes") stringByAppendingString:@": "] stringByAppendingString: [[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] objectAtIndex:0]] stringByAppendingString:@" @ "] stringByAppendingString: [o_userSelections objectForKey:@"trnscdVideoBitrate"]] stringByAppendingString:@" kb/s"]]; + }else{ + [o_t8_fld_trnscdVideo setStringValue: _NS("no")]; + } + if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"]) + { + [o_t8_fld_trnscdAudio setStringValue: [[[[[_NS("yes") stringByAppendingString:@": "] stringByAppendingString: [[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] objectAtIndex:0]] stringByAppendingString:@" @ "] stringByAppendingString: [o_userSelections objectForKey:@"trnscdAudioBitrate"]] stringByAppendingString:@" kb/s"]]; + }else{ + [o_t8_fld_trnscdAudio setStringValue: _NS("no")]; + } + [o_t8_fld_saveFileTo setStringValue: [o_userSelections objectForKey:@"trnscdFilePath"]]; + } + [o_t8_fld_encapFormat setStringValue: [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:1]]; + + [self createOpts]; + [o_t8_fld_mrl setStringValue: [o_userSelections objectForKey:@"opts"]]; + + [o_tab_pageHolder selectTabViewItemAtIndex:7]; } - (void) createOpts { - NSMutableString * o_opts_string = [NSMutableString stringWithString:@""]; - - if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"trnscd"]) - { - /* we are just transcoding and dumping the stuff to a file */ - NSMutableString *o_trnscdCmd = [NSMutableString stringWithString:@""]; - if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"YES"]) - { - [o_trnscdCmd appendString: @"transcode{"]; - [o_trnscdCmd appendFormat: @"vcodec=%s,vb=%i", [[[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] objectAtIndex:1] UTF8String], [[o_userSelections objectForKey:@"trnscdVideoBitrate"] intValue]]; - if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"]) - { - [o_trnscdCmd appendString: @","]; - } else - { - [o_trnscdCmd appendString: @"}:"]; - } - } - if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"]) - { - if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"NO"]) - { - /* in case we transcode the audio only, add this */ - [o_trnscdCmd appendString: @"transcode{"]; - } - [o_trnscdCmd appendFormat: @"acodec=%s,ab=%i}:", [[[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] objectAtIndex:1] UTF8String], [[o_userSelections objectForKey:@"trnscdAudioBitrate"] intValue]]; - } - [o_opts_string appendFormat: @":sout=#%sstandard{mux=%s,url=%s,access=file}", [o_trnscdCmd UTF8String], [[[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0] UTF8String], [[o_userSelections objectForKey:@"trnscdFilePath"] UTF8String]]; - - } else { - - /* we are streaming - no transcoding allowed atm, since we mirror the wx-wizard */ - if ([[o_userSelections objectForKey:@"sap"] isEqualToString:@"YES"]) - { - /* SAP-Announcement is requested */ - NSMutableString *o_sap_option = [NSMutableString stringWithString:@""]; - if([[o_userSelections objectForKey:@"sapText"] isEqualToString:@""]) - { - [o_sap_option appendString: @"sap"]; - } else { - [o_sap_option appendFormat: @"sap,name=\"%s\"",[[o_userSelections objectForKey:@"sapText"] UTF8String]]; - } - [o_opts_string appendFormat: @":sout=#standard{mux=%s,url=%s,access=%s,%s}", [[[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0] UTF8String], [[o_userSelections objectForKey:@"stmgDest"] UTF8String], [[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey:@"stmgMhd"] intValue]] objectAtIndex:0] UTF8String], [o_sap_option UTF8String]]; - } else { - /* no SAP, just streaming */ - [o_opts_string appendFormat: @":sout=#standard{mux=%s,url=%s,access=%s}", [[[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0] UTF8String], [[o_userSelections objectForKey:@"stmgDest"] UTF8String], [[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey:@"stmgMhd"] intValue]] objectAtIndex:0] UTF8String]]; - } - } - - [o_userSelections setObject:o_opts_string forKey:@"opts"]; + NSMutableString * o_opts_string = [NSMutableString stringWithString:@""]; + + if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"trnscd"]) + { + /* we are just transcoding and dumping the stuff to a file */ + NSMutableString *o_trnscdCmd = [NSMutableString stringWithString:@""]; + if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"YES"]) + { + [o_trnscdCmd appendString: @"transcode{"]; + [o_trnscdCmd appendFormat: @"vcodec=%s,vb=%i", [[[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] objectAtIndex:1] UTF8String], [[o_userSelections objectForKey:@"trnscdVideoBitrate"] intValue]]; + if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"]) + { + [o_trnscdCmd appendString: @","]; + } else + { + [o_trnscdCmd appendString: @"}:"]; + } + } + if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"]) + { + if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"NO"]) + { + /* in case we transcode the audio only, add this */ + [o_trnscdCmd appendString: @"transcode{"]; + } + [o_trnscdCmd appendFormat: @"acodec=%s,ab=%i}:", [[[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] objectAtIndex:1] UTF8String], [[o_userSelections objectForKey:@"trnscdAudioBitrate"] intValue]]; + } + [o_opts_string appendFormat: @":sout=#%sstandard{mux=%s,url=%s,access=file}", [o_trnscdCmd UTF8String], [[[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0] UTF8String], [[o_userSelections objectForKey:@"trnscdFilePath"] UTF8String]]; + + } else { + + /* we are streaming - no transcoding allowed atm, since we mirror the wx-wizard */ + if ([[o_userSelections objectForKey:@"sap"] isEqualToString:@"YES"]) + { + /* SAP-Announcement is requested */ + NSMutableString *o_sap_option = [NSMutableString stringWithString:@""]; + if([[o_userSelections objectForKey:@"sapText"] isEqualToString:@""]) + { + [o_sap_option appendString: @"sap"]; + } else { + [o_sap_option appendFormat: @"sap,name=\"%s\"",[[o_userSelections objectForKey:@"sapText"] UTF8String]]; + } + [o_opts_string appendFormat: @":sout=#standard{mux=%s,url=%s,access=%s,%s}", [[[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0] UTF8String], [[o_userSelections objectForKey:@"stmgDest"] UTF8String], [[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey:@"stmgMhd"] intValue]] objectAtIndex:0] UTF8String], [o_sap_option UTF8String]]; + } else { + /* no SAP, just streaming */ + [o_opts_string appendFormat: @":sout=#standard{mux=%s,url=%s,access=%s}", [[[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0] UTF8String], [[o_userSelections objectForKey:@"stmgDest"] UTF8String], [[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey:@"stmgMhd"] intValue]] objectAtIndex:0] UTF8String]]; + } + } + + [o_userSelections setObject:o_opts_string forKey:@"opts"]; } - (IBAction)prevTab:(id)sender { if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Summary"]) - { - /* check whether we are streaming or transcoding and go back */ - if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) - { - /* show "Streaming 2" */ - [o_tab_pageHolder selectTabViewItemAtIndex:5]; - }else{ - /* show "Transcode 2" */ - [o_tab_pageHolder selectTabViewItemAtIndex:6]; - } - /* rename the forward-button */ - [o_btn_forward setTitle: _NS("Next")]; - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Transcode 2"]) - { - /* show "Encap" */ - [o_tab_pageHolder selectTabViewItemAtIndex:4]; - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Streaming 2"]) - { - /* show "Encap" */ - [o_tab_pageHolder selectTabViewItemAtIndex:4]; - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Encap"]) - { - /* check whether we are streaming or transcoding and go back */ - if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) - { - /* show "Streaming 1" */ - [o_tab_pageHolder selectTabViewItemAtIndex:2]; - }else{ - /* show "Transcode 2" */ - [o_tab_pageHolder selectTabViewItemAtIndex:3]; - } - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Streaming 1"]) - { - /* show "Input" */ - [o_tab_pageHolder selectTabViewItemAtIndex:1]; - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Transcode 1"]) - { - /* show "Input" */ - [o_tab_pageHolder selectTabViewItemAtIndex:1]; - } - else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Input"]) - { - /* show "Hello" */ - [o_tab_pageHolder selectTabViewItemAtIndex:0]; - /* disable backwards-btn */ - [o_btn_backward setEnabled:NO]; - } + { + /* check whether we are streaming or transcoding and go back */ + if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) + { + /* show "Streaming 2" */ + [o_tab_pageHolder selectTabViewItemAtIndex:5]; + }else{ + /* show "Transcode 2" */ + [o_tab_pageHolder selectTabViewItemAtIndex:6]; + } + /* rename the forward-button */ + [o_btn_forward setTitle: _NS("Next")]; + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Transcode 2"]) + { + /* show "Encap" */ + [o_tab_pageHolder selectTabViewItemAtIndex:4]; + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Streaming 2"]) + { + /* show "Encap" */ + [o_tab_pageHolder selectTabViewItemAtIndex:4]; + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Encap"]) + { + /* check whether we are streaming or transcoding and go back */ + if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"]) + { + /* show "Streaming 1" */ + [o_tab_pageHolder selectTabViewItemAtIndex:2]; + }else{ + /* show "Transcode 2" */ + [o_tab_pageHolder selectTabViewItemAtIndex:3]; + } + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Streaming 1"]) + { + /* show "Input" */ + [o_tab_pageHolder selectTabViewItemAtIndex:1]; + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Transcode 1"]) + { + /* show "Input" */ + [o_tab_pageHolder selectTabViewItemAtIndex:1]; + } + else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: @"Input"]) + { + /* show "Hello" */ + [o_tab_pageHolder selectTabViewItemAtIndex:0]; + /* disable backwards-btn */ + [o_btn_backward setEnabled:NO]; + } } - (IBAction)t1_mrInfo_streaming:(id)sender { /* show a sheet for the help */ - /* since NSAlert does not exist on OSX < 10.3, we use our own implementation */ - [o_wh_txt_title setStringValue: _NS("Stream to network")]; - [o_wh_txt_text setStringValue: _NS("Use this to stream on a network.")]; - [NSApp beginSheet: o_wizardhelp_window + /* since NSAlert does not exist on OSX < 10.3, we use our own implementation */ + [o_wh_txt_title setStringValue: _NS("Stream to network")]; + [o_wh_txt_text setStringValue: _NS("Use this to stream on a network.")]; + [NSApp beginSheet: o_wizardhelp_window modalForWindow: o_wizard_window modalDelegate: o_wizardhelp_window didEndSelector: nil @@ -1068,13 +1068,13 @@ static VLCWizard *_o_sharedInstance = nil; - (IBAction)t1_mrInfo_transcode:(id)sender { /* show a sheet for the help */ - [o_wh_txt_title setStringValue: _NS("Transcode/Save to file")]; - [o_wh_txt_text setStringValue: _NS("Use this to save a stream to a file. You "\ - "have the possibility to reencode the stream. You can save whatever "\ - "VLC can read.\nPlease notice that VLC is not very suited " \ - "for file to file transcoding. You should use its transcoding " \ + [o_wh_txt_title setStringValue: _NS("Transcode/Save to file")]; + [o_wh_txt_text setStringValue: _NS("Use this to save a stream to a file. You "\ + "have the possibility to reencode the stream. You can save whatever "\ + "VLC can read.\nPlease notice that VLC is not very suited " \ + "for file to file transcoding. You should use its transcoding " \ "features to save network streams, for example.")]; - [NSApp beginSheet: o_wizardhelp_window + [NSApp beginSheet: o_wizardhelp_window modalForWindow: o_wizard_window modalDelegate: o_wizardhelp_window didEndSelector: nil @@ -1101,17 +1101,17 @@ static VLCWizard *_o_sharedInstance = nil; /* enable and disable the respective items depending on user's choice */ NSString *o_mode; o_mode = [[o_t2_matrix_inputSourceType selectedCell] title]; - - if( [o_mode isEqualToString: _NS("Select a stream")] ) + + if( [o_mode isEqualToString: _NS("Select a stream")] ) { - [o_t2_btn_chooseFile setEnabled:YES]; - [o_t2_fld_pathToNewStrm setEnabled:YES]; - [o_t2_tbl_plst setEnabled:NO]; - } else { - [o_t2_btn_chooseFile setEnabled:NO]; - [o_t2_fld_pathToNewStrm setEnabled:NO]; - [o_t2_tbl_plst setEnabled:YES]; - } + [o_t2_btn_chooseFile setEnabled:YES]; + [o_t2_fld_pathToNewStrm setEnabled:YES]; + [o_t2_tbl_plst setEnabled:NO]; + } else { + [o_t2_btn_chooseFile setEnabled:NO]; + [o_t2_fld_pathToNewStrm setEnabled:NO]; + [o_t2_tbl_plst setEnabled:YES]; + } } - (IBAction)t2_enableExtract:(id)sender @@ -1124,41 +1124,41 @@ static VLCWizard *_o_sharedInstance = nil; } else { [o_t2_fld_prtExtrctFrom setEnabled:NO]; [o_t2_fld_prtExtrctTo setEnabled:NO]; - [o_t2_fld_prtExtrctFrom setStringValue:@""]; - [o_t2_fld_prtExtrctTo setStringValue:@""]; + [o_t2_fld_prtExtrctFrom setStringValue:@""]; + [o_t2_fld_prtExtrctTo setStringValue:@""]; } } - (IBAction)t3_strmMthdChanged:(id)sender { - /* change the captions of o_t3_txt_destInfo according to the chosen - * streaming method */ - NSNumber * o_mode; - o_mode = [[NSNumber alloc] initWithInt:[[o_t3_matrix_stmgMhd selectedCell] tag]]; - if( [o_mode intValue] == 2 ) - { - /* HTTP */ - [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:0] objectAtIndex:2]]; - [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:0] objectAtIndex:3]]; - } - else if( [o_mode intValue] == 1 ) - { - /* UDP-Multicast */ - [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:1] objectAtIndex:2]]; - [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:1] objectAtIndex:3]]; - } - else if( [o_mode intValue] == 0 ) - { - /* UDP-Unicast */ - [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:2] objectAtIndex:2]]; - [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:2] objectAtIndex:3]]; } - [o_mode release]; + /* change the captions of o_t3_txt_destInfo according to the chosen + * streaming method */ + NSNumber * o_mode; + o_mode = [[NSNumber alloc] initWithInt:[[o_t3_matrix_stmgMhd selectedCell] tag]]; + if( [o_mode intValue] == 2 ) + { + /* HTTP */ + [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:0] objectAtIndex:2]]; + [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:0] objectAtIndex:3]]; + } + else if( [o_mode intValue] == 1 ) + { + /* UDP-Multicast */ + [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:1] objectAtIndex:2]]; + [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:1] objectAtIndex:3]]; + } + else if( [o_mode intValue] == 0 ) + { + /* UDP-Unicast */ + [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:2] objectAtIndex:2]]; + [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:2] objectAtIndex:3]]; } + [o_mode release]; } - (IBAction)t4_AudCdcChanged:(id)sender { /* update codec info */ - [o_t4_txt_hintAudio setStringValue:[[o_audioCodecs objectAtIndex:[o_t4_pop_audioCodec indexOfSelectedItem]] objectAtIndex:2]]; + [o_t4_txt_hintAudio setStringValue:[[o_audioCodecs objectAtIndex:[o_t4_pop_audioCodec indexOfSelectedItem]] objectAtIndex:2]]; } - (IBAction)t4_enblAudTrnscd:(id)sender @@ -1168,13 +1168,13 @@ static VLCWizard *_o_sharedInstance = nil; { [o_t4_pop_audioCodec setEnabled:YES]; [o_t4_pop_audioBitrate setEnabled:YES]; - [o_t4_txt_hintAudio setStringValue: _NS("Select your audio codec. "\ - "Click one to get more information.")]; + [o_t4_txt_hintAudio setStringValue: _NS("Select your audio codec. "\ + "Click one to get more information.")]; } else { [o_t4_pop_audioCodec setEnabled:NO]; [o_t4_pop_audioBitrate setEnabled:NO]; - [o_t4_txt_hintAudio setStringValue: _NS("If your stream has audio " \ - "and you want to transcode it, enable this.")]; + [o_t4_txt_hintAudio setStringValue: _NS("If your stream has audio " \ + "and you want to transcode it, enable this.")]; } } @@ -1185,20 +1185,20 @@ static VLCWizard *_o_sharedInstance = nil; { [o_t4_pop_videoCodec setEnabled:YES]; [o_t4_pop_videoBitrate setEnabled:YES]; - [o_t4_txt_hintVideo setStringValue: _NS("Select your video codec. "\ - "Click one to get more information.")]; + [o_t4_txt_hintVideo setStringValue: _NS("Select your video codec. "\ + "Click one to get more information.")]; } else { [o_t4_pop_videoCodec setEnabled:NO]; [o_t4_pop_videoBitrate setEnabled:NO]; - [o_t4_txt_hintVideo setStringValue: _NS("If your stream has video " \ - "and you want to transcode it, enable this.")]; + [o_t4_txt_hintVideo setStringValue: _NS("If your stream has video " \ + "and you want to transcode it, enable this.")]; } } - (IBAction)t4_VidCdcChanged:(id)sender { /* update codec info */ - [o_t4_txt_hintVideo setStringValue:[[o_videoCodecs objectAtIndex:[o_t4_pop_videoCodec indexOfSelectedItem]] objectAtIndex:2]]; + [o_t4_txt_hintVideo setStringValue:[[o_videoCodecs objectAtIndex:[o_t4_pop_videoCodec indexOfSelectedItem]] objectAtIndex:2]]; } - (IBAction)t6_enblSapAnnce:(id)sender @@ -1216,12 +1216,12 @@ static VLCWizard *_o_sharedInstance = nil; - (IBAction)t6_mrInfo_ttl:(id)sender { /* show a sheet for the help */ - [o_wh_txt_title setStringValue: _NS("Time-To-Live (TTL)")]; - [o_wh_txt_text setStringValue: _NS("Define the TTL (Time-To-Live) of the stream. "\ - "This parameter is the maximum number of routers your stream can go " - "through. If you don't know what it means, or if you want to stream on " \ - "your local network only, leave this setting to 1.")]; - [NSApp beginSheet: o_wizardhelp_window + [o_wh_txt_title setStringValue: _NS("Time-To-Live (TTL)")]; + [o_wh_txt_text setStringValue: _NS("Define the TTL (Time-To-Live) of the stream. "\ + "This parameter is the maximum number of routers your stream can go " + "through. If you don't know what it means, or if you want to stream on " \ + "your local network only, leave this setting to 1.")]; + [NSApp beginSheet: o_wizardhelp_window modalForWindow: o_wizard_window modalDelegate: o_wizardhelp_window didEndSelector: nil @@ -1231,14 +1231,14 @@ static VLCWizard *_o_sharedInstance = nil; - (IBAction)t6_mrInfo_sap:(id)sender { /* show a sheet for the help */ - [o_wh_txt_title setStringValue: _NS("SAP Announce")]; - [o_wh_txt_text setStringValue: _NS("When streaming using UDP, you can " \ - "announce your streams using the SAP/SDP announcing protocol. This " \ - "way, the clients won't have to type in the multicast address, it " \ - "will appear in their playlist if they enable the SAP extra interface.\n" \ - "If you want to give a name to your stream, enter it here, " \ - "else, a default name will be used.")]; - [NSApp beginSheet: o_wizardhelp_window + [o_wh_txt_title setStringValue: _NS("SAP Announce")]; + [o_wh_txt_text setStringValue: _NS("When streaming using UDP, you can " \ + "announce your streams using the SAP/SDP announcing protocol. This " \ + "way, the clients won't have to type in the multicast address, it " \ + "will appear in their playlist if they enable the SAP extra interface.\n" \ + "If you want to give a name to your stream, enter it here, " \ + "else, a default name will be used.")]; + [NSApp beginSheet: o_wizardhelp_window modalForWindow: o_wizard_window modalDelegate: o_wizardhelp_window didEndSelector: nil @@ -1250,8 +1250,8 @@ static VLCWizard *_o_sharedInstance = nil; /* provide a save-to-dialogue, so the user can choose a location for his/her new file */ NSSavePanel * savePanel = [NSSavePanel savePanel]; SEL sel = @selector(t7_getTrnscdDestFile:returnCode:contextInfo:); - [savePanel setRequiredFileType:[[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0]]; - [savePanel setCanSelectHiddenExtension:YES]; + [savePanel setRequiredFileType:[[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0]]; + [savePanel setCanSelectHiddenExtension:YES]; [savePanel beginSheetForDirectory:nil file:nil modalForWindow:o_wizard_window modalDelegate:self didEndSelector:sel contextInfo:nil]; } @@ -1259,16 +1259,16 @@ static VLCWizard *_o_sharedInstance = nil; { if (returnCode == NSOKButton) { - /* output returned path to text-field */ + /* output returned path to text-field */ [o_t7_fld_filePath setStringValue:[sheet filename]]; } } - (IBAction)wh_closeSheet:(id)sender { - /* close the help sheet */ - [NSApp endSheet:o_wizardhelp_window]; - [o_wizardhelp_window close]; + /* close the help sheet */ + [NSApp endSheet:o_wizardhelp_window]; + [o_wizardhelp_window close]; } @end