Commit f314ee2a authored by Petri Hintukainen's avatar Petri Hintukainen Committed by Jean-Baptiste Kempf

bluray: handle overlay in non-menu mode

Required for BluRay text subtitle support.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent d4ee3d50
...@@ -389,6 +389,9 @@ static int blurayOpen(vlc_object_t *object) ...@@ -389,6 +389,9 @@ static int blurayOpen(vlc_object_t *object)
*/ */
bd_get_event(p_sys->bluray, NULL); bd_get_event(p_sys->bluray, NULL);
/* Registering overlay event handler */
bd_register_overlay_proc(p_sys->bluray, p_demux, blurayOverlayProc);
if (p_sys->b_menu) { if (p_sys->b_menu) {
p_sys->p_input = demux_GetParentInput(p_demux); p_sys->p_input = demux_GetParentInput(p_demux);
if (unlikely(!p_sys->p_input)) { if (unlikely(!p_sys->p_input)) {
...@@ -404,8 +407,6 @@ static int blurayOpen(vlc_object_t *object) ...@@ -404,8 +407,6 @@ static int blurayOpen(vlc_object_t *object)
if (bd_play(p_sys->bluray) == 0) if (bd_play(p_sys->bluray) == 0)
BLURAY_ERROR(_("Failed to start bluray playback. Please try without menu support.")); BLURAY_ERROR(_("Failed to start bluray playback. Please try without menu support."));
/* Registering overlay event handler */
bd_register_overlay_proc(p_sys->bluray, p_demux, blurayOverlayProc);
} else { } else {
/* set start title number */ /* set start title number */
if (bluraySetTitle(p_demux, p_sys->i_longest_title) != VLC_SUCCESS) { if (bluraySetTitle(p_demux, p_sys->i_longest_title) != VLC_SUCCESS) {
...@@ -1559,6 +1560,7 @@ static int blurayDemux(demux_t *p_demux) ...@@ -1559,6 +1560,7 @@ static int blurayDemux(demux_t *p_demux)
block_Release(p_block); block_Release(p_block);
return 1; return 1;
} }
}
if (p_sys->current_overlay != -1) { if (p_sys->current_overlay != -1) {
bluray_overlay_t *ov = p_sys->p_overlays[p_sys->current_overlay]; bluray_overlay_t *ov = p_sys->p_overlays[p_sys->current_overlay];
...@@ -1575,7 +1577,6 @@ static int blurayDemux(demux_t *p_demux) ...@@ -1575,7 +1577,6 @@ static int blurayDemux(demux_t *p_demux)
} }
} }
} }
}
p_block->i_buffer = nread; p_block->i_buffer = nread;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment