Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
libbluray
Commits
314fa47e
Commit
314fa47e
authored
Oct 14, 2010
by
hpi1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved sanity checks to gc_run()
parent
7995f549
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
14 deletions
+5
-14
src/libbluray/decoders/graphics_controller.c
src/libbluray/decoders/graphics_controller.c
+5
-14
No files found.
src/libbluray/decoders/graphics_controller.c
View file @
314fa47e
...
...
@@ -257,11 +257,6 @@ static void _render_page(GRAPHICS_CONTROLLER *gc,
BD_PG_PALETTE
*
palette
=
NULL
;
unsigned
ii
;
if
(
!
s
||
!
s
->
ics
)
{
ERROR
(
"_render_page(): no interactive composition
\n
"
);
return
;
}
if
(
s
->
ics
->
interactive_composition
.
ui_model
==
1
&&
!
gc
->
popup_visible
)
{
TRACE
(
"_render_page(): popup menu not visible
\n
"
);
...
...
@@ -340,10 +335,6 @@ static void _user_input(GRAPHICS_CONTROLLER *gc, bd_vk_key_e key, GC_NAV_CMDS *c
unsigned
ii
;
int
activated_btn_id
=
-
1
;
if
(
!
s
||
!
s
->
ics
)
{
ERROR
(
"_user_input(): no interactive composition
\n
"
);
return
;
}
if
(
s
->
ics
->
interactive_composition
.
ui_model
==
1
&&
!
gc
->
popup_visible
)
{
TRACE
(
"_user_input(): popup menu not visible
\n
"
);
return
;
...
...
@@ -424,11 +415,6 @@ static void _set_button_page(GRAPHICS_CONTROLLER *gc, uint32_t param, GC_NAV_CMD
TRACE
(
"_set_button_page(0x%08x): page flag %d, id %d, effects %d button flag %d, id %d"
,
param
,
!!
page_flag
,
page_id
,
!!
effect_flag
,
!!
button_flag
,
button_id
);
if
(
!
s
||
!
s
->
ics
)
{
ERROR
(
"_set_button_page(): no interactive composition
\n
"
);
return
;
}
/* 10.4.3.4 (D) */
if
(
!
page_flag
&&
!
button_flag
)
{
...
...
@@ -497,6 +483,11 @@ void gc_run(GRAPHICS_CONTROLLER *gc, gc_ctrl_e ctrl, uint32_t param, GC_NAV_CMDS
cmds
->
nav_cmds
=
NULL
;
cmds
->
sound_id_ref
=
-
1
;
if
(
!
gc
||
!
gc
->
igs
||
!
gc
->
igs
->
ics
)
{
ERROR
(
"gc_run(): no interactive composition
\n
"
);
return
;
}
switch
(
ctrl
)
{
case
GC_CTRL_SET_BUTTON_PAGE
:
...
...
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