Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
3bc0ec07
Commit
3bc0ec07
authored
May 26, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mkv: use DIR_SEP_CHAR when applicable.
parent
58acae69
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
14 deletions
+4
-14
modules/demux/mkv/mkv.cpp
modules/demux/mkv/mkv.cpp
+4
-4
modules/demux/mkv/mkv.hpp
modules/demux/mkv/mkv.hpp
+0
-10
No files found.
modules/demux/mkv/mkv.cpp
View file @
3bc0ec07
...
...
@@ -145,15 +145,15 @@ static int Open( vlc_object_t * p_this )
// assume it's a regular file
// get the directory path
s_path
=
p_demux
->
psz_path
;
if
(
s_path
.
at
(
s_path
.
length
()
-
1
)
==
DIR
ECTORY_SEPARATO
R
)
if
(
s_path
.
at
(
s_path
.
length
()
-
1
)
==
DIR
_SEP_CHA
R
)
{
s_path
=
s_path
.
substr
(
0
,
s_path
.
length
()
-
1
);
}
else
{
if
(
s_path
.
find_last_of
(
DIR
ECTORY_SEPARATO
R
)
>
0
)
if
(
s_path
.
find_last_of
(
DIR
_SEP_CHA
R
)
>
0
)
{
s_path
=
s_path
.
substr
(
0
,
s_path
.
find_last_of
(
DIR
ECTORY_SEPARATO
R
));
s_path
=
s_path
.
substr
(
0
,
s_path
.
find_last_of
(
DIR
_SEP_CHA
R
));
}
}
...
...
@@ -166,7 +166,7 @@ static int Open( vlc_object_t * p_this )
{
if
(
strlen
(
psz_file
)
>
4
)
{
s_filename
=
s_path
+
DIR
ECTORY_SEPARATO
R
+
psz_file
;
s_filename
=
s_path
+
DIR
_SEP_CHA
R
+
psz_file
;
#ifdef WIN32
if
(
!
strcasecmp
(
s_filename
.
c_str
(),
p_demux
->
psz_path
))
...
...
modules/demux/mkv/mkv.hpp
View file @
3bc0ec07
...
...
@@ -119,16 +119,6 @@ extern "C" {
#define MKVD_TIMECODESCALE 1000000
/**
* What's between a directory and a filename?
*/
#if defined( WIN32 )
#define DIRECTORY_SEPARATOR '\\'
#else
#define DIRECTORY_SEPARATOR '/'
#endif
#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
...
...
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