[vlc-commits] demux: remove info.i_title and info.i_seekpoint (refs #18504)
Rémi Denis-Courmont
git at videolan.org
Sun Dec 3 13:27:30 CET 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec 3 12:53:52 2017 +0200| [5d69d95f9d54923b9352b6ee36d74ba190213c9d] | committer: Rémi Denis-Courmont
demux: remove info.i_title and info.i_seekpoint (refs #18504)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d69d95f9d54923b9352b6ee36d74ba190213c9d
---
include/vlc_demux.h | 3 ---
modules/access/avcapture.m | 2 --
modules/access/dc1394.c | 2 --
modules/access/decklink.cpp | 2 --
modules/access/dshow/dshow.cpp | 2 --
modules/access/imem.c | 2 --
modules/access/oss.c | 2 --
modules/access/qtsound.m | 2 --
modules/access/v4l2/demux.c | 2 --
modules/access/v4l2/radio.c | 2 --
src/input/demux.c | 2 --
11 files changed, 23 deletions(-)
diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 0d04bfd91f..012d398614 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -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;
diff --git a/modules/access/avcapture.m b/modules/access/avcapture.m
index d736b7dfbe..6953a02200 100644
--- a/modules/access/avcapture.m
+++ b/modules/access/avcapture.m
@@ -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 )
diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 8ce5d1e478..f4a0a1bd3a 100644
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -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 )
diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
index 88b2adad78..17db1b4944 100644
--- a/modules/access/decklink.cpp
+++ b/modules/access/decklink.cpp
@@ -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;
diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index f22571e183..70cdacb1d5 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -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();
diff --git a/modules/access/imem.c b/modules/access/imem.c
index ba7c1ea1e0..0d35e5a01e 100644
--- a/modules/access/imem.c
+++ b/modules/access/imem.c
@@ -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;
}
diff --git a/modules/access/oss.c b/modules/access/oss.c
index c51fa5094d..21b7cc4c08 100644
--- a/modules/access/oss.c
+++ b/modules/access/oss.c
@@ -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;
diff --git a/modules/access/qtsound.m b/modules/access/qtsound.m
index 947b566527..c18473a712 100644
--- a/modules/access/qtsound.m
+++ b/modules/access/qtsound.m
@@ -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);
diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c
index 47514a14c0..f9edcf0fd6 100644
--- a/modules/access/v4l2/demux.c
+++ b/modules/access/v4l2/demux.c
@@ -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);
diff --git a/modules/access/v4l2/radio.c b/modules/access/v4l2/radio.c
index c719619d36..609b5f15ad 100644
--- a/modules/access/v4l2/radio.c
+++ b/modules/access/v4l2/radio.c
@@ -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:
diff --git a/src/input/demux.c b/src/input/demux.c
index fb28c5ed5d..18b64b5f31 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -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 )
More information about the vlc-commits
mailing list