vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Mar 8 19:18:24 2013 +0100| [7f52b2ae66720dcbb6059ccfd55845d06c2dce63] | committer: Felix Paul Kühne
macosx: don't overwrite existing files on stream-output (close #7752) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7f52b2ae66720dcbb6059ccfd55845d06c2dce63 --- modules/gui/macosx/ConvertAndSave.m | 2 +- modules/gui/macosx/output.m | 5 +++-- modules/gui/macosx/wizard.m | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m index daaed2b..2400cc7 100644 --- a/modules/gui/macosx/ConvertAndSave.m +++ b/modules/gui/macosx/ConvertAndSave.m @@ -902,7 +902,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil; [composedOptions appendFormat:@"}:standard{mux=%@", [self.currentProfile objectAtIndex:0]]; // add output destination - [composedOptions appendFormat:@",dst=%@,access=file}", _outputDestination]; + [composedOptions appendFormat:@",access=file{no-overwrite},dst=%@}", _outputDestination]; } else { /* streaming */ if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"RTP"]) diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m index e5b146d..def804d 100644 --- a/modules/gui/macosx/output.m +++ b/modules/gui/macosx/output.m @@ -1,13 +1,14 @@ /***************************************************************************** * output.m: MacOS X Output Dialog ***************************************************************************** - * Copyright (C) 2002-2007 VLC authors and VideoLAN + * Copyright (C) 2002-2013 VLC authors and VideoLAN * $Id$ * * Authors: Jon Lech Johansen <[email protected]> * Christophe Massiot <[email protected]> * Derk-Jan Hartman <[email protected]> * Benjamin Pracht <bigben AT videolan DOT org> + * Felix Paul Kühne <fkuehne -at- videolan -dot- org> * * 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 @@ -349,7 +350,7 @@ [self setSoutMRL:o_sout_options]; return; } else - [o_mrl_string appendFormat: @"std{access=file,mux=%@,dst=\"%@\"}", o_mux_string, [o_file_field stringValue]]; + [o_mrl_string appendFormat: @"std{access=file{no-overwrite},mux=%@,dst=\"%@\"}", o_mux_string, [o_file_field stringValue]]; } else if ([o_mode isEqualToString: _NS("Stream")]) { o_mode = [o_stream_type titleOfSelectedItem]; diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m index 1688e20..f61cf70 100644 --- a/modules/gui/macosx/wizard.m +++ b/modules/gui/macosx/wizard.m @@ -1,7 +1,7 @@ /***************************************************************************** * wizard.m: MacOS X Streaming Wizard ***************************************************************************** - * Copyright (C) 2005-2012 VLC authors and VideoLAN + * Copyright (C) 2005-2013 VLC authors and VideoLAN * $Id$ * * Authors: Felix Paul K�hne <fkuehne at videolan dot org>, @@ -1460,7 +1460,7 @@ static VLCWizard *_o_sharedInstance = nil; { /* we are just transcoding and dumping the stuff to a file */ [o_opts_string appendFormat: - @":sout=#%@%@standard{mux=%@,dst=%@,access=file}", + @":sout=#%@%@standard{mux=%@,access=file{no-overwrite},dst=%@}", o_duplicateCmd, o_trnscdCmd, [[o_encapFormats objectAtIndex: [[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0],
_______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
