Skip to content

V
vlc-2-2
Commit 2c41ee00 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen
Browse files
Options

bluray: Minor refactoring.

parent aef79d83
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/access/bluray.c
View file @ 2c41ee00
...@@ -136,6 +136,8 @@ static void blurayOverlayProc(void *ptr, const BD_OVERLAY * const overlay); ...@@ -136,6 +136,8 @@ static void blurayOverlayProc(void *ptr, const BD_OVERLAY * const overlay);
static int onMouseEvent(vlc_object_t *p_vout, const char *psz_var, static int onMouseEvent(vlc_object_t *p_vout, const char *psz_var,
vlc_value_t old, vlc_value_t val, void *p_data); vlc_value_t old, vlc_value_t val, void *p_data);
static void blurayResetParser(demux_t *p_demux);
#define FROM_TICKS(a) (a*CLOCK_FREQ / INT64_C(90000)) #define FROM_TICKS(a) (a*CLOCK_FREQ / INT64_C(90000))
#define TO_TICKS(a) (a*INT64_C(90000)/CLOCK_FREQ) #define TO_TICKS(a) (a*INT64_C(90000)/CLOCK_FREQ)
#define CUR_LENGTH p_sys->pp_title[p_demux->info.i_title]->i_length #define CUR_LENGTH p_sys->pp_title[p_demux->info.i_title]->i_length
...@@ -278,7 +280,7 @@ static int blurayOpen( vlc_object_t *object ) ...@@ -278,7 +280,7 @@ static int blurayOpen( vlc_object_t *object )
} }
} }
p_sys->p_parser = stream_DemuxNew(p_demux, "ts", p_demux->out); blurayResetParser( p_demux );
if (!p_sys->p_parser) { if (!p_sys->p_parser) {
msg_Err(p_demux, "Failed to create TS demuxer"); msg_Err(p_demux, "Failed to create TS demuxer");
goto error; goto error;
...@@ -758,9 +760,7 @@ static void blurayResetParser( demux_t *p_demux ) ...@@ -758,9 +760,7 @@ static void blurayResetParser( demux_t *p_demux )
* we are changing title. * we are changing title.
*/ */
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
if (!p_sys->p_parser) if (p_sys->p_parser)
return;
stream_Delete(p_sys->p_parser); stream_Delete(p_sys->p_parser);
p_sys->p_parser = stream_DemuxNew(p_demux, "ts", p_demux->out); p_sys->p_parser = stream_DemuxNew(p_demux, "ts", p_demux->out);
if (!p_sys->p_parser) { if (!p_sys->p_parser) {
......
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