Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
370b6cbb
Commit
370b6cbb
authored
May 10, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use file path instead of URL where appropriate
parent
c20f0e81
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
17 deletions
+22
-17
modules/access/cdda.c
modules/access/cdda.c
+2
-2
modules/access/directory.c
modules/access/directory.c
+4
-4
modules/access/file.c
modules/access/file.c
+1
-1
modules/access/mmap.c
modules/access/mmap.c
+1
-1
modules/access/mtp.c
modules/access/mtp.c
+13
-8
modules/access/vcd/vcd.c
modules/access/vcd/vcd.c
+1
-1
No files found.
modules/access/cdda.c
View file @
370b6cbb
...
...
@@ -139,7 +139,7 @@ static int Open( vlc_object_t *p_this )
vcddev_t
*
vcddev
;
char
*
psz_name
;
if
(
!
p_access
->
psz_
path
||
!*
p_access
->
psz_
path
)
if
(
!
p_access
->
psz_
filepath
||
!*
p_access
->
psz_file
path
)
{
/* Only when selected */
if
(
!
p_access
->
psz_access
||
!*
p_access
->
psz_access
)
...
...
@@ -152,7 +152,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_EGENERIC
;
}
}
else
psz_name
=
ToLocaleDup
(
p_access
->
psz_path
);
else
psz_name
=
ToLocaleDup
(
p_access
->
psz_
file
path
);
#ifdef WIN32
if
(
psz_name
[
0
]
&&
psz_name
[
1
]
==
':'
&&
...
...
modules/access/directory.c
View file @
370b6cbb
...
...
@@ -99,10 +99,10 @@ int DirOpen( vlc_object_t *p_this )
{
access_t
*
p_access
=
(
access_t
*
)
p_this
;
if
(
!
p_access
->
psz_path
)
if
(
!
p_access
->
psz_
file
path
)
return
VLC_EGENERIC
;
DIR
*
handle
=
vlc_opendir
(
p_access
->
psz_path
);
DIR
*
handle
=
vlc_opendir
(
p_access
->
psz_
file
path
);
if
(
handle
==
NULL
)
return
VLC_EGENERIC
;
...
...
@@ -122,7 +122,7 @@ int DirInit (access_t *p_access, DIR *handle)
uri
=
NULL
;
}
else
uri
=
make_URI
(
p_access
->
psz_path
);
uri
=
make_URI
(
p_access
->
psz_
file
path
);
if
(
unlikely
(
uri
==
NULL
))
goto
error
;
...
...
@@ -238,7 +238,7 @@ block_t *DirBlock (access_t *p_access)
current
->
parent
=
NULL
;
current
->
handle
=
p_sys
->
handle
;
#ifndef HAVE_OPENAT
current
->
path
=
strdup
(
p_access
->
psz_path
);
current
->
path
=
strdup
(
p_access
->
psz_
file
path
);
#endif
current
->
uri
=
p_sys
->
uri
;
if
(
fstat
(
dirfd
(
current
->
handle
),
&
current
->
st
))
...
...
modules/access/file.c
View file @
370b6cbb
...
...
@@ -133,7 +133,7 @@ static bool IsRemote (int fd)
int
Open
(
vlc_object_t
*
p_this
)
{
access_t
*
p_access
=
(
access_t
*
)
p_this
;
const
char
*
path
=
p_access
->
psz_path
;
const
char
*
path
=
p_access
->
psz_
file
path
;
#ifdef WIN32
bool
is_remote
=
false
;
#endif
...
...
modules/access/mmap.c
View file @
370b6cbb
...
...
@@ -83,7 +83,7 @@ static int Open (vlc_object_t *p_this)
{
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_sys_t
*
p_sys
;
const
char
*
path
=
p_access
->
psz_path
;
const
char
*
path
=
p_access
->
psz_
file
path
;
int
fd
;
assert
((
INT64_C
(
1
)
<<
63
)
==
((
off_t
)(
INT64_C
(
1
)
<<
63
)));
...
...
modules/access/mtp.c
View file @
370b6cbb
...
...
@@ -126,8 +126,10 @@ static int Open( vlc_object_t *p_this )
if
(
(
p_device
=
LIBMTP_Open_Raw_Device
(
&
p_rawdevices
[
i
]
)
)
!=
NULL
)
{
free
(
p_access
->
psz_path
);
if
(
(
p_access
->
psz_path
=
tempnam
(
NULL
,
"vlc"
)
)
==
NULL
)
free
(
p_access
->
psz_filepath
);
#warning Oooh no! Not tempnam()!
p_access
->
psz_filepath
=
tempnam
(
NULL
,
"vlc"
);
if
(
p_access
->
psz_filepath
==
NULL
)
{
LIBMTP_Release_Device
(
p_device
);
free
(
p_rawdevices
);
...
...
@@ -135,9 +137,11 @@ static int Open( vlc_object_t *p_this )
}
else
{
msg_Dbg
(
p_access
,
"About to write %s"
,
p_access
->
psz_path
);
msg_Dbg
(
p_access
,
"About to write %s"
,
p_access
->
psz_filepath
);
LIBMTP_Get_File_To_File
(
p_device
,
i_track_id
,
p_access
->
psz_path
,
NULL
,
NULL
);
p_access
->
psz_filepath
,
NULL
,
NULL
);
LIBMTP_Release_Device
(
p_device
);
i
=
i_numrawdevices
;
}
...
...
@@ -156,8 +160,8 @@ static int Open( vlc_object_t *p_this )
int
fd
=
p_sys
->
fd
=
-
1
;
/* Open file */
msg_Dbg
(
p_access
,
"opening file `%s'"
,
p_access
->
psz_path
);
fd
=
open_file
(
p_access
,
p_access
->
psz_path
);
msg_Dbg
(
p_access
,
"opening file `%s'"
,
p_access
->
psz_
file
path
);
fd
=
open_file
(
p_access
,
p_access
->
psz_
file
path
);
if
(
fd
==
-
1
)
{
...
...
@@ -187,8 +191,9 @@ static void Close( vlc_object_t * p_this )
access_sys_t
*
p_sys
=
p_access
->
p_sys
;
close
(
p_sys
->
fd
);
if
(
vlc_unlink
(
p_access
->
psz_path
)
!=
0
)
msg_Err
(
p_access
,
"Error deleting file %s, %m"
,
p_access
->
psz_path
);
if
(
vlc_unlink
(
p_access
->
psz_filepath
)
!=
0
)
msg_Err
(
p_access
,
"Error deleting file %s, %m"
,
p_access
->
psz_filepath
);
free
(
p_sys
);
}
...
...
modules/access/vcd/vcd.c
View file @
370b6cbb
...
...
@@ -96,7 +96,7 @@ static int Open( vlc_object_t *p_this )
{
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_sys_t
*
p_sys
;
char
*
psz_dup
=
ToLocaleDup
(
p_access
->
psz_path
);
char
*
psz_dup
=
ToLocaleDup
(
p_access
->
psz_
file
path
);
char
*
psz
;
int
i_title
=
0
;
int
i_chapter
=
0
;
...
...
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