Commit 0fff26bc authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: trust the user that s/he knows what s/he's doing when opening a...

macosx: trust the user that s/he knows what s/he's doing when opening a VIDEO_TS folder (close #6108)

in other words, accept folders which aren't named 'VIDEO_TS'
parent a959f66b
......@@ -829,9 +829,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
returnValue = kVLCMediaBD;
else
{
if ([mountPath rangeOfString:@"VIDEO_TS"].location != NSNotFound)
if ([mountPath rangeOfString:@"VIDEO_TS" options:NSCaseInsensitiveSearch | NSBackwardsSearch].location != NSNotFound)
returnValue = kVLCMediaVideoTSFolder;
else if ([mountPath rangeOfString:@"BDMV"].location != NSNotFound)
else if ([mountPath rangeOfString:@"BDMV" options:NSCaseInsensitiveSearch | NSBackwardsSearch].location != NSNotFound)
returnValue = kVLCMediaBDMVFolder;
else
{
......@@ -853,7 +853,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
}
}
if(!returnValue)
returnValue = kVLCMediaUnknown;
returnValue = kVLCMediaVideoTSFolder;
}
}
......@@ -972,13 +972,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
NSString *o_path = [[[o_open_panel URLs] objectAtIndex: 0] path];
if ([o_path length] > 0 )
{
if ([o_path rangeOfString:@"VIDEO_TS"].location != NSNotFound || [o_path rangeOfString:@"BDMV"].location != NSNotFound)
{
[o_specialMediaFolders addObject: o_path];
[self scanOpticalMedia: nil];
}
else
msg_Dbg( VLCIntf, "chosen directory is no suitable special media folder" );
[o_specialMediaFolders addObject: o_path];
[self scanOpticalMedia: nil];
}
}
}
......
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