Browse Source

input: remove constant input_item_node_t.b_can_loop

pull/51/head
Rémi Denis-Courmont 9 years ago
parent
commit
4860e4e3b0
  1. 1
      include/vlc_input_item.h
  2. 1
      src/input/item.c
  3. 16
      src/playlist/item.c

1
include/vlc_input_item.h

@ -172,7 +172,6 @@ struct input_item_node_t
input_item_node_t **pp_children;
input_item_node_t *p_parent;
input_item_compar_cb compar_cb;
bool b_can_loop;
};
VLC_API void input_item_CopyOptions( input_item_t *p_child, input_item_t *p_parent );

1
src/input/item.c

@ -1217,7 +1217,6 @@ input_item_node_t *input_item_node_Create( input_item_t *p_input )
p_node->p_parent = NULL;
p_node->i_children = 0;
p_node->pp_children = NULL;
p_node->b_can_loop = false;
return p_node;
}

16
src/playlist/item.c

@ -185,22 +185,6 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
}
else
{
/* Don't Play a directory if it can loop into a parent */
if( p_new_root->b_can_loop )
{
/* Play the first regular file */
for( ; pos < last_pos; pos++ )
{
if( p_item->pp_children[pos]->p_input->i_type != ITEM_TYPE_DIRECTORY )
break;
}
if( last_pos == pos )
{
PL_UNLOCK;
playlist_Stop( p_playlist );
return;
}
}
p_play_item = p_item->pp_children[pos];
/* NOTE: this is a work around the general bug:
if node-to-be-played contains sub-nodes, then second instead

Loading…
Cancel
Save