[vlc-commits] input: remove input_source_t.p_access

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 26 22:55:44 2013 +0300| [8c47bc7e896c673fdc984f42fdeaff4e0097aa67] | committer: Rémi Denis-Courmont

input: remove input_source_t.p_access

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c47bc7e896c673fdc984f42fdeaff4e0097aa67
---

 src/input/input.c          |    5 +----
 src/input/input_internal.h |    1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 290ca9e..493f50f 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -346,7 +346,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     p_input->p->p_item = p_item;
 
     /* Init Input fields */
-    p_input->p->input.p_access = NULL;
     p_input->p->input.p_stream = NULL;
     p_input->p->input.p_demux  = NULL;
     p_input->p->input.b_title_demux = false;
@@ -1331,7 +1330,6 @@ error:
     /* Mark them deleted */
     p_input->p->input.p_demux = NULL;
     p_input->p->input.p_stream = NULL;
-    p_input->p->input.p_access = NULL;
     p_input->p->p_es_out = NULL;
     p_input->p->p_sout = NULL;
 
@@ -1813,7 +1811,7 @@ static bool Control( input_thread_t *p_input,
                 !p_input->p->b_can_pace_control && p_input->p->b_can_rate_control )
             {
                 int i_ret;
-                if( p_input->p->input.p_access )
+                if( p_input->p->input.p_stream != NULL )
                 {
                     i_ret = VLC_EGENERIC;
                 }
@@ -2474,7 +2472,6 @@ static int InputSourceInit( input_thread_t *p_input,
                 in->b_title_demux = true;
             }
         }
-        in->p_access = p_access; /* <- TODO: remove this nasty pointer */
     }
 
     free( psz_var_demux );
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index e13022d..d26f947 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -40,7 +40,6 @@
 typedef struct
 {
     /* Access/Stream/Demux plugins */
-    access_t *p_access VLC_DEPRECATED;
     stream_t *p_stream;
     demux_t  *p_demux;