[vlc-commits] input item: remove b_fixed name, always false

Rémi Denis-Courmont git at videolan.org
Fri Aug 15 17:33:48 CEST 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Aug 15 18:33:27 2014 +0300| [eb52eceec79fd9bd02a0ee5e7bfb7b0f4753ea99] | committer: Rémi Denis-Courmont

input item: remove b_fixed name, always false

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

 include/vlc_input_item.h |    1 -
 src/input/es_out.c       |    2 +-
 src/input/item.c         |    1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index bc5b2e5..a701044 100644
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -86,7 +86,6 @@ struct input_item_t
     vlc_mutex_t lock;                 /**< Lock for the item */
 
     uint8_t     i_type;              /**< Type (file, disc, ... see input_item_type_e) */
-    bool        b_fixed_name;        /**< Can the interface change the name ?*/
     bool        b_error_when_reading;/**< Error When Reading */
 };
 
diff --git a/src/input/es_out.c b/src/input/es_out.c
index fba5c87..ea7316e 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1355,7 +1355,7 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta )
 
     vlc_mutex_lock( &p_item->lock );
 
-    if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name )
+    if( vlc_meta_Get( p_meta, vlc_meta_Title ) )
         psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
 
     vlc_meta_Merge( p_item->p_meta, p_meta );
diff --git a/src/input/item.c b/src/input/item.c
index b27250b..4f0b053 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -867,7 +867,6 @@ input_item_NewWithType( const char *psz_uri, const char *psz_name,
 
     if( type != ITEM_TYPE_UNKNOWN )
         p_input->i_type = type;
-    p_input->b_fixed_name = false;
     p_input->b_error_when_reading = false;
     return p_input;
 }



More information about the vlc-commits mailing list