X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fwizard.m;h=c2f3845f758bcad8fc0000244789ef86ead607e6;hb=7da44adb9513478ddb19503e8e5c9064b688bba9;hp=72763d2842049a84e8649bd6cf01dd5558d449e2;hpb=01b83a3f5b5b0c1f00115e90461613e93cd2d6a4;p=vlc diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m index 72763d2842..c2f3845f75 100644 --- a/modules/gui/macosx/wizard.m +++ b/modules/gui/macosx/wizard.m @@ -1,10 +1,10 @@ /***************************************************************************** * wizard.m: MacOS X Streaming Wizard ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2006 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 @@ -18,13 +18,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Note: this code is partially based upon ../wxwidgets/wizard.cpp and - * ../wxwidgets/streamdata.h; both written by Clément Stenac. + * ../wxwidgets/streamdata.h; both written by Clément Stenac. *****************************************************************************/ @@ -33,8 +33,8 @@ *****************************************************************************/ #import "wizard.h" #import "intf.h" -#import "network.h" #import "playlist.h" +#import /***************************************************************************** * VLCWizard implementation @@ -73,7 +73,6 @@ static VLCWizard *_o_sharedInstance = nil; { /* some minor cleanup */ [o_t2_tbl_plst setEnabled:NO]; - [o_wizardhelp_window setExcludedFromWindowsMenu:YES]; o_userSelections = [[NSMutableDictionary alloc] init]; [o_btn_backward setEnabled:NO]; @@ -155,8 +154,9 @@ static VLCWizard *_o_sharedInstance = nil; " MPEG1, ASF and OGG)"), @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", \ @"NO", @"NO", @"NO", @"NO", @"NO", nil]; o_theo = [NSArray arrayWithObjects: @"Theora", @"theo", \ - _NS("Theora is a free general-purpose codec (useable with MPEG TS)"), \ - @"MUX_TS", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", nil]; + _NS("Theora is a free general-purpose codec (useable with MPEG TS " \ + "and OGG)"), @"MUX_TS", @"MUX_OGG", @"NO", @"NO", @"NO", @"NO", @"NO", \ + @"NO", @"NO", nil]; o_dummyVid = [NSArray arrayWithObjects: @"Dummy", @"dummy", \ _NS("Dummy codec (do not transcode, useable with all encapsulation " \ "formats)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_MP4", \ @@ -205,7 +205,7 @@ static VLCWizard *_o_sharedInstance = nil; o_s16l = [NSArray arrayWithObjects: @"Uncompressed, integer", @"s16l", \ _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV", \ @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; - o_fl32 = [NSArray arrayWithObjects: @"Uncompressed, floating", @"fl32", \ + o_fl32 = [NSArray arrayWithObjects: @"Uncompressed, floating point", @"fl32", \ _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV", \ @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; o_dummyAud = [NSArray arrayWithObjects: @"Dummy", @"dummy", \ @@ -255,15 +255,15 @@ static VLCWizard *_o_sharedInstance = nil; 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 " \ + "addresses you want to listen requests on. Do not enter anything if " \ + "you want to listen on all the network interfaces. This is generally " \ "the best thing to do. Other computers can then access the stream at " \ "http://yourip:8080 by default.") , _NS("Use this to stream to several " \ - "computers. This method is less efficient, as the server needs to send " \ - "the stream several times."), nil]; + "computers. This method is not the most efficient, as the server needs "\ + "to send the stream several times, but generally the most compatible"), nil]; o_mms = [NSArray arrayWithObjects: @"mmsh", @"MMS", _NS("Enter the local " \ - "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 " \ + "addresses you want to listen requests on. Do not enter anything if " \ + "you want to listen on all the network interfaces. This is generally " \ "the best thing to do. Other computers can then access the stream at " \ "mms://yourip:8080 by default."), _NS("Use this to stream to several " \ "computers using the Microsoft MMS protocol. This protocol is used as " \ @@ -279,17 +279,17 @@ static VLCWizard *_o_sharedInstance = nil; "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]; + "won't work over the Internet."), nil]; 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]; + "to a single computer. RTP headers will be added to the stream"), 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]; + "won't work over Internet. RTP headers will be added to the stream"), nil]; o_strmgMthds = [[NSArray alloc] initWithObjects: o_http, o_mms, \ o_udp_uni, o_udp_multi, o_rtp_uni, o_rtp_multi, nil]; } @@ -297,8 +297,6 @@ static VLCWizard *_o_sharedInstance = nil; - (void)showWizard { /* just present the window to the user */ - [o_tab_pageHolder selectFirstTabViewItem:self]; - [o_wizard_window center]; [o_wizard_window displayIfNeeded]; [o_wizard_window makeKeyAndOrderFront:nil]; @@ -306,12 +304,21 @@ static VLCWizard *_o_sharedInstance = nil; - (void)resetWizard { - /* reset the wizard-window to its default values */ + /* get the current state of our setting to keep the selections or not */ + b_keepSettingsOrNot = (BOOL)config_GetInt( VLCIntf, "macosx-wizard-keep" ); + /* go to the front page and clean up a bit */ [o_userSelections removeAllObjects]; + [o_btn_forward setTitle: _NS("Next")]; + [o_tab_pageHolder selectFirstTabViewItem:self]; + + + if( b_keepSettingsOrNot ) + return; + + /* reset the wizard-window to its default values if wanted */ [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: @""]; @@ -358,13 +365,14 @@ static VLCWizard *_o_sharedInstance = nil; /* 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_txt_text setStringValue: _NS("This wizard allows to configure " \ + "simple streaming or transcoding setups.")]; [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.")]; + "The Open and 'Saving/Streaming' dialogs will give access to more " \ + "features.")]; [[o_t1_matrix_strmgOrTrnscd cellAtRow:0 column:0] setTitle: _NS("Stream " \ "to network")]; [[o_t1_matrix_strmgOrTrnscd cellAtRow:1 column:0] setTitle: _NS("" \ @@ -384,20 +392,20 @@ static VLCWizard *_o_sharedInstance = nil; 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 "\ - "the stream. You must be able to control the incoming stream " \ - "(for example, a file or a disc, but not an UDP network stream.) " \ - "Enter the starting and ending times (in seconds).")]; + [o_t2_ckb_enblPartExtrct setToolTip: _NS("This can be used to read only a "\ + "part of the stream. It must be possible to control the incoming "\ + "stream (for example, a file or a disc, but not an UDP network stream.) " \ + "The starting and ending times can be given 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.")]; + [o_t3_txt_text setStringValue: _NS("This page allows to select how " \ + "the input stream will be sent.")]; [o_t3_box_dest setTitle: _NS("Destination")]; [o_t3_box_strmgMthd setTitle: _NS("Streaming method")]; - [o_t3_txt_destInfo setStringValue: _NS("Enter the address of the computer " \ + [o_t3_txt_destInfo setStringValue: _NS("Address of the computer " \ "to stream to.")]; [[o_t3_matrix_stmgMhd cellAtRow:0 column:0] setTitle: _NS("UDP Unicast")]; [[o_t3_matrix_stmgMhd cellAtRow:0 column:1] setTitle: _NS("UDP Multicast")]; @@ -406,30 +414,30 @@ static VLCWizard *_o_sharedInstance = nil; /* 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.)")]; + [o_t4_text setStringValue: _NS("This page allows to change the compression " \ + "format of the audio or video tracks. To change only " \ + "the container format, proceed to next page.")]; [o_t4_box_audio setTitle: _NS("Audio")]; [o_t4_box_video setTitle: _NS("Video")]; [o_t4_ckb_audio setTitle: _NS("Transcode audio")]; [o_t4_ckb_video setTitle: _NS("Transcode video")]; [o_t4_txt_videoBitrate setStringValue: _NS("Bitrate (kb/s)")]; [o_t4_txt_videoCodec setStringValue: _NS("Codec")]; - [o_t4_txt_hintAudio setStringValue: _NS("If your stream has audio 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.")]; + [o_t4_txt_hintAudio setStringValue: _NS("Enabling this allows to transcode "\ + "the audio track if one is present in the stream.")]; + [o_t4_txt_hintVideo setStringValue: _NS("Enabling this allows to transcode "\ + "the video track if one is present in the stream.")]; /* 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.")]; + [o_t5_text setStringValue: _NS("This page allows to select how the " \ + "stream will be encapsulated. Depending on previously chosen settings " + "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 " \ - "additional parameters for your stream.")]; + [o_t6_text setStringValue: _NS("In this page, a few " \ + "additional streaming parameters can be set.")]; [o_t6_txt_ttl setStringValue: _NS("Time-To-Live (TTL)")]; [o_t6_btn_mrInfo_ttl setTitle: _NS("More Info")]; [o_t6_ckb_sap setTitle: _NS("SAP Announce")]; @@ -439,16 +447,16 @@ static VLCWizard *_o_sharedInstance = nil; /* 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 " \ - "additional parameters for your transcoding.")]; + [o_t7_text setStringValue: _NS("In this page, a few " \ + "additional transcoding parameters can be set.")]; [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. " \ - "Click \"Finish\" to start your streaming or transcoding.")]; + [o_t8_txt_text setStringValue: _NS("This page lists all the settings." \ + "Click \"Finish\" to start streaming or transcoding.")]; [o_t8_txt_title setStringValue: _NS("Summary")]; [o_t8_txt_destination setStringValue: [_NS("Destination") \ stringByAppendingString: @":"]]; @@ -470,9 +478,6 @@ static VLCWizard *_o_sharedInstance = nil; 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 \ @@ -518,8 +523,12 @@ static VLCWizard *_o_sharedInstance = nil; o_mode = [[o_t1_matrix_strmgOrTrnscd selectedCell] title]; if( [o_mode isEqualToString: _NS("Stream to network")] ) { + /* we will be streaming */ [o_userSelections setObject:@"strmg" forKey:@"trnscdOrStrmg"]; - }else{ + } + else + { + /* we will just do some transcoding */ [o_userSelections setObject:@"trnscd" forKey:@"trnscdOrStrmg"]; } [o_btn_backward setEnabled:YES]; @@ -560,24 +569,40 @@ static VLCWizard *_o_sharedInstance = nil; } else { - [o_userSelections setObject:[o_t2_fld_pathToNewStrm stringValue] \ - forKey:@"pathToStrm"]; + [o_userSelections setObject:[NSArray arrayWithObject: + [o_t2_fld_pathToNewStrm stringValue]] forKey:@"pathToStrm"]; } } else { - if ([o_t2_tbl_plst selectedRow] != -1) + if ([o_t2_tbl_plst numberOfSelectedRows] > 0) { - playlist_item_t *p_item = - [o_playlist_wizard selectedPlaylistItem]; - if( p_item->i_children <= 0 ) + int x = 0; + int y = [[o_t2_tbl_plst selectedRowIndexes] count]; + NSMutableArray * tempArray = [[NSMutableArray alloc] init]; + while( x != y ) { - [o_userSelections setObject: [NSString stringWithFormat: - @"%s", p_item->input.psz_uri] forKey:@"pathToStrm"]; + playlist_item_t *p_item = + [[o_t2_tbl_plst itemAtRow: + [[o_t2_tbl_plst selectedRowIndexes] + indexGreaterThanOrEqualToIndex: x]] pointerValue]; + + if( p_item->i_children <= 0 ) + { + [tempArray addObject: [NSString stringWithUTF8String: + p_item->p_input->psz_uri]]; + stop = NO; + } + else + stop = YES; + x += 1; } - else - stop = YES; - } else { + [o_userSelections setObject:[NSArray arrayWithArray: tempArray] + forKey:@"pathToStrm"]; + [tempArray release]; + } + else + { /* set a flag that no item is selected */ stop = YES; } @@ -603,9 +628,8 @@ static VLCWizard *_o_sharedInstance = nil; /* 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 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.")); + _NS("No new stream or valid playlist item has been selected.\n\n" \ + "Choose one before going to the next page.")); } } else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \ @@ -625,7 +649,7 @@ static VLCWizard *_o_sharedInstance = nil; /* 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"]; + [o_t4_pop_audioCodec removeItemWithTitle:@"Uncompressed, floating point"]; } else if ( mode == 1 ) { @@ -638,7 +662,7 @@ static VLCWizard *_o_sharedInstance = nil; [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_audioCodec removeItemWithTitle:@"Uncompressed, floating point"]; [o_t4_pop_videoCodec removeItemWithTitle:@"MPEG-1 Video"]; [o_t4_pop_videoCodec removeItemWithTitle:@"MPEG-2 Video"]; @@ -648,7 +672,6 @@ static VLCWizard *_o_sharedInstance = nil; [o_t4_pop_videoCodec removeItemWithTitle:@"Theora"]; } else { /* RTP/UDP Unicast/Multicast Streaming */ - [o_userSelections setObject: [[NSNumber numberWithInt: mode] \ stringValue] forKey:@"stmgMhd"]; @@ -657,7 +680,7 @@ static VLCWizard *_o_sharedInstance = nil; [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_audioCodec removeItemWithTitle:@"Uncompressed, floating point"]; } /* store the destination and check whether is it empty */ @@ -669,8 +692,8 @@ static VLCWizard *_o_sharedInstance = nil; /* 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." \ + _NS("A valid destination has to be selected "\ + "Enter either a Unicast-IP or a Multicast-IP." \ "\n\nIf you don't know what this means, have a look at " \ "the VLC Streaming HOWTO and the help texts in this " \ "window.")); @@ -1052,7 +1075,7 @@ static VLCWizard *_o_sharedInstance = nil; { anythingEnabled = YES; } - x = (x + 1); + x += 1; } if (anythingEnabled == YES) { @@ -1061,9 +1084,9 @@ static VLCWizard *_o_sharedInstance = nil; } 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 " \ + @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("The " \ "chosen codecs are not compatible with each other. For example: " \ - "you cannot mix uncompressed audio with any video codec.\n\n" \ + "It is impossibleto mix uncompressed audio with any video codec.\n\n" \ "Correct your selection and try again.")); } @@ -1083,6 +1106,18 @@ static VLCWizard *_o_sharedInstance = nil; }else{ /* we are just transcoding */ [o_tab_pageHolder selectTabViewItemAtIndex:6]; + /* in case that we are processing multiple items, let the user + * select a folder instead of a localtion for a single item */ + if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) + { + [o_t7_txt_saveFileTo setStringValue: + _NS("Select the directory to save to")]; + } + else + { + [o_t7_txt_saveFileTo setStringValue: + _NS("Select the file to save to")]; + } } } else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \ @@ -1125,15 +1160,112 @@ static VLCWizard *_o_sharedInstance = nil; /* 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\nEnter either " \ - "a valid path or choose a location through the button's " \ - "dialog-box.")); + /* complain to the user that "" is no valid path for a folder/file */ + if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) + NSBeginInformationalAlertSheet(_NS("No folder selected"), \ + _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ + [NSString stringWithFormat: @"%@\n\n%@", _NS("A directory " + "where to save the files has to be selected."), + _NS("Enter either a valid path or use the \"Choose...\" " \ + "button to select a location.")]); + else + NSBeginInformationalAlertSheet(_NS("No file selected"), \ + _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ + [NSString stringWithFormat: @"%@\n\n%@", _NS("A file " \ + "where to save the stream has to be selected."), + _NS("Enter either a valid path or use the \"Choose\" " \ + "button to select a location.")]); } else { - [o_userSelections setObject:[o_t7_fld_filePath stringValue] forKey: \ - @"trnscdFilePath"]; + /* create a string containing the requested suffix for later usage */ + NSString * theEncapFormat = [[o_encapFormats objectAtIndex: + [[o_userSelections objectForKey:@"encapFormat"] intValue]] \ + objectAtIndex:0]; + if( theEncapFormat == @"ps" ) + theEncapFormat = @"mpg"; + + /* look whether we need to process multiple items or not. + * choose a faster variant if we just want a single item */ + if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) + { + NSMutableArray * tempArray = [[NSMutableArray alloc] init]; + int x = 0; + int y = [[o_userSelections objectForKey:@"pathToStrm"] count]; + NSMutableString * tempString = [[NSMutableString alloc] init]; + while( x != y ) + { + NSString * fileNameToUse; + /* check whether the extension is hidden or not. + * if not, remove it + * we need the casting to make GCC4 happy */ + if( [[[NSFileManager defaultManager] fileAttributesAtPath: \ + [[o_userSelections objectForKey:@"pathToStrm"] \ + objectAtIndex: x] traverseLink: NO] objectForKey: \ + NSFileExtensionHidden] ) + fileNameToUse = [NSString stringWithString: + [[NSFileManager defaultManager] displayNameAtPath: + [[o_userSelections objectForKey:@"pathToStrm"] + objectAtIndex: x]]]; + else + { + int z = 0; + int count = [[[[NSFileManager defaultManager] \ + displayNameAtPath: \ + [[o_userSelections objectForKey:@"pathToStrm"] \ + objectAtIndex: x]] \ + componentsSeparatedByString: @"."] count]; + fileNameToUse = @""; + while( z < (count - 1) ) + { + fileNameToUse = [fileNameToUse stringByAppendingString: + [[[[NSFileManager defaultManager] \ + displayNameAtPath: \ + [[o_userSelections objectForKey:@"pathToStrm"] \ + objectAtIndex: x]] \ + componentsSeparatedByString: @"."] \ + objectAtIndex: z]]; + z += 1; + } + } + tempString = [NSString stringWithFormat: @"%@%@.%@", + [o_t7_fld_filePath stringValue], + fileNameToUse, theEncapFormat]; + if( [[NSFileManager defaultManager] fileExistsAtPath: \ + tempString] ) + { + /* we don't wanna overwrite existing files, so add an + * int to the file-name */ + int additionalInt = 1; + while( additionalInt < 100 ) + { + tempString = [NSString stringWithFormat:@"%@%@ %i.%@", + [o_t7_fld_filePath stringValue], + fileNameToUse, additionalInt, theEncapFormat]; + if(! [[NSFileManager defaultManager] \ + fileExistsAtPath: tempString] ) + break; + additionalInt += 1; + } + if( additionalInt >= 100 ) + msg_Err( VLCIntf, "Files with the same name are " \ + "already present in the destination directory. " \ + "Delete these files or choose a different directory." ); + } + [tempArray addObject: [tempString retain]]; + x += 1; + } + [o_userSelections setObject: [NSArray arrayWithArray:tempArray] + forKey: @"trnscdFilePath"]; + [tempArray release]; + [tempString release]; + } + else + { + /* we don't need to check for existing items because Cocoa + * does that already when we are asking the user for a location + * to save her file */ + [o_userSelections setObject: [NSArray arrayWithObject: \ + [o_t7_fld_filePath stringValue]] forKey: @"trnscdFilePath"]; + } /* go to "Summary" */ [self showSummary]; @@ -1144,40 +1276,59 @@ static VLCWizard *_o_sharedInstance = nil; { intf_thread_t * p_intf = VLCIntf; - 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]); + playlist_t * p_playlist = pl_Yield( p_intf ); - if(! [[o_userSelections objectForKey:@"partExtractFrom"] isEqualToString:@""] ) + int x = 0; + int y = [[o_userSelections objectForKey:@"pathToStrm"] count]; + while( x != y ) + { + /* we need a temp. variable here to work-around a GCC4-bug */ + NSString *tempString = [NSString stringWithFormat: \ + @"%@ (%i/%i)", _NS("Streaming/Transcoding Wizard"), \ + ( x + 1 ), y]; + input_item_t *p_input = input_ItemNew( p_playlist, \ + [[[o_userSelections objectForKey:@"pathToStrm"] \ + objectAtIndex:x] UTF8String], \ + [tempString UTF8String] ); + input_ItemAddOption( p_input, [[[o_userSelections \ + objectForKey:@"opts"] objectAtIndex: x] UTF8String]); + + if(! [[o_userSelections objectForKey:@"partExtractFrom"] \ + isEqualToString:@""] ) { - playlist_ItemAddOption( p_item, [[@"start-time=" \ - stringByAppendingString: [o_userSelections \ - objectForKey:@"partExtractFrom"]] UTF8String] ); + input_ItemAddOption( p_input, [[NSString \ + stringWithFormat: @"start-time=%@", [o_userSelections \ + objectForKey: @"partExtractFrom"]] UTF8String] ); } - if(! [[o_userSelections objectForKey:@"partExtractTo"] isEqualToString:@""] ) + if(! [[o_userSelections objectForKey:@"partExtractTo"] \ + isEqualToString:@""] ) { - playlist_ItemAddOption( p_item, [[@"stop-time=" \ - stringByAppendingString: [o_userSelections objectForKey: \ - @"partExtractTo"]] UTF8String] ); + input_ItemAddOption( p_input, [[NSString \ + stringWithFormat: @"stop-time=%@", [o_userSelections \ + objectForKey: @"partExtractTo"]] UTF8String] ); } - playlist_ItemAddOption( p_item, [[@"ttl=" stringByAppendingString: \ - [o_userSelections objectForKey:@"ttl"]] UTF8String] ); + input_ItemAddOption( p_input, [[NSString stringWithFormat: \ + @"ttl=%@", [o_userSelections objectForKey:@"ttl"]] \ + UTF8String] ); - playlist_AddItem( p_playlist, p_item, PLAYLIST_GO, PLAYLIST_END ); - - playlist_ViewUpdate( p_playlist, VIEW_CATEGORY ); + playlist_AddInput( p_playlist, p_input, PLAYLIST_STOP, + PLAYLIST_END, VLC_TRUE ); - vlc_object_release(p_playlist); - } else { - msg_Err( p_intf, "Uh Oh! Unable to find playlist!" ); + if( x == 0 ) + { + /* play the first item and add the others afterwards */ + playlist_item_t *p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, NULL, + p_item ); + } + + x += 1; } + vlc_object_release( p_playlist ); + /* close the window, since we are done */ [o_wizard_window close]; } @@ -1185,6 +1336,8 @@ static VLCWizard *_o_sharedInstance = nil; - (void)rebuildCodecMenus { + int savePreviousSel = 0; + savePreviousSel = [o_t4_pop_videoCodec indexOfSelectedItem]; [o_t4_pop_videoCodec removeAllItems]; unsigned int x; x = 0; @@ -1192,22 +1345,36 @@ static VLCWizard *_o_sharedInstance = nil; { [o_t4_pop_videoCodec addItemWithTitle:[[o_videoCodecs objectAtIndex:x] \ objectAtIndex:0]]; - x = (x + 1); + x += 1; } + if( b_keepSettingsOrNot && savePreviousSel >= 0 ) + [o_t4_pop_videoCodec selectItemAtIndex: savePreviousSel]; + + savePreviousSel = [o_t4_pop_audioCodec indexOfSelectedItem]; [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); + x += 1; } + if( b_keepSettingsOrNot && savePreviousSel >= 0 ) + [o_t4_pop_audioCodec selectItemAtIndex: savePreviousSel]; } - (void)showSummary { [o_btn_forward setTitle: _NS("Finish")]; - [o_t8_fld_inptStream setStringValue:[o_userSelections objectForKey:@"pathToStrm"]]; + /* if we will transcode multiple items, just give their number; otherwise + * print the URI of the single item */ + if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) + [o_t8_fld_inptStream setStringValue: [NSString stringWithFormat: + _NS("%i items"), + [[o_userSelections objectForKey:@"pathToStrm"] count]]]; + else + [o_t8_fld_inptStream setStringValue: + [[o_userSelections objectForKey:@"pathToStrm"] objectAtIndex: 0]]; if ([[o_userSelections objectForKey:@"localPb"] isEqualToString: @"YES"]) { @@ -1218,25 +1385,21 @@ static VLCWizard *_o_sharedInstance = nil; 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"]]]; + [o_t8_fld_partExtract setStringValue: [NSString stringWithFormat: + _NS("yes: from %@ to %@ secs"), + [o_userSelections objectForKey:@"partExtractFrom"], + [o_userSelections objectForKey:@"partExtractTo"]]]; } else { [o_t8_fld_partExtract setStringValue: _NS("no")]; } if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"YES"]) { - [o_t8_fld_trnscdVideo setStringValue: [[[[[_NS("yes") \ - stringByAppendingString:@": "] stringByAppendingString: \ + [o_t8_fld_trnscdVideo setStringValue: [NSString stringWithFormat: + _NS("yes: %@ @ %@ kb/s"), [[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey: \ - @"trnscdVideoCodec"] intValue]] objectAtIndex:0]] \ - stringByAppendingString:@" @ "] stringByAppendingString: \ - [o_userSelections objectForKey:@"trnscdVideoBitrate"]] \ - stringByAppendingString:@" kb/s"]]; + @"trnscdVideoCodec"] intValue]] objectAtIndex:0], + [o_userSelections objectForKey:@"trnscdVideoBitrate"]]]; } else { @@ -1244,13 +1407,11 @@ static VLCWizard *_o_sharedInstance = nil; } 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"]]; + [o_t8_fld_trnscdAudio setStringValue: [NSString stringWithFormat: + _NS("yes: %@ @ %@ kb/s"), + [[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey: \ + @"trnscdAudioCodec"] intValue]] objectAtIndex:0], + [o_userSelections objectForKey:@"trnscdAudioBitrate"]]]; } else { @@ -1270,7 +1431,9 @@ static VLCWizard *_o_sharedInstance = nil; [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"]]]; + [o_t8_fld_sap setStringValue: + [_NS("yes") stringByAppendingFormat: @": \"%@\"", + [o_userSelections objectForKey:@"sapText"]]]; }else{ [o_t8_fld_sap setStringValue: _NS("no")]; } @@ -1280,14 +1443,22 @@ static VLCWizard *_o_sharedInstance = nil; [o_t8_fld_destination setStringValue: @"-"]; [o_t8_fld_ttl setStringValue: @"-"]; [o_t8_fld_sap setStringValue: @"-"]; - [o_t8_fld_saveFileTo setStringValue: [o_userSelections objectForKey: \ - @"trnscdFilePath"]]; + /* do only show the destination of the first item and add a counter, if needed */ + if( [[o_userSelections objectForKey: @"trnscdFilePath"] count] > 1 ) + [o_t8_fld_saveFileTo setStringValue: \ + [NSString stringWithFormat: @"%@ (+%i)", \ + [[o_userSelections objectForKey: @"trnscdFilePath"] objectAtIndex:0], \ + ([[o_userSelections objectForKey: @"trnscdFilePath"] count] - 1)]]; + else + [o_t8_fld_saveFileTo setStringValue: \ + [[o_userSelections objectForKey: @"trnscdFilePath"] objectAtIndex:0]]; } [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_t8_fld_mrl setStringValue: [[o_userSelections objectForKey:@"opts"] + objectAtIndex: 0]]; [o_tab_pageHolder selectTabViewItemAtIndex:7]; } @@ -1297,101 +1468,120 @@ static VLCWizard *_o_sharedInstance = nil; NSMutableString * o_opts_string = [NSMutableString stringWithString:@""]; NSMutableString *o_trnscdCmd = [NSMutableString stringWithString:@""]; NSMutableString *o_duplicateCmd = [NSMutableString stringWithString:@""]; + int x = 0; + int y = [[o_userSelections objectForKey:@"pathToStrm"] count]; + NSMutableArray * tempArray = [[NSMutableArray alloc] init]; - /* 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"]) + /* loop to create an opt-string for each item we're processing */ + while( x != y ) { - [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 + /* 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"]) { - [o_trnscdCmd appendString: @"}:"]; + [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: @"}:"]; + } } - } - /* 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"]) + /* check whether the user requested local playback. if yes, prepare the + * string, if not, let it empty */ + if ([[o_userSelections objectForKey:@"localPb"] isEqualToString:@"YES"]) { - /* in case we transcode the audio only, add this */ - [o_trnscdCmd appendString: @"transcode{"]; + [o_duplicateCmd appendString: @"duplicate{dst=display,dst=\""]; } - [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 */ - if ([[o_userSelections objectForKey:@"sap"] isEqualToString:@"YES"]) + if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"]) { - /* SAP-Announcement is requested */ - NSMutableString *o_sap_option = [NSMutableString stringWithString:@""]; - if([[o_userSelections objectForKey:@"sapText"] isEqualToString:@""]) + if ([[o_userSelections objectForKey:@"trnscdVideo"] isEqualToString:@"NO"]) { - [o_sap_option appendString: @"sap"]; - } else { - [o_sap_option appendFormat: @"sap,name=\"%s\"",[[o_userSelections \ - objectForKey:@"sapText"] UTF8String]]; + /* 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]]; + } + + 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=%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=#%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]]; + @":sout=#%s%sstandard{mux=%s,dst=%s,access=file}", [o_duplicateCmd \ + UTF8String], [o_trnscdCmd UTF8String], [[[o_encapFormats \ + objectAtIndex: [[o_userSelections objectForKey:@"encapFormat"] \ + intValue]] objectAtIndex:0] UTF8String], [[[o_userSelections \ + objectForKey: @"trnscdFilePath"] objectAtIndex: x] UTF8String]]; } - } + else + { - /* 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: @"\"}"]; - } + /* we are streaming */ + 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=#%s%sstandard{mux=%s,dst=%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=#%s%sstandard{mux=%s,dst=%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"]; + [tempArray addObject: o_opts_string]; + + o_opts_string = [NSMutableString stringWithString:@""]; + o_trnscdCmd = [NSMutableString stringWithString:@""]; + o_duplicateCmd = [NSMutableString stringWithString:@""]; + x += 1; + } + [o_userSelections setObject:[NSArray arrayWithArray: tempArray] forKey:@"opts"]; + [tempArray release]; } - (IBAction)prevTab:(id)sender @@ -1462,30 +1652,21 @@ static VLCWizard *_o_sharedInstance = nil; - (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 - modalForWindow: o_wizard_window - modalDelegate: o_wizardhelp_window - didEndSelector: nil - contextInfo: nil]; + NSBeginInformationalAlertSheet(_NS("Stream to network"), \ + _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ + _NS("This allows to stream on a network.")); } - (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 " \ - "features to save network streams, for example.")]; - [NSApp beginSheet: o_wizardhelp_window - modalForWindow: o_wizard_window - modalDelegate: o_wizardhelp_window - didEndSelector: nil - contextInfo: nil]; + NSBeginInformationalAlertSheet(_NS("Transcode/Save to file"), \ + _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ + _NS("This allows to save a stream to a file. The "\ + "can be reencoded on the fly. Whatever "\ + "VLC can read can be saved.\nPlease note that VLC is not very suited " \ + "for file to file transcoding. Its transcoding " \ + "features are however useful to save network streams, for example.")); } - (IBAction)t2_addNewStream:(id)sender @@ -1609,13 +1790,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. "\ + [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("Enabling this allows to transcode " \ + "the audio track if one is present in the stream.")]; } } @@ -1631,8 +1812,9 @@ static VLCWizard *_o_sharedInstance = nil; } 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("Enabling this allows to transcode " \ + "the video track if one is present in the stream.")]; + } } @@ -1658,33 +1840,25 @@ 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 - modalForWindow: o_wizard_window - modalDelegate: o_wizardhelp_window - didEndSelector: nil - contextInfo: nil]; + NSBeginInformationalAlertSheet(_NS("Time-To-Live (TTL)"), \ + _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ + _NS("This allows to 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.")); } - (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 " \ + NSBeginInformationalAlertSheet(_NS("SAP Announce"), \ + _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ + _NS("When streaming using UDP, the streams can be " \ + "announced using the SAP/SDP announcing protocol. This " \ "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 - contextInfo: nil]; + "will appear in their playlist if they enable the SAP extra " \ + "interface.\nIf you want to give a name to your stream, enter it " \ + "here, else, a default name will be used.")); } - (IBAction)t67_mrInfo_local:(id)sender @@ -1699,42 +1873,59 @@ static VLCWizard *_o_sharedInstance = nil; - (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]; + /* provide a save-to-dialogue, so the user can choose a location for + * his/her new file. We take a modified NSOpenPanel to select a folder + * and a plain NSSavePanel to save a single file. */ + SEL sel = @selector(t7_getTrnscdDestFile:returnCode:contextInfo:); - 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") + if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) { - [savePanel setRequiredFileType: theEncapFormat]; - } else { - [savePanel setRequiredFileType: @"mpg"]; + NSOpenPanel * saveFolderPanel = [[NSOpenPanel alloc] init]; + + [saveFolderPanel setCanChooseDirectories: YES]; + [saveFolderPanel setCanChooseFiles: NO]; + [saveFolderPanel setCanSelectHiddenExtension: NO]; + [saveFolderPanel setCanCreateDirectories: YES]; + [saveFolderPanel beginSheetForDirectory:nil file:nil modalForWindow: \ + o_wizard_window modalDelegate:self didEndSelector:sel contextInfo:nil]; } - - [savePanel setCanSelectHiddenExtension:YES]; - [savePanel beginSheetForDirectory:nil file:nil modalForWindow: \ + else + { + NSSavePanel * saveFilePanel = [[NSSavePanel alloc] init]; + + /* don't use ".ps" as suffix, since the OSX Finder confuses our + * creations with PostScript-files and wants to open them with + * Preview.app */ + NSString * theEncapFormat = [[o_encapFormats objectAtIndex: \ + [[o_userSelections objectForKey:@"encapFormat"] intValue]] \ + objectAtIndex:0]; + if( theEncapFormat != @"ps" ) + [saveFilePanel setRequiredFileType: theEncapFormat]; + else + [saveFilePanel setRequiredFileType: @"mpg"]; + + [saveFilePanel setCanSelectHiddenExtension: YES]; + [saveFilePanel setCanCreateDirectories: YES]; + [saveFilePanel beginSheetForDirectory:nil file:nil modalForWindow: \ o_wizard_window modalDelegate:self didEndSelector:sel contextInfo:nil]; + } } -- (void)t7_getTrnscdDestFile: (NSSavePanel *)sheet returnCode: \ +- (void)t7_getTrnscdDestFile: (NSOpenPanel *)sheet returnCode: \ (int)returnCode contextInfo: (void *)contextInfo { if (returnCode == NSOKButton) { - /* output returned path to text-field */ - [o_t7_fld_filePath setStringValue:[sheet filename]]; + /* output returned path to text-field, add a / to the end if the user + * selected a folder */ + if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) + [o_t7_fld_filePath setStringValue: [NSString stringWithFormat: \ + @"%@/", [sheet filename]]]; + else + [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]; + [sheet release]; } @end