Commit c4d228d6 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'
(cherry picked from commit 0fff26bc5eb641f04b882b6830099b9bd267124b)
parent ab168152
...@@ -759,9 +759,9 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -759,9 +759,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
returnValue = kVLCMediaBD; returnValue = kVLCMediaBD;
else else
{ {
if ([mountPath rangeOfString:@"VIDEO_TS"].location != NSNotFound) if ([mountPath rangeOfString:@"VIDEO_TS" options:NSCaseInsensitiveSearch | NSBackwardsSearch].location != NSNotFound)
returnValue = kVLCMediaVideoTSFolder; returnValue = kVLCMediaVideoTSFolder;
else if ([mountPath rangeOfString:@"BDMV"].location != NSNotFound) else if ([mountPath rangeOfString:@"BDMV" options:NSCaseInsensitiveSearch | NSBackwardsSearch].location != NSNotFound)
returnValue = kVLCMediaBDMVFolder; returnValue = kVLCMediaBDMVFolder;
else else
{ {
...@@ -783,7 +783,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -783,7 +783,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
} }
} }
if(!returnValue) if(!returnValue)
returnValue = kVLCMediaUnknown; returnValue = kVLCMediaVideoTSFolder;
} }
} }
...@@ -902,13 +902,8 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -902,13 +902,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
NSString *o_path = [[[o_open_panel URLs] objectAtIndex: 0] path]; NSString *o_path = [[[o_open_panel URLs] objectAtIndex: 0] path];
if ([o_path length] > 0 ) 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];
[o_specialMediaFolders addObject: o_path];
[self scanOpticalMedia: nil];
}
else
msg_Dbg( VLCIntf, "chosen directory is no suitable special media folder" );
} }
} }
} }
......
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