Commit 40c5ee7f authored by Brendon Justin's avatar Brendon Justin Committed by Felix Paul Kühne

macosx: Make streaming wizard output string editable

Change the string's text field from static to editable, so options not in the
wizard can be added. Uses the string from this field directly, rather than the
stored string.
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent e0745f60
/***************************************************************************** /*****************************************************************************
* wizard.m: MacOS X Streaming Wizard * wizard.m: MacOS X Streaming Wizard
***************************************************************************** *****************************************************************************
* Copyright (C) 2005-2009 VLC authors and VideoLAN * Copyright (C) 2005-2012 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Kühne <fkuehne at videolan dot org> * Authors: Felix Kühne <fkuehne at videolan dot org>,
* Brendon Justin <brendonjustin at gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -1252,9 +1253,10 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1252,9 +1253,10 @@ static VLCWizard *_o_sharedInstance = nil;
[[[o_userSelections objectForKey:@"pathToStrm"] [[[o_userSelections objectForKey:@"pathToStrm"]
objectAtIndex:x] UTF8String], objectAtIndex:x] UTF8String],
[tempString UTF8String] ); [tempString UTF8String] );
input_item_AddOption( p_input, [[[o_userSelections
objectForKey:@"opts"] objectAtIndex: x] UTF8String], /* use the MRL from the text field, in case the user
VLC_INPUT_OPTION_TRUSTED ); * modified it */
input_item_AddOption( p_input, [[o_t8_fld_mrl stringValue] UTF8String], VLC_INPUT_OPTION_TRUSTED );
if(! [[o_userSelections objectForKey:@"partExtractFrom"] if(! [[o_userSelections objectForKey:@"partExtractFrom"]
isEqualToString:@""] ) isEqualToString:@""] )
...@@ -1262,7 +1264,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1262,7 +1264,7 @@ static VLCWizard *_o_sharedInstance = nil;
input_item_AddOption( p_input, [[NSString input_item_AddOption( p_input, [[NSString
stringWithFormat: @"start-time=%@", [o_userSelections stringWithFormat: @"start-time=%@", [o_userSelections
objectForKey: @"partExtractFrom"]] UTF8String], objectForKey: @"partExtractFrom"]] UTF8String],
VLC_INPUT_OPTION_TRUSTED ); VLC_INPUT_OPTION_TRUSTED );
} }
if(! [[o_userSelections objectForKey:@"partExtractTo"] if(! [[o_userSelections objectForKey:@"partExtractTo"]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment