/*****************************************************************************
- * 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 ../wxwidgets/wizard.cpp and
+ * ../wxwidgets/streamdata.h; both written by Clément Stenac.
*****************************************************************************/
-/* TODO:
- - fill the playlist-table on t2
- - see FIXME's
-*/
-
/*****************************************************************************
* Preamble
_NS("DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"), \
@"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO", \
@"NO", @"NO", nil];
- o_h263 = [NSArray arrayWithObjects: @"H 263", @"H263", \
+ o_h263 = [NSArray arrayWithObjects: @"H.263", @"h263", \
_NS("H263 is a video codec optimized for videoconference " \
"(low rates, useable with MPEG TS)"), @"MUX_TS", @"NO", @"NO", @"NO", \
@"NO", @"NO", @"NO", @"NO", @"NO", nil];
- o_h264 = [NSArray arrayWithObjects: @"H 264", @"H264", \
+ o_h264 = [NSArray arrayWithObjects: @"H.264", @"h264", \
_NS("H264 is a new video codec (useable with MPEG TS and MP4)"), \
@"MUX_TS", @"MUX_MP4", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", \
@"NO", nil];
o_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;
@"-1", nil];
o_spx = [NSArray arrayWithObjects: @"Speex", @"spx", \
_NS("A free audio codec dedicated to compression of voice (useable " \
- "with OGG"), @"MUX_OGG", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", \
+ "with OGG)"), @"MUX_OGG", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", \
@"-1", @"-1", nil];
o_s16l = [NSArray arrayWithObjects: @"Uncompressed, integer", @"s16l", \
_NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV", \
@"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
NSArray * o_mp4;
NSArray * o_mov;
NSArray * o_wav;
+ NSArray * o_asfh;
o_ps = [NSArray arrayWithObjects: @"ps", @"MPEG PS", \
- _NS("MPEG Program Stream"), nil];
+ _NS("MPEG Program Stream"), @"mpg", nil];
o_ts = [NSArray arrayWithObjects: @"ts", @"MPEG TS", \
_NS("MPEG Transport Stream"), nil];
o_mpeg = [NSArray arrayWithObjects: @"ps", @"MPEG 1", \
- _NS("MPEG 1 Format"), nil];
+ _NS("MPEG 1 Format"), @"mpg", nil];
o_ogg = [NSArray arrayWithObjects: @"ogg", @"OGG", @"OGG", nil];
o_raw = [NSArray arrayWithObjects: @"raw", @"RAW", @"RAW", nil];
o_asf = [NSArray arrayWithObjects: @"asf", @"ASF", @"ASF", nil];
o_mp4 = [NSArray arrayWithObjects: @"mp4", @"MP4", @"MPEG4", nil];
o_mov = [NSArray arrayWithObjects: @"mov", @"MOV", @"MOV", nil];
o_wav = [NSArray arrayWithObjects: @"wav", @"WAV", @"WAV", nil];
+ o_asfh = [NSArray arrayWithObjects: @"asfh", @"ASFH", @"ASFH", nil];
o_encapFormats = [[NSArray alloc] initWithObjects: o_ps, o_ts, o_mpeg, \
- o_ogg, o_raw, o_asf, o_avi, o_mp4, o_mov, o_wav, nil];
+ o_ogg, o_raw, o_asf, o_avi, o_mp4, o_mov, o_wav, o_asfh, nil];
/* yet another array on streaming methods including help texts */
NSArray * o_http;
+ NSArray * o_mms;
NSArray * o_udp_uni;
NSArray * o_udp_multi;
+ NSArray * o_rtp_uni;
+ NSArray * o_rtp_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 " \
"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_mms = [NSArray arrayWithObjects: @"mmsh", @"MMS", _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 " \
+ "mms://yourip:8080 by default."), _NS("Use this to stream to several " \
+ "computers using the Microsoft MMS protocol. This protocol is used as " \
+ "transport method by many Microsoft's softwares. Note that only a " \
+ "small part of the MMS protocol is supported (MMS encapsulated in " \
+ "HTTP)." ), 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_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, " \
"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 " \
+ o_rtp_uni = [NSArray arrayWithObjects: @"rtp", @"RTP-Unicast", _NS("Enter the " \
+ "address of the computer to stream to.") , _NS("Use this to stream " \
"to a single computer."), nil];
- o_strmgMthds = [[NSArray alloc] initWithObjects: o_http, o_udp_multi, o_udp_uni, nil];
+ o_rtp_multi = [NSArray arrayWithObjects: @"rtp", @"RTP-Multicast", _NS("Enter " \
+ "the multicast address to stream to in this field. This must be an IP " \
+ "address between 224.0.0.0 and 239.255.255.255. For a private use, " \
+ "enter an address beginning with 239.255."), _NS("Use this to stream " \
+ "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_strmgMthds = [[NSArray alloc] initWithObjects: o_http, o_mms, \
+ o_udp_uni, o_udp_multi, o_rtp_uni, o_rtp_multi, nil];
}
- (void)showWizard
/* just present the window to the user */
[o_tab_pageHolder selectFirstTabViewItem:self];
- [self resetWizard];
-
[o_wizard_window center];
[o_wizard_window displayIfNeeded];
[o_wizard_window makeKeyAndOrderFront:nil];
/* "Streaming 1" */
[o_t3_fld_address setStringValue: @""];
[o_t3_matrix_stmgMhd selectCellAtRow:0 column:0];
+ [[o_t3_matrix_stmgMhd cellAtRow:0 column:1] setState: NSOffState];
[[o_t3_matrix_stmgMhd cellAtRow:1 column:1] setState: NSOffState];
[[o_t3_matrix_stmgMhd cellAtRow:1 column:2] setState: NSOffState];
- (void)initStrings
{
/* localise all strings to the users lang */
- /* method is called from intf.m (in method openWizard) */
+ /* method is called from intf.m (in method showWizard) */
/* general items */
[o_btn_backward setTitle: _NS("Back")];
setStringValue: _NS("Author")];
[o_t2_box_prtExtrct setTitle: _NS("Partial Extract")];
[o_t2_ckb_enblPartExtrct setTitle: _NS("Enable")];
- [o_t2_ckb_enblPartExtrct setToolTip: _NS("Use this to read only a part of " \
+ [o_t2_ckb_enblPartExtrct setToolTip: _NS("Use this to read only a part of "\
"the stream. You must be able to control the incoming stream " \
- "(for example, a file or a disc, but not an UDP network stream.)\n" \
+ "(for example, a file or a disc, but not an UDP network stream.) " \
"Enter the starting and ending times (in seconds).")];
[o_t2_txt_prtExtrctFrom setStringValue: _NS("From")];
[o_t2_txt_prtExtrctTo setStringValue: _NS("To")];
[o_t3_box_strmgMthd setTitle: _NS("Streaming method")];
[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_matrix_stmgMhd cellAtRow:0 column:0] setTitle: _NS("UDP Unicast")];
+ [[o_t3_matrix_stmgMhd cellAtRow:0 column:1] setTitle: _NS("UDP Multicast")];
[o_t3_txt_strgMthdInfo setStringValue: _NS("Use this to stream to a single " \
"computer.")];
[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")];
+ [o_t6_ckb_local setTitle: _NS("Local playback")];
+ [o_t6_btn_mrInfo_local 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.")];
+ "additional parameters for your transcoding.")];
[o_t7_txt_saveFileTo setStringValue: _NS("Select the file to save to")];
[o_t7_btn_chooseFile setTitle: _NS("Choose...")];
+ [o_t7_ckb_local setTitle: _NS("Local playback")];
+ [o_t7_btn_mrInfo_local setTitle: _NS("More Info")];
/* page eight ("Summary") */
[o_t8_txt_text setStringValue: _NS("This page lists all your selections. " \
stringByAppendingString: @":"]];
[o_t8_txt_trnscdVideo setStringValue: [_NS("Transcode video") \
stringByAppendingString: @":"]];
+ [o_t8_txt_local setStringValue: [_NS("Local playback") \
+ stringByAppendingString: @":"]];
/* wizard help window */
[o_wh_btn_okay setTitle: _NS("OK")];
}
+- (void)initWithExtractValuesFrom: (NSString *)from to: (NSString *)to \
+ ofItem: (NSString *)item
+{
+ [self resetWizard];
+ msg_Dbg(VLCIntf, "wizard was reseted");
+ [o_userSelections setObject:@"trnscd" forKey:@"trnscdOrStrmg"];
+ [o_btn_backward setEnabled:YES];
+ [o_tab_pageHolder selectTabViewItemAtIndex:1];
+ [o_t2_fld_prtExtrctFrom setStringValue: from];
+ [o_t2_fld_prtExtrctTo setStringValue: to];
+ [o_t2_fld_pathToNewStrm setStringValue: item];
+ [o_t1_matrix_strmgOrTrnscd selectCellAtRow:1 column:0];
+ [[o_t1_matrix_strmgOrTrnscd cellAtRow:0 column:0] setState: NSOffState];
+ [o_t2_ckb_enblPartExtrct setState: NSOnState];
+ [self t2_enableExtract: nil];
+ msg_Dbg(VLCIntf, "wizard interface is set");
+
+ [o_wizard_window center];
+ [o_wizard_window display];
+ [o_wizard_window makeKeyAndOrderFront:nil];
+ msg_Dbg(VLCIntf, "wizard window displayed");
+}
+
- (IBAction)cancelRun:(id)sender
{
[o_wizard_window close];
[o_tab_pageHolder selectTabViewItemAtIndex:2];
}else{
/* we are just transcoding */
+
+ /* rebuild the menues for the codec-selections */
+ [self rebuildCodecMenus];
+
[o_tab_pageHolder selectTabViewItemAtIndex:3];
}
} 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 a valid playlist " \
- "item. VLC is unable to guess, which input you want use. "\
- "\n\n Choose one before going to the next page."));
+ _NS("You have selected neither a new stream nor a valid " \
+ "playlist item. VLC is unable to guess, which input you " \
+ "want use.\n\nChoose one before going to the next page."));
}
}
else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
@"Streaming 1"])
{
+ /* rebuild the menues for the codec-selections */
+ [self rebuildCodecMenus];
+
/* 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"] )
+ int mode;
+ mode = [[o_t3_matrix_stmgMhd selectedCell] tag];
+ if( mode == 0 )
{
+ /* HTTP Streaming */
[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];
+
+ /* disable all codecs which don't support MPEG PS, MPEG TS, MPEG 1,
+ * OGG, RAW or ASF */
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Uncompressed, integer"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Uncompressed, floating"];
+
+ } else if ( mode == 1 )
+ {
+ /* MMS Streaming */
+ [o_userSelections setObject:@"1" forKey:@"stmgMhd"];
+
+ /* disable all codecs which don't support ASF / ASFH */
+ [o_t4_pop_audioCodec removeItemWithTitle:@"MPEG 4 Audio"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Vorbis"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"FLAC"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Speex"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Uncompressed, integer"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Uncompressed, floating"];
+
+ [o_t4_pop_videoCodec removeItemWithTitle:@"MPEG-1 Video"];
+ [o_t4_pop_videoCodec removeItemWithTitle:@"MPEG-2 Video"];
+ [o_t4_pop_videoCodec removeItemWithTitle:@"H.263"];
+ [o_t4_pop_videoCodec removeItemWithTitle:@"H.264"];
+ [o_t4_pop_videoCodec removeItemWithTitle:@"MJPEG"];
+ [o_t4_pop_videoCodec removeItemWithTitle:@"Theora"];
} 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];
+ /* RTP/UDP Unicast/Multicast Streaming */
+
+ [o_userSelections setObject: [[NSNumber numberWithInt: mode] \
+ stringValue] forKey:@"stmgMhd"];
+
+ /* disable all codecs which don't support MPEG-TS */
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Vorbis"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"FLAC"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Speex"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Uncompressed, integer"];
+ [o_t4_pop_audioCodec removeItemWithTitle:@"Uncompressed, floating"];
}
/* store the destination and check whether is it empty */
- if(! [o_mode isEqualToString: @"HTTP"] )
+ if([[o_userSelections objectForKey:@"stmgMhd"] intValue] >=2 )
{
- /* empty field is valid for HTTP */
+ /* empty field is valid for HTTP and MMS */
if( [[o_t3_fld_address stringValue] isEqualToString: @""] )
{
/* complain to the user that "" is no valid dest. */
_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."));
+ "\n\nIf 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];
+ /* let's go to the transcode-1-tab */
+ [o_tab_pageHolder selectTabViewItemAtIndex:3];
}
} else {
[o_userSelections setObject:[o_t3_fld_address stringValue] \
forKey:@"stmgDest"];
- /* let's go to the encap-tab */
- [o_tab_pageHolder selectTabViewItemAtIndex:4];
+ /* let's go to the transcode-1-tab */
+ [o_tab_pageHolder selectTabViewItemAtIndex:3];
}
}
else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
[[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:10 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
}
} 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 */
+ * -> enabled the encap-formats allowed when streaming content via
+ * http plus MP4 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 */
+ /* enable MPEG PS, MPEG TS, MPEG 1, OGG, RAW, ASF, MP4 and MOV
+ * 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: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:YES];
+ [[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES];
+ [[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO];
+ [[o_t5_matrix_encap cellAtRow:10 column:0] setEnabled:NO];
+ [o_t5_matrix_encap selectCellAtRow:0 column:0];
+ }
+
+ if ( [o_userSelections objectForKey:@"stmgMhd"] == @"1" )
+ {
+ /* if MMS is the streaming protocol, only ASFH is available */
+ [[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];
- [o_t5_matrix_encap selectCellAtRow:0 column:0];
+ [[o_t5_matrix_encap cellAtRow:10 column:0] setEnabled:YES];
+ [o_t5_matrix_encap selectCellAtRow:10 column:0];
+ }
+ else if ( [o_userSelections objectForKey:@"stmgMhd"] == @"0" )
+ {
+ /* if HTTP is the streaming protocol, disable all unsupported
+ * encap-formats, but don't touch the other ones selected above */
+ [[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:10 column:0] setEnabled:NO];
+ }
+ else if ( [[o_userSelections objectForKey:@"stmgMhd"] intValue] >= 2 )
+ {
+ /* if UDP/RTP is the streaming protocol, only MPEG-TS is available */
+ [[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:10 column:0] setEnabled:NO];
+ [[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES];
+ [o_t5_matrix_encap selectCellAtRow:1 column:0];
}
int x;
BOOL anythingEnabled;
}
if (anythingEnabled == YES)
{
- [o_tab_pageHolder selectTabViewItemAtIndex:4];
+ /* go the encap-tab */
+ [o_tab_pageHolder selectTabViewItemAtIndex:4];
} else {
/* show a sheet that the selected codecs are not compatible */
NSBeginInformationalAlertSheet(_NS("Invalid selection"), _NS("OK"), \
} else {
[o_userSelections setObject:@"NO" forKey:@"sap"];
}
-
+
+ /* local playback? */
+ if ([o_t6_ckb_local state] == NSOnState)
+ {
+ [o_userSelections setObject:@"YES" forKey:@"localPb"];
+ } else {
+ [o_userSelections setObject:@"NO" forKey:@"localPb"];
+ }
+
/* go to "Summary" */
[self showSummary];
}
else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
@"Transcode 2"])
{
+ /* local playback? */
+ if ([o_t7_ckb_local state] == NSOnState)
+ {
+ [o_userSelections setObject:@"YES" forKey:@"localPb"];
+ } else {
+ [o_userSelections setObject:@"NO" forKey:@"localPb"];
+ }
+
/* 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. \n\n Enter either " \
+ "need to select a file, you want to save to.\n\nEnter either " \
"a valid path or choose a location through the button's " \
"dialog-box."));
} else {
[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);
}
}
+- (void)rebuildCodecMenus
+{
+ [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);
+ }
+ [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);
+ }
+}
+
- (void)showSummary
{
[o_btn_forward setTitle: _NS("Finish")];
[o_t8_fld_inptStream setStringValue:[o_userSelections objectForKey:@"pathToStrm"]];
+
+ if ([[o_userSelections objectForKey:@"localPb"] isEqualToString: @"YES"])
+ {
+ [o_t8_fld_local setStringValue: _NS("yes")];
+ } else {
+ [o_t8_fld_local setStringValue: _NS("no")];
+ }
if ([[o_userSelections objectForKey:@"partExtract"] isEqualToString: @"YES"])
{
[o_t8_fld_partExtract setStringValue: _NS("no")];
}
+ 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")];
+ }
+
+
if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"])
{
- /* we are streaming; no transcoding allowed atm */
+ /* we are streaming and perhaps also transcoding */
[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_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"]];
}
- (void) createOpts
{
NSMutableString * o_opts_string = [NSMutableString stringWithString:@""];
-
- if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"trnscd"])
+ NSMutableString *o_trnscdCmd = [NSMutableString stringWithString:@""];
+ NSMutableString *o_duplicateCmd = [NSMutableString stringWithString:@""];
+
+ /* check whether we transcode the audio and/or the video and compose a
+ * string reflecting the settings, if needed */
+ if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"YES"])
{
- /* 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: @"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: @"}:"];
- }
+ [o_trnscdCmd appendString: @","];
+ }
+ else
+ {
+ [o_trnscdCmd appendString: @"}:"];
}
- if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"])
+ }
+
+ /* check whether the user requested local playback. if yes, prepare the
+ * string, if not, let it empty */
+ if ([[o_userSelections objectForKey:@"localPb"] isEqualToString:@"YES"])
+ {
+ [o_duplicateCmd appendString: @"duplicate{dst=display,dst=\""];
+ }
+
+ if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"])
+ {
+ if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"NO"])
{
- 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]];
+ /* in case we transcode the audio only, add this */
+ [o_trnscdCmd appendString: @"transcode{"];
}
- [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]];
+ [o_trnscdCmd appendFormat: @"acodec=%s,ab=%i}:", [[[o_audioCodecs \
+ objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] \
+ intValue]] objectAtIndex:1] UTF8String], [[o_userSelections \
+ objectForKey:@"trnscdAudioBitrate"] intValue]];
+ }
+
+ if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"trnscd"])
+ {
+ /* we are just transcoding and dumping the stuff to a file */
+ [o_opts_string appendFormat: \
+ @":sout=#%s%sstandard{mux=%s,url=%s,access=file}", [o_duplicateCmd \
+ UTF8String], [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 */
+ /* we are streaming */
if ([[o_userSelections objectForKey:@"sap"] isEqualToString:@"YES"])
{
/* SAP-Announcement is requested */
[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]];
+ [o_opts_string appendFormat: \
+ @":sout=#%s%sstandard{mux=%s,url=%s,access=%s,%s}", \
+ [o_duplicateCmd UTF8String], [o_trnscdCmd UTF8String], \
+ [[[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_opts_string appendFormat: \
+ @":sout=#%s%sstandard{mux=%s,url=%s,access=%s}", \
+ [o_duplicateCmd UTF8String], [o_trnscdCmd UTF8String], \
+ [[[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]];
}
}
+ /* check whether the user requested local playback. if yes, close the
+ * string with an additional bracket */
+ if ([[o_userSelections objectForKey:@"localPb"] isEqualToString:@"YES"])
+ {
+ [o_opts_string appendString: @"\"}"];
+ }
+
[o_userSelections setObject:o_opts_string forKey:@"opts"];
}
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];
- }
+ /* show "Transcode 1" */
+ [o_tab_pageHolder selectTabViewItemAtIndex:3];
}
else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
@"Streaming 1"])
else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
@"Transcode 1"])
{
- /* show "Input" */
- [o_tab_pageHolder selectTabViewItemAtIndex:1];
+ if ([[o_userSelections objectForKey:@"trnscdOrStrmg"] isEqualToString:@"strmg"])
+ {
+ /* show "Streaming 1" */
+ [o_tab_pageHolder selectTabViewItemAtIndex:2];
+ }else{
+ /* show "Input" */
+ [o_tab_pageHolder selectTabViewItemAtIndex:1];
+ }
}
else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
@"Input"])
{
+ /* reset the wizard before going backwards. Otherwise, we might get
+ * unwanted behaviours in the Encap-Selection */
+ [self resetWizard];
/* show "Hello" */
[o_tab_pageHolder selectTabViewItemAtIndex:0];
/* disable backwards-btn */
{
/* 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 )
+ int mode;
+ mode = [[o_t3_matrix_stmgMhd selectedCell] tag];
+ if( mode == 0 )
{
/* HTTP */
[o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:0] \
[o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:0] \
objectAtIndex:3]];
}
- else if( [o_mode intValue] == 1 )
+ else if( mode == 1 )
{
- /* UDP-Multicast */
+ /* MMS */
[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 )
+ else if( mode == 2 )
{
/* UDP-Unicast */
[o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:2] \
[o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:2] \
objectAtIndex:3]];
}
- [o_mode release];
+ else if( mode == 3 )
+ {
+ /* UDP-Multicast */
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:3] \
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:3] \
+ objectAtIndex:3]];
+ }
+ else if( mode == 4 )
+ {
+ /* RTP-Unicast */
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:4] \
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:4] \
+ objectAtIndex:3]];
+ }
+ else if( mode == 5 )
+ {
+ /* RTP-Multicast */
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:5] \
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:5] \
+ objectAtIndex:3]];
+ }
}
- (IBAction)t4_AudCdcChanged:(id)sender
contextInfo: nil];
}
+- (IBAction)t67_mrInfo_local:(id)sender
+{
+ /* show a sheet for the help */
+ NSBeginInformationalAlertSheet(_NS("Local playback"), \
+ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
+ _NS("When this option is enabled, the stream will be both played " \
+ "and transcoded/streamed.\n\nNote that this requires much more " \
+ "CPU power than simple transcoding or streaming."));
+}
+
- (IBAction)t7_selectTrnscdDestFile:(id)sender
{
/* 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]];
+ NSString * theEncapFormat = [[o_encapFormats objectAtIndex: \
+ [[o_userSelections objectForKey:@"encapFormat"] intValue]] \
+ objectAtIndex:0];
+
+ /* don't use ".ps" as suffix, since the OSX Finder confuses our creations
+ * with PostScript-files and wants to open them with Preview.app */
+ if (theEncapFormat != @"ps")
+ {
+ [savePanel setRequiredFileType: theEncapFormat];
+ } else {
+ [savePanel setRequiredFileType: @"mpg"];
+ }
+
[savePanel setCanSelectHiddenExtension:YES];
[savePanel beginSheetForDirectory:nil file:nil modalForWindow: \
o_wizard_window modalDelegate:self didEndSelector:sel contextInfo:nil];
projects / vlc / blobdiff