/*****************************************************************************
* wizard.m: MacOS X Streaming Wizard
*****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2006 the VideoLAN team
* $Id$
*
- * Authors: Felix Kühne <fkuehne@users.sf.net>
+ * Authors: Felix Kühne <fkuehne@users.sf.net>
*
* 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
*
* 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.
*****************************************************************************/
#import "intf.h"
#import "network.h"
#import "playlist.h"
+#import <vlc/intf.h>
/*****************************************************************************
* VLCWizard implementation
{
/* some minor cleanup */
[o_t2_tbl_plst setEnabled:NO];
- [o_wizardhelp_window setExcludedFromWindowsMenu:YES];
o_userSelections = [[NSMutableDictionary alloc] init];
[o_btn_backward setEnabled:NO];
- (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];
- (void)resetWizard
{
- /* reset the wizard-window to its default values */
+ /* get the current state of our setting to keep the selections or not */
+ 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( 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: @""];
[o_t7_btn_chooseFile setTitle: _NS("Choose...")];
[o_t7_ckb_local setTitle: _NS("Local playback")];
[o_t7_btn_mrInfo_local setTitle: _NS("More Info")];
+ [o_t7_txt_note_saveFolderTo setStringValue: _NS("Note that your input " \
+ "files will keep their original names when being saved in the folder " \
+ "you selected. Existing files may be overwritten.")];
/* page eight ("Summary") */
[o_t8_txt_text setStringValue: _NS("This page lists all your selections. " \
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 \
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];
}
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->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;
}
{
anythingEnabled = YES;
}
- x = (x + 1);
+ x += 1;
}
if (anythingEnabled == YES)
{
}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 folder to save to")];
+ [o_t7_txt_note_saveFolderTo setHidden: NO];
+ }
+ else
+ {
+ [o_t7_txt_saveFileTo setStringValue:
+ _NS("Select the file to save to")];
+ [o_t7_txt_note_saveFolderTo setHidden: YES];
+ }
}
}
else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
/* 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("You you " \
+ "need to select a folder, you want to save your files to."),
+ _NS("Enter either a valid path or choose a location " \
+ "through the button's dialog-box.")]);
+ else
+ NSBeginInformationalAlertSheet(_NS("No file selected"), \
+ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
+ [NSString stringWithFormat: @"%@\n\n%@", _NS("You you " \
+ "need to select a file, you want to save to."),
+ _NS("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"];
+ if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 )
+ {
+ NSMutableArray * tempArray = [[NSMutableArray alloc] init];
+ NSString * theEncapFormat = [[o_encapFormats objectAtIndex: \
+ [[o_userSelections objectForKey:@"encapFormat"] intValue]] \
+ objectAtIndex:0];
+ if( theEncapFormat == @"ps" )
+ theEncapFormat = @"mpg";
+ int x = 0;
+ int y = [[o_userSelections objectForKey:@"pathToStrm"] count];
+ while( x != y )
+ {
+ [tempArray addObject:[NSString stringWithFormat: @"%@%@.%@",
+ [o_t7_fld_filePath stringValue],
+ [[NSFileManager defaultManager] displayNameAtPath:
+ [[o_userSelections objectForKey:@"pathToStrm"]
+ objectAtIndex: x]],theEncapFormat]];
+ x += 1;
+ }
+ [o_userSelections setObject: [NSArray arrayWithArray:tempArray]
+ forKey: @"trnscdFilePath"];
+ [tempArray release];
+ }
+ else
+ {
+ [o_userSelections setObject: [NSArray arrayWithObject: \
+ [o_t7_fld_filePath stringValue]] forKey: @"trnscdFilePath"];
+ }
/* go to "Summary" */
[self showSummary];
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:@""] )
+ int x = 0;
+ int y = [[o_userSelections objectForKey:@"pathToStrm"] count];
+ while( x != y )
{
- playlist_ItemAddOption( p_item, [[@"start-time=" \
- stringByAppendingString: [o_userSelections \
- objectForKey:@"partExtractFrom"]] UTF8String] );
- }
+ /* 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];
+ playlist_item_t *p_item = playlist_ItemNew( p_playlist, \
+ [[[o_userSelections objectForKey:@"pathToStrm"] \
+ objectAtIndex:x] UTF8String], \
+ [tempString UTF8String] );
+ playlist_ItemAddOption( p_item, [[[o_userSelections \
+ objectForKey:@"opts"] objectAtIndex: x] UTF8String]);
+
+ if(! [[o_userSelections objectForKey:@"partExtractFrom"] \
+ isEqualToString:@""] )
+ {
+ playlist_ItemAddOption( p_item, [[NSString \
+ stringWithFormat: @"start-time=%@", [o_userSelections \
+ objectForKey: @"partExtractFrom"]] UTF8String] );
+ }
- if(! [[o_userSelections objectForKey:@"partExtractTo"] isEqualToString:@""] )
- {
- playlist_ItemAddOption( p_item, [[@"stop-time=" \
- stringByAppendingString: [o_userSelections objectForKey: \
- @"partExtractTo"]] UTF8String] );
- }
+ if(! [[o_userSelections objectForKey:@"partExtractTo"] \
+ isEqualToString:@""] )
+ {
+ playlist_ItemAddOption( p_item, [[NSString \
+ stringWithFormat: @"stop-time=%@", [o_userSelections \
+ objectForKey: @"partExtractTo"]] UTF8String] );
+ }
- playlist_ItemAddOption( p_item, [[@"ttl=" stringByAppendingString: \
- [o_userSelections objectForKey:@"ttl"]] UTF8String] );
+ playlist_ItemAddOption( p_item, [[NSString stringWithFormat: \
+ @"ttl=%@", [o_userSelections objectForKey:@"ttl"]] \
+ UTF8String] );
+
+ playlist_AddItem( p_playlist, p_item, PLAYLIST_STOP, PLAYLIST_END );
+
+ if( x == 0 )
+ /* play the first item and add the others afterwards */
+ playlist_Control( p_playlist, PLAYLIST_ITEMPLAY, p_item );
+
+ x += 1;
+ }
- playlist_AddItem( p_playlist, p_item, PLAYLIST_GO, PLAYLIST_END );
-
playlist_ViewUpdate( p_playlist, VIEW_CATEGORY );
vlc_object_release(p_playlist);
- (void)rebuildCodecMenus
{
+ int savePreviousSel = 0;
+ savePreviousSel = [o_t4_pop_videoCodec indexOfSelectedItem];
[o_t4_pop_videoCodec removeAllItems];
unsigned int x;
x = 0;
{
[o_t4_pop_videoCodec addItemWithTitle:[[o_videoCodecs objectAtIndex:x] \
objectAtIndex:0]];
- x = (x + 1);
+ x += 1;
}
+ if( 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( 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"])
{
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
{
}
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
{
[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")];
}
[[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];
}
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"])
+ /* 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: @","];
- }
- else
- {
- [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]];
+ }
+ }
- [o_userSelections setObject:o_opts_string forKey:@"opts"];
+ /* 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: @"\"}"];
+ }
+
+ [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
- (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("Use this 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 "\
+ NSBeginInformationalAlertSheet(_NS("Transcode/Save to file"), \
+ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
+ _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];
+ "features to save network streams, for example."));
}
- (IBAction)t2_addNewStream:(id)sender
- (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("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 " \
+ NSBeginInformationalAlertSheet(_NS("SAP Announce"), \
+ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
+ _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
- 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
- (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