Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
d61e4c6c
Commit
d61e4c6c
authored
Feb 05, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix unitialized seekable variable
parent
f9e0558e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
modules/access/file.c
modules/access/file.c
+13
-5
No files found.
modules/access/file.c
View file @
d61e4c6c
...
@@ -97,6 +97,7 @@ vlc_module_end ()
...
@@ -97,6 +97,7 @@ vlc_module_end ()
* Exported prototypes
* Exported prototypes
*****************************************************************************/
*****************************************************************************/
static
int
Seek
(
access_t
*
,
int64_t
);
static
int
Seek
(
access_t
*
,
int64_t
);
static
int
NoSeek
(
access_t
*
,
int64_t
);
static
ssize_t
Read
(
access_t
*
,
uint8_t
*
,
size_t
);
static
ssize_t
Read
(
access_t
*
,
uint8_t
*
,
size_t
);
static
int
Control
(
access_t
*
,
int
,
va_list
);
static
int
Control
(
access_t
*
,
int
,
va_list
);
...
@@ -109,7 +110,6 @@ struct access_sys_t
...
@@ -109,7 +110,6 @@ struct access_sys_t
int
fd
;
int
fd
;
/* */
/* */
bool
b_seekable
;
bool
b_pace_control
;
bool
b_pace_control
;
};
};
...
@@ -163,9 +163,10 @@ static int Open( vlc_object_t *p_this )
...
@@ -163,9 +163,10 @@ static int Open( vlc_object_t *p_this )
if
(
S_ISREG
(
st
.
st_mode
))
if
(
S_ISREG
(
st
.
st_mode
))
p_access
->
info
.
i_size
=
st
.
st_size
;
p_access
->
info
.
i_size
=
st
.
st_size
;
else
if
(
!
S_ISBLK
(
st
.
st_mode
))
else
if
(
!
S_ISBLK
(
st
.
st_mode
))
p_
sys
->
b_seekable
=
false
;
p_
access
->
pf_seek
=
NoSeek
;
#else
#else
p_sys
->
b_seekable
=
!
b_stdin
;
if
(
b_stdin
)
p_access
->
pf_seek
=
NoSeek
;
# warning File size not known!
# warning File size not known!
#endif
#endif
...
@@ -204,7 +205,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
...
@@ -204,7 +205,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
ssize_t
i_ret
;
ssize_t
i_ret
;
#ifndef WIN32
#ifndef WIN32
if
(
!
p_sys
->
b_seekable
)
if
(
p_access
->
pf_seek
==
NoSeek
)
i_ret
=
net_Read
(
p_access
,
fd
,
NULL
,
p_buffer
,
i_len
,
false
);
i_ret
=
net_Read
(
p_access
,
fd
,
NULL
,
p_buffer
,
i_len
,
false
);
else
else
#endif
#endif
...
@@ -263,6 +264,13 @@ static int Seek (access_t *p_access, int64_t i_pos)
...
@@ -263,6 +264,13 @@ static int Seek (access_t *p_access, int64_t i_pos)
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
static
int
NoSeek
(
access_t
*
p_access
,
int64_t
i_pos
)
{
/* assert(0); ?? */
(
void
)
p_access
;
(
void
)
i_pos
;
return
VLC_EGENERIC
;
}
/*****************************************************************************
/*****************************************************************************
* Control:
* Control:
*****************************************************************************/
*****************************************************************************/
...
@@ -278,7 +286,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
...
@@ -278,7 +286,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
case
ACCESS_CAN_SEEK
:
case
ACCESS_CAN_SEEK
:
case
ACCESS_CAN_FASTSEEK
:
case
ACCESS_CAN_FASTSEEK
:
pb_bool
=
(
bool
*
)
va_arg
(
args
,
bool
*
);
pb_bool
=
(
bool
*
)
va_arg
(
args
,
bool
*
);
*
pb_bool
=
p_sys
->
b_seekable
;
*
pb_bool
=
(
p_access
->
pf_seek
!=
NoSeek
)
;
break
;
break
;
case
ACCESS_CAN_PAUSE
:
case
ACCESS_CAN_PAUSE
:
...
...
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