VLC_EXPORT( playlist_item_t*, playlist_ItemToNode, (playlist_t *,playlist_item_t *, bool) );
/********************************** Item search *************************/
-VLC_EXPORT( playlist_item_t *, playlist_ItemGetById, (playlist_t *, int, bool ) );
+VLC_EXPORT( playlist_item_t *, playlist_ItemGetById, (playlist_t *, int ) );
VLC_EXPORT( playlist_item_t *, playlist_ItemGetByInput, (playlist_t *,input_item_t *, bool ) );
VLC_EXPORT( playlist_item_t *, playlist_ItemGetByInputId, (playlist_t *, int, playlist_item_t *) );
playlist_t *p_playlist = (playlist_t*)p_this;
playlist_add_t *p_add = newval.p_address;
playlist_item_t *p_item;
- p_item = playlist_ItemGetById( p_playlist, p_add->i_node, pl_Locked );
+ p_item = playlist_ItemGetById( p_playlist, p_add->i_node );
assert( p_item );
while( p_item->p_parent )
p_item = p_item->p_parent;
i_id = atoi( psz_id );
if( i_id )
{
+ playlist_Lock( p_sys->p_playlist );
playlist_item_t *p_pl_item = playlist_ItemGetById( p_sys->p_playlist,
- i_id, false );
+ i_id );
if( p_pl_item )
p_item = p_pl_item->p_input;
+ playlist_Unlock( p_sys->p_playlist );
}
else
{
msg_Dbg( p_intf, "requested playlist play" );
break;
}
+ //TODO: really locked here ?
playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
true, NULL,
playlist_ItemGetById( p_sys->p_playlist,
- i_item, true ) );
+ i_item ) );
msg_Dbg( p_intf, "requested playlist item: %i", i_item );
break;
}
i_ret = playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
pl_Locked, NULL,
playlist_ItemGetById( p_sys->p_playlist,
- i_id, pl_Locked ) );
+ i_id ) );
playlist_Unlock( p_sys->p_playlist );
msg_Dbg( p_intf, "requested playlist item: %i", i_id );
SSPushN( st, i_ret );
else if( !strcmp( s, "playlist_delete" ) )
{
int i_id = SSPopN( st, vars );
+ playlist_Lock( p_sys->p_playlist );
playlist_item_t *p_item = playlist_ItemGetById( p_sys->p_playlist,
- i_id, pl_Unlocked );
+ i_id );
if( p_item )
{
playlist_DeleteFromInput( p_sys->p_playlist,
- p_item->p_input->i_id, pl_Unlocked );
+ p_item->p_input->i_id, pl_Locked );
msg_Dbg( p_intf, "requested playlist delete: %d", i_id );
}
else
msg_Dbg( p_intf, "couldn't find playlist item to delete (%d)",
i_id );
}
+ playlist_Unlock( p_sys->p_playlist );
}
else if( !strcmp( s, "playlist_move" ) )
{
PL_LOCK;
for( i_dummy = 0; i_dummy < playlist_CurrentSize(p_playlist) ; i_dummy++ )
{
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy, pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy );
if( p_item )
{
ppsz_text[0] = p_item->p_input->psz_name;
PL_LOCK;
playlist_item_t *p_target =
- playlist_ItemGetById( p_playlist, targetItem->i_id,
- pl_Locked );
- playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId,
- pl_Locked );
+ playlist_ItemGetById( p_playlist, targetItem->i_id );
+ playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId );
if( !p_target || !p_src )
{
PLItem *parentItem = targetItem->parent();
assert( parentItem );
playlist_item_t *p_parent =
- playlist_ItemGetById( p_playlist, parentItem->i_id,
- pl_Locked );
+ playlist_ItemGetById( p_playlist, parentItem->i_id );
if( !p_parent )
{
PL_UNLOCK;
PLItem *item = static_cast<PLItem*>(index.internalPointer());
assert( item );
PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
- pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
activateItem( p_item );
PL_UNLOCK;
}
PL_LOCK;
if( !nodeItem ) goto end;
- p_item = playlist_ItemGetById( p_playlist, p_add->i_item, pl_Locked );
+ p_item = playlist_ItemGetById( p_playlist, p_add->i_item );
if( !p_item || p_item->i_flags & PLAYLIST_DBL_FLAG ) goto end;
if( i_depth == DEPTH_SEL && p_item->p_parent &&
p_item->p_parent->i_id != rootItem->i_id )
/* This function must be entered WITH the playlist lock */
void PLModel::UpdateNodeChildren( PLItem *root )
{
- playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id,
- pl_Locked );
+ playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id );
UpdateNodeChildren( p_node, root );
}
/* This function must be entered WITH the playlist lock */
void PLModel::UpdateTreeItem( PLItem *item, bool signal, bool force )
{
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
- pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
UpdateTreeItem( p_item, item, signal, force );
}
fullList->removeAll( deleteIndex );
PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
- pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
if( !p_item )
{
- PL_UNLOCK; return;
+ PL_UNLOCK;
+ return;
}
if( p_item->i_children == -1 )
playlist_DeleteFromInput( p_playlist, item->i_input_id, pl_Locked );
PL_LOCK;
{
playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
- rootItem->i_id,
- pl_Locked );
+ rootItem->i_id );
if( p_root )
{
playlist_RecursiveNodeSort( p_playlist, p_root,
PL_LOCK;
{
playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
- rootItem->i_id,
- pl_Locked );
+ rootItem->i_id );
assert( p_root );
char *psz_name = search_text.toUtf8().data();
playlist_LiveSearchUpdate( p_playlist , p_root, psz_name );
{
assert( index.isValid() );
PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- itemId( index ), pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, itemId( index ) );
if( p_item )
{
i_popup_item = p_item->i_id;
PL_LOCK;
{
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item,
- pl_Locked );
+ i_popup_item );
activateItem( p_item );
}
PL_UNLOCK;
void PLModel::popupInfo()
{
+ PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item,
- pl_Unlocked );
+ i_popup_item );
if( p_item )
{
- MediaInfoDialog *mid = new MediaInfoDialog( p_intf, p_item->p_input );
+ input_item_t* p_input = p_item->p_input;
+ vlc_gc_incref( p_input );
+ PL_UNLOCK;
+ MediaInfoDialog *mid = new MediaInfoDialog( p_intf, p_input );
+ vlc_gc_decref( p_input );
mid->setParent( PlaylistDialog::getInstance( p_intf ),
Qt::Dialog );
mid->show();
#include <QDesktopServices>
void PLModel::popupExplore()
{
+ PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item,
- pl_Unlocked );
+ i_popup_item );
if( p_item )
{
input_item_t *p_input = p_item->p_input;
char *psz_meta = input_item_GetURI( p_input );
+ PL_UNLOCK;
if( psz_meta )
{
const char *psz_access;
free( psz_meta );
}
}
+ else
+ PL_UNLOCK;
}
/**********************************************************************
void StandardPLPanel::setRoot( int i_root_id )
{
QPL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( THEPL, i_root_id,
- pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( THEPL, i_root_id );
assert( p_item );
p_item = playlist_GetPreferredNode( THEPL, p_item );
assert( p_item );
Iterator item = findById( p_add->i_item );
if( item == end() )
{
+ playlist_Lock( m_pPlaylist );
playlist_item_t *p_item = playlist_ItemGetById(
- m_pPlaylist, p_add->i_item, pl_Unlocked );
- if( !p_item ) return;
+ m_pPlaylist, p_add->i_item );
+ if( !p_item )
+ {
+ playlist_Unlock( m_pPlaylist );
+ return;
+ }
UString *pName = new UString( getIntf(),
p_item->p_input->psz_name );
node->add( p_add->i_item, UStringPtr( pName ),
false,false, false, p_item->i_flags & PLAYLIST_RO_FLAG,
p_item );
+ playlist_Unlock( m_pPlaylist );
}
}
tree_update descr;
pl_Release( p_intf );
return CDRF_NEWFONT;
}
-
+
+ PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- (int)lplvcd->nmcd.dwItemSpec, FALSE );
+ (int)lplvcd->nmcd.dwItemSpec );
if( !p_item )
{
+ PL_UNLOCK;
pl_Release( p_intf );
return CDRF_DODEFAULT;
}
if( p_item->i_flags & PLAYLIST_DBL_FLAG )
{
lplvcd->clrText = RGB(192,192,192);
+ PL_UNLOCK;
pl_Release( p_intf );
return CDRF_NEWFONT;
}
+ PL_UNLOCK;
pl_Release( p_intf );
}
if( p_playlist == NULL ) return;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i, FALSE );
+ PL_LOCK;
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i );
if( !p_item )
{
+ PL_UNLOCK;
pl_Release( p_intf );
return;
}
char psz_duration[MSTRTIME_MAX_SIZE];
mtime_t dur = input_item_GetDuration( p_item->p_input );
+ PL_UNLOCK;
if( dur != -1 ) secstotimestr( psz_duration, dur/1000000 );
else memcpy( psz_duration , "-:--:--", sizeof("-:--:--") );
{
if( ListView_GetItemState( hListView, item, LVIS_SELECTED ) )
{
- playlist_item_t *p_item =
- playlist_ItemGetById( p_playlist, item, FALSE );
+ PL_LOCK;
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item );
p_item->i_flags ^= PLAYLIST_DBL_FLAG;
+ PL_UNLOCK;
UpdateItem( item );
}
}
{
if( ListView_GetItemState( hListView, item, LVIS_SELECTED ) )
{
- /*XXX*/
- playlist_item_t *p_item =
- playlist_ItemGetById( p_playlist, item, FALSE );
+ PL_LOCK;
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item );
p_item->i_flags |= PLAYLIST_DBL_FLAG;
+ PL_UNLOCK;
UpdateItem( item );
}
}
if( p_playlist == NULL ) return;
PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item, true );
- PL_UNLOCK;
-
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item );
if( p_item )
{
ItemInfoDialog *iteminfo_dialog =
new ItemInfoDialog( p_intf, this, hInst, p_item );
+ PL_UNLOCK;
CreateDialogBox( hwnd, iteminfo_dialog );
UpdateItem( i_item );
delete iteminfo_dialog;
playlist_t *p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL ) return;
- playlist_item_t *p_item =
- playlist_ItemGetById( p_playlist, i_popup_item, FALSE );
+ PL_LOCK;
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_popup_item );
if( !(p_playlist->items.p_elems[i_popup_item]->i_flags & PLAYLIST_DBL_FLAG) )
//playlist_IsEnabled( p_playlist, i_popup_item ) )
p_item->i_flags ^= PLAYLIST_DBL_FLAG;
}
+ PL_UNLOCK;
pl_Release( p_intf );
UpdateItem( i_popup_item );
}
PL_LOCK;
int i_ret = playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
true, NULL,
- playlist_ItemGetById( p_playlist, i_id,
- true ) );
+ playlist_ItemGetById( p_playlist, i_id ) );
PL_UNLOCK;
vlclua_release_playlist_internal( p_playlist );
return vlclua_push_ret( L, i_ret );
if( lua_isnumber( L, 1 ) )
{
int i_id = lua_tointeger( L, 1 );
- p_item = playlist_ItemGetById( p_playlist, i_id, true );
+ p_item = playlist_ItemGetById( p_playlist, i_id );
if( !p_item )
{
PL_UNLOCK;
int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id )
{
PL_ASSERT_LOCKED;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id,
- pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
if( !p_item ) return VLC_EGENERIC;
return DeleteInner( p_playlist, p_item, true );
}
***************************************************************************/
/**
- * Search a playlist item by its playlist_item id
- *
- * \param p_playlist the playlist
- * \param i_id the id to find
- * \return the item or NULL on failure
+ * Search a playlist item by its playlist_item id.
+ * The playlist have to be locked
+ * @param p_playlist: the playlist
+ * @param i_id: the id to find
+ * @return the item or NULL on failure
*/
-playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id,
- bool b_locked )
+playlist_item_t* playlist_ItemGetById( playlist_t * p_playlist , int i_id )
{
int i;
- PL_LOCK_IF( !b_locked );
+ PL_ASSERT_LOCKED;
ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
if( i != -1 )
- {
- PL_UNLOCK_IF( !b_locked );
return ARRAY_VAL( p_playlist->all_items, i );
- }
- PL_UNLOCK_IF( !b_locked );
- return NULL;
+ else
+ return NULL;
}
/**