/*****************************************************************************
* output.m: MacOS X Output Dialog
*****************************************************************************
- * Copyright (C) 2002-2003 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
#include "output.h"
/*****************************************************************************
- * VLCOutput implementation
+ * VLCOutput implementation
*****************************************************************************/
@implementation VLCOutput
o_mrl = [o_mrl_array copy];
}
-- (NSArray *)getMRL
+- (NSArray *)mrl
{
return [o_mrl copy];
}
NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1",
@"DIV2", @"DIV3", @"h263", @"h264", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
- [o_output_ckbox setTitle: _NS("Advanced output:")];
+ [o_output_ckbox setTitle: _NS("Streaming/Saving:")];
[o_output_settings setTitle: _NS("Settings...")];
[o_btn_ok setTitle: _NS("OK")];
- [o_options_lbl setTitle: _NS("Output Options")];
- [o_display setTitle: _NS("Play locally")];
+ [o_options_lbl setTitle: _NS("Streaming and Transcoding Options")];
+ [o_display setTitle: _NS("Display the stream locally")];
[[o_method cellAtRow:0 column:0] setTitle: _NS("File")];
[[o_method cellAtRow:1 column:0] setTitle: _NS("Stream")];
[o_dump_chkbox setTitle: _NS("Dump raw input")];
- [o_btn_browse setTitle: _NS("Browse...")];
+ [o_btn_browse setTitle: _NS("Browse...")];
[o_stream_address_lbl setStringValue: _NS("Address")];
[o_stream_port_lbl setStringValue: _NS("Port")];
[o_stream_ttl_lbl setStringValue: @"TTL"];
[o_mux_selector removeAllItems];
[o_mux_selector addItemsWithTitles: o_muxers];
- [o_transcode_lbl setTitle: _NS("Transcode options")];
+ [o_transcode_lbl setTitle: _NS("Transcoding options")];
[o_transcode_video_chkbox setTitle: _NS("Video")];
[o_transcode_video_selector removeAllItems];
[o_transcode_video_selector addItemsWithTitles: o_v_codecs];
else
{
[o_mrl_string appendFormat:
- @"std{access=file,mux=%@,url=\"%@\"}",
+ @"std{access=file,mux=%@,dst=\"%@\"}",
o_mux_string, [o_file_field stringValue]];
}
}
componentsSeparatedByString: @"/"];
NSMutableString * o_finalStreamAddress;
o_finalStreamAddress = [[NSMutableString alloc] init];
-
+
if ([o_urlItems count] == 1)
{
[o_finalStreamAddress appendFormat: @"\"%@:%@\"", \
}
[o_finalStreamAddress appendString: @"\""];
}
-
+
[o_mrl_string appendFormat:
- @"std{access=%@,mux=%@,url=%@%@}",
+ @"std{access=%@,mux=%@,dst=%@%@}",
o_mode, o_mux_string, o_finalStreamAddress, o_announce];
}
else