if( !p_item )
{
msg_Dbg( p_playlist, "unable to find item in playlist");
- return -1;
+ return -1;
}
b_play = VLC_FALSE;
}
if( b_play )
{
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- p_playlist->status.p_item, NULL );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, 1242,
+ p_playlist->request.p_node, NULL );
+// playlist_Play( p_playlist );
}
if( p_playlist ) vlc_object_release( p_playlist );
access_sys_t *p_sys = p_access->p_sys;
int i;
input_item_t *p_input_item;
+ playlist_item_t *p_item_in_category;
char *psz_name;
p_sys->i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access),
p_sys->vcddev, &p_sys->p_sectors );
if( b_separate )
{
- if( p_parent->i_children == -1 )
- {
- playlist_LockItemToNode( p_playlist, p_parent );
- }
+ p_item_in_category = playlist_LockItemToNode( p_playlist, p_parent );
psz_name = strdup( "Audio CD" );
vlc_mutex_lock( &p_playlist->object_lock );
playlist_ItemSetName( p_parent, psz_name );
}
}
#endif
- playlist_BothAddInput( p_playlist, p_input_item, p_parent,
- PLAYLIST_APPEND, PLAYLIST_END );
+ playlist_AddWhereverNeeded( p_playlist, p_input_item, p_parent,
+ p_item_in_category, VLC_FALSE, PLAYLIST_APPEND );
free( psz_uri ); free( psz_opt ); free( psz_name );
}
}
p_item = (playlist_item_t *)va_arg( args, playlist_item_t * );
if ( p_node == NULL )
{
- p_playlist->status.i_status = PLAYLIST_STOPPED;
- p_playlist->request.b_request = VLC_TRUE;
- msg_Err( p_playlist, "null node" );
- return VLC_SUCCESS;
+ p_node = p_playlist->status.p_node;
+ if( !p_node )
+ {
+ p_playlist->status.i_status = PLAYLIST_STOPPED;
+ p_playlist->request.b_request = VLC_TRUE;
+ msg_Err( p_playlist, "null node" );
+ return VLC_SUCCESS;
+ }
}
p_playlist->request.i_status = PLAYLIST_RUNNING;
p_playlist->request.i_skip = 0;