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
881548c3
Commit
881548c3
authored
Feb 18, 2014
by
Petri Hintukainen
Committed by
Jean-Baptiste Kempf
Feb 19, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bluray: improve readability by using local variables
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
68aafe59
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
modules/access/bluray.c
modules/access/bluray.c
+10
-8
No files found.
modules/access/bluray.c
View file @
881548c3
...
...
@@ -1229,7 +1229,7 @@ static int bluraySetTitle(demux_t *p_demux, int i_title)
msg_Dbg
(
p_demux
,
"Playing Title %i"
,
i_title
);
}
if
(
bd_play_title
(
p_
demux
->
p_
sys
->
bluray
,
i_title
)
==
0
)
{
if
(
bd_play_title
(
p_sys
->
bluray
,
i_title
)
==
0
)
{
msg_Err
(
p_demux
,
"cannot play bd title '%d'"
,
i_title
);
return
VLC_EGENERIC
;
}
...
...
@@ -1245,7 +1245,7 @@ static int bluraySetTitle(demux_t *p_demux, int i_title)
msg_Dbg
(
p_demux
,
"Selecting Title %i"
,
i_title
);
if
(
bd_select_title
(
p_
demux
->
p_
sys
->
bluray
,
i_title
)
==
0
)
{
if
(
bd_select_title
(
p_sys
->
bluray
,
i_title
)
==
0
)
{
msg_Err
(
p_demux
,
"cannot select bd title '%d'"
,
i_title
);
return
VLC_EGENERIC
;
}
...
...
@@ -1547,19 +1547,21 @@ static void blurayStreamSelect(demux_t *p_demux, uint32_t i_type, uint32_t i_id)
static
void
blurayUpdatePlaylist
(
demux_t
*
p_demux
,
unsigned
i_playlist
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
blurayResetParser
(
p_demux
);
/* read title info and init some values */
if
(
!
p_
demux
->
p_
sys
->
b_menu
)
p_demux
->
info
.
i_title
=
bd_get_current_title
(
p_
demux
->
p_
sys
->
bluray
);
if
(
!
p_sys
->
b_menu
)
p_demux
->
info
.
i_title
=
bd_get_current_title
(
p_sys
->
bluray
);
p_demux
->
info
.
i_seekpoint
=
0
;
p_demux
->
info
.
i_update
|=
INPUT_UPDATE_TITLE
|
INPUT_UPDATE_SEEKPOINT
;
BLURAY_TITLE_INFO
*
p_title_info
=
bd_get_playlist_info
(
p_
demux
->
p_
sys
->
bluray
,
i_playlist
,
0
);
BLURAY_TITLE_INFO
*
p_title_info
=
bd_get_playlist_info
(
p_sys
->
bluray
,
i_playlist
,
0
);
if
(
p_title_info
)
{
blurayUpdateTitleInfo
(
p_
demux
->
p_
sys
->
pp_title
[
p_demux
->
info
.
i_title
],
p_title_info
);
blurayUpdateTitleInfo
(
p_sys
->
pp_title
[
p_demux
->
info
.
i_title
],
p_title_info
);
}
setTitleInfo
(
p_
demux
->
p_
sys
,
p_title_info
);
setTitleInfo
(
p_sys
,
p_title_info
);
blurayResetStillImage
(
p_demux
);
}
...
...
@@ -1672,7 +1674,7 @@ static int blurayDemux(demux_t *p_demux)
int
nread
;
if
(
p_sys
->
b_menu
==
false
)
{
while
(
bd_get_event
(
p_
demux
->
p_
sys
->
bluray
,
&
e
))
while
(
bd_get_event
(
p_sys
->
bluray
,
&
e
))
blurayHandleEvent
(
p_demux
,
&
e
);
nread
=
bd_read
(
p_sys
->
bluray
,
p_block
->
p_buffer
,
...
...
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