Commit 5d69d95f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

demux: remove info.i_title and info.i_seekpoint (refs #18504)

parent b4279dc0
......@@ -87,9 +87,6 @@ struct demux_t
{
unsigned int i_update; /* Demux sets them on change,
Input removes them once take into account*/
/* Seekpoint/Title at demux level */
int i_title; /* idem, start from 0 (could be menu) */
int i_seekpoint; /* idem, start from 0 */
} info;
demux_sys_t *p_sys;
......
......@@ -268,8 +268,6 @@ static int Open(vlc_object_t *p_this)
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
p_demux->p_sys = p_sys = calloc(1, sizeof(demux_sys_t));
if ( !p_sys )
......
......@@ -170,8 +170,6 @@ static int Open( vlc_object_t *p_this )
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
p_demux->p_sys = p_sys = vlc_obj_calloc( p_this, 1, sizeof( demux_sys_t ) );
if( !p_sys )
......
......@@ -490,8 +490,6 @@ static int Open(vlc_object_t *p_this)
demux->pf_demux = NULL;
demux->pf_control = Control;
demux->info.i_update = 0;
demux->info.i_title = 0;
demux->info.i_seekpoint = 0;
demux->p_sys = sys = (demux_sys_t*)calloc(1, sizeof(demux_sys_t));
if (!sys)
return VLC_ENOMEM;
......
......@@ -700,8 +700,6 @@ static int DemuxOpen( vlc_object_t *p_this )
p_demux->pf_demux = Demux;
p_demux->pf_control = DemuxControl;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
std::vector<dshow_stream_t*>::iterator it = p_sys->pp_streams.begin();
std::vector<dshow_stream_t*>::iterator end = p_sys->pp_streams.end();
......
......@@ -495,8 +495,6 @@ static int OpenDemux(vlc_object_t *object)
demux->p_sys = (demux_sys_t*)sys;
demux->info.i_update = 0;
demux->info.i_title = 0;
demux->info.i_seekpoint = 0;
return VLC_SUCCESS;
}
......
......@@ -154,8 +154,6 @@ static int DemuxOpen( vlc_object_t *p_this )
p_demux->pf_control = DemuxControl;
p_demux->pf_demux = Demux;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
p_demux->p_sys = p_sys = vlc_obj_calloc( p_this, 1, sizeof( demux_sys_t ) );
if( p_sys == NULL ) return VLC_ENOMEM;
......
......@@ -445,8 +445,6 @@ static int Open(vlc_object_t *p_this)
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
msg_Dbg(p_demux, "New audio es %d channels %dHz",
audiofmt.audio.i_channels, audiofmt.audio.i_rate);
......
......@@ -106,8 +106,6 @@ int DemuxOpen( vlc_object_t *obj )
demux->pf_demux = NULL;
demux->pf_control = DemuxControl;
demux->info.i_update = 0;
demux->info.i_title = 0;
demux->info.i_seekpoint = 0;
return VLC_SUCCESS;
error:
free (sys);
......
......@@ -105,8 +105,6 @@ int RadioOpen (vlc_object_t *obj)
demux->pf_demux = NULL;
demux->pf_control = RadioControl;
demux->info.i_update = 0;
demux->info.i_title = 0;
demux->info.i_seekpoint = 0;
return VLC_SUCCESS;
error:
......
......@@ -244,8 +244,6 @@ demux_t *demux_NewAdvanced( vlc_object_t *p_obj, input_thread_t *p_parent_input,
p_demux->pf_control = NULL;
p_demux->p_sys = NULL;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
priv->destroy = s ? demux_DestroyDemux : demux_DestroyAccessDemux;
if( s != NULL )
......
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