Commit f35c3d11 authored by Aleksandr Pasechnik's avatar Aleksandr Pasechnik Committed by Felix Paul Kühne

enable the macosx GUI to handle negative stop-time

Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 1d8905ec
...@@ -867,7 +867,7 @@ void _drawFrameInRect(NSRect frameRect) ...@@ -867,7 +867,7 @@ void _drawFrameInRect(NSRect frameRect)
{ {
self = [super init]; self = [super init];
NSMutableCharacterSet *nonNumbers = [[[NSCharacterSet decimalDigitCharacterSet] invertedSet] mutableCopy]; NSMutableCharacterSet *nonNumbers = [[[NSCharacterSet decimalDigitCharacterSet] invertedSet] mutableCopy];
[nonNumbers removeCharactersInString:@":"]; [nonNumbers removeCharactersInString:@"-:"];
o_forbidden_characters = [nonNumbers copy]; o_forbidden_characters = [nonNumbers copy];
[nonNumbers release]; [nonNumbers release];
......
...@@ -475,7 +475,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -475,7 +475,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
tempValue = [[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue]; tempValue = [[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue];
else if (componentCount == 3) else if (componentCount == 3)
tempValue = [[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]; tempValue = [[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue];
if (tempValue > 0) if (tempValue != 0)
[o_options addObject: [NSString stringWithFormat:@"stop-time=%li", tempValue]]; [o_options addObject: [NSString stringWithFormat:@"stop-time=%li", tempValue]];
} }
if ([o_output_ckbox state] == NSOnState) { if ([o_output_ckbox state] == NSOnState) {
......
...@@ -973,7 +973,7 @@ ...@@ -973,7 +973,7 @@
/* allow the user to over-write the start/stop/run-time */ /* allow the user to over-write the start/stop/run-time */
if (var_GetFloat(p_input_thread, "run-time") > 0 || if (var_GetFloat(p_input_thread, "run-time") > 0 ||
var_GetFloat(p_input_thread, "start-time") > 0 || var_GetFloat(p_input_thread, "start-time") > 0 ||
var_GetFloat(p_input_thread, "stop-time") > 0) { var_GetFloat(p_input_thread, "stop-time") != 0) {
return; return;
} }
......
...@@ -1232,7 +1232,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1232,7 +1232,7 @@ static VLCWizard *_o_sharedInstance = nil;
time = 1000000 * ([[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]); time = 1000000 * ([[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]);
else else
msg_Err(VLCIntf, "Invalid string format for time"); msg_Err(VLCIntf, "Invalid string format for time");
input_item_AddOption(p_input, [[NSString stringWithFormat: @"stop-time=%lu", time] UTF8String], VLC_INPUT_OPTION_TRUSTED); input_item_AddOption(p_input, [[NSString stringWithFormat: @"stop-time=%ld", time] UTF8String], VLC_INPUT_OPTION_TRUSTED);
} }
input_item_AddOption( p_input, [[NSString stringWithFormat: input_item_AddOption( p_input, [[NSString stringWithFormat:
......
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