Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
0db42003
Commit
0db42003
authored
Aug 21, 2012
by
Konstantin Pavlov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx gui: use vlc_path2uri.
parent
c57446ee
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+2
-2
modules/gui/macosx/CoreInteraction.m
modules/gui/macosx/CoreInteraction.m
+2
-2
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+1
-1
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+2
-2
modules/gui/macosx/open.m
modules/gui/macosx/open.m
+2
-2
modules/gui/macosx/playlist.m
modules/gui/macosx/playlist.m
+2
-2
No files found.
modules/gui/macosx/ConvertAndSave.m
View file @
0db42003
...
...
@@ -305,7 +305,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
{
if
(
returnCode
==
NSOKButton
)
{
[
self
setMRL
:
[
NSString
stringWithUTF8String
:
make_URI
([[[
panel
URL
]
path
]
UTF8String
],
NULL
)]];
[
self
setMRL
:
[
NSString
stringWithUTF8String
:
vlc_path2uri
([[[
panel
URL
]
path
]
UTF8String
],
NULL
)]];
[
self
updateOKButton
];
[
self
updateDropView
];
}
...
...
@@ -530,7 +530,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
NSArray
*
values
=
[[
paste
propertyListForType
:
NSFilenamesPboardType
]
sortedArrayUsingSelector
:
@selector
(
caseInsensitiveCompare
:)];
if
([
values
count
]
>
0
)
{
[
self
setMRL
:
[
NSString
stringWithUTF8String
:
make_URI
([[
values
objectAtIndex
:
0
]
UTF8String
],
NULL
)]];
[
self
setMRL
:
[
NSString
stringWithUTF8String
:
vlc_path2uri
([[
values
objectAtIndex
:
0
]
UTF8String
],
NULL
)]];
[
self
updateOKButton
];
[
self
updateDropView
];
return
YES
;
...
...
modules/gui/macosx/CoreInteraction.m
View file @
0db42003
...
...
@@ -553,7 +553,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
if
(
count
==
1
&&
p_input
)
{
b_returned
=
input_AddSubtitle
(
p_input
,
make_URI
([[
o_values
objectAtIndex
:
0
]
UTF8String
],
NULL
),
true
);
b_returned
=
input_AddSubtitle
(
p_input
,
vlc_path2uri
([[
o_values
objectAtIndex
:
0
]
UTF8String
],
NULL
),
true
);
vlc_object_release
(
p_input
);
if
(
!
b_returned
)
return
YES
;
...
...
@@ -564,7 +564,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
for
(
NSUInteger
i
=
0
;
i
<
count
;
i
++
)
{
NSDictionary
*
o_dic
;
char
*
psz_uri
=
make_URI
([[
o_values
objectAtIndex
:
i
]
UTF8String
],
NULL
);
char
*
psz_uri
=
vlc_path2uri
([[
o_values
objectAtIndex
:
i
]
UTF8String
],
NULL
);
if
(
!
psz_uri
)
continue
;
...
...
modules/gui/macosx/MainWindow.m
View file @
0db42003
...
...
@@ -2743,7 +2743,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
for
(
NSUInteger
i
=
0
;
i
<
count
;
i
++
)
{
NSDictionary
*
o_dic
;
char
*
psz_uri
=
make_URI
([[
o_values
objectAtIndex
:
i
]
UTF8String
],
NULL
);
char
*
psz_uri
=
vlc_path2uri
([[
o_values
objectAtIndex
:
i
]
UTF8String
],
NULL
);
if
(
!
psz_uri
)
continue
;
...
...
modules/gui/macosx/intf.m
View file @
0db42003
...
...
@@ -918,7 +918,7 @@ static VLCMain *_o_sharedMainInstance = nil;
-
(
void
)
application
:(
NSApplication
*
)
o_app
openFiles
:(
NSArray
*
)
o_names
{
BOOL
b_autoplay
=
config_GetInt
(
VLCIntf
,
"macosx-autoplay"
);
char
*
psz_uri
=
make_URI
([[
o_names
objectAtIndex
:
0
]
UTF8String
],
"file"
);
char
*
psz_uri
=
vlc_path2uri
([[
o_names
objectAtIndex
:
0
]
UTF8String
],
"file"
);
// try to add file as subtitle
if
(
[
o_names
count
]
==
1
&&
psz_uri
)
...
...
@@ -942,7 +942,7 @@ static VLCMain *_o_sharedMainInstance = nil;
NSMutableArray
*
o_result
=
[
NSMutableArray
arrayWithCapacity
:
[
o_sorted_names
count
]];
for
(
int
i
=
0
;
i
<
[
o_sorted_names
count
];
i
++
)
{
psz_uri
=
make_URI
([[
o_sorted_names
objectAtIndex
:
i
]
UTF8String
],
"file"
);
psz_uri
=
vlc_path2uri
([[
o_sorted_names
objectAtIndex
:
i
]
UTF8String
],
"file"
);
if
(
!
psz_uri
)
continue
;
...
...
modules/gui/macosx/open.m
View file @
0db42003
...
...
@@ -670,7 +670,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
for
(
NSUInteger
i
=
0
;
i
<
count
;
i
++
)
{
NSDictionary
*
o_dic
;
char
*
psz_uri
=
make_URI
([[
o_values
objectAtIndex
:
i
]
UTF8String
],
"file"
);
char
*
psz_uri
=
vlc_path2uri
([[
o_values
objectAtIndex
:
i
]
UTF8String
],
"file"
);
if
(
!
psz_uri
)
continue
;
...
...
@@ -699,7 +699,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[[
NSFileManager
defaultManager
]
fileExistsAtPath
:
o_file_path
isDirectory
:
&
b_dir
];
char
*
psz_uri
=
make_URI
([
o_file_path
UTF8String
],
"file"
);
char
*
psz_uri
=
vlc_path2uri
([
o_file_path
UTF8String
],
"file"
);
if
(
!
psz_uri
)
return
;
NSMutableString
*
o_mrl_string
=
[
NSMutableString
stringWithUTF8String
:
psz_uri
];
...
...
modules/gui/macosx/playlist.m
View file @
0db42003
...
...
@@ -1721,7 +1721,7 @@
if
(
count
==
1
&&
p_input
)
{
b_returned
=
input_AddSubtitle
(
p_input
,
make_URI
([[
o_values
objectAtIndex
:
0
]
UTF8String
],
NULL
),
true
);
b_returned
=
input_AddSubtitle
(
p_input
,
vlc_path2uri
([[
o_values
objectAtIndex
:
0
]
UTF8String
],
NULL
),
true
);
vlc_object_release
(
p_input
);
if
(
!
b_returned
)
return
YES
;
...
...
@@ -1732,7 +1732,7 @@
for
(
NSUInteger
i
=
0
;
i
<
count
;
i
++
)
{
NSDictionary
*
o_dic
;
char
*
psz_uri
=
make_URI
([[
o_values
objectAtIndex
:
i
]
UTF8String
],
NULL
);
char
*
psz_uri
=
vlc_path2uri
([[
o_values
objectAtIndex
:
i
]
UTF8String
],
NULL
);
if
(
!
psz_uri
)
continue
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment